Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the FBI Profession #76068

Merged
merged 88 commits into from
Sep 3, 2024
Merged

Add the FBI Profession #76068

merged 88 commits into from
Sep 3, 2024

Conversation

DukePaulAtreid3s
Copy link
Contributor

@DukePaulAtreid3s DukePaulAtreid3s commented Aug 31, 2024

Summary

Content "Adds the FBI Special Agent profession, and related sundry."

Purpose of change

The FBI profession is supposed to occupy a middle-ground between the police professions and the SWAT, possessing the skills of the latter with starting equipment roughly at the level of the former.

Describe the solution

some new items, and 2 variants, as well as a new profession.

Describe alternatives you've considered

Adding the ULVCT, a concealable body armor worn on the underlayer. https://www.tyrtactical.com/shop/tyr-tactical-male-ultra-concealable-body-armor-ulvct/
Adding soft armor inserts and fixing the lootgroups around them, which will be saved for a future PR.

Testing

Screenshot 2024-09-01 221142
Screenshot 2024-09-01 221317

Additional context

This is my first big PR!!!!!

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Items: Armor / Clothing Armor and clothing labels Aug 31, 2024
Copy link
Contributor

You are creating a pull request with the master branch as the head branch. This is likely a mistake unless you really know what you are doing. You may read https://docs.github.com/en/get-started/quickstart/contributing-to-projects#creating-a-branch-to-work-on for a typical workflow of contributing to a project on GitHub.

DukePaulAtreid3s and others added 2 commits August 30, 2024 20:46
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Aug 31, 2024
DukePaulAtreid3s and others added 2 commits August 30, 2024 22:03
data/json/professions.json Outdated Show resolved Hide resolved
@DukePaulAtreid3s DukePaulAtreid3s marked this pull request as draft September 1, 2024 19:53
@DukePaulAtreid3s
Copy link
Contributor Author

Did you test any of this? That is a required thing to have done, especially for a PR that has as much changes as this one has had.

Yes, but not all at once, I've been fixing things as I get the errors.

@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Sep 1, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 2, 2024
@DukePaulAtreid3s DukePaulAtreid3s marked this pull request as ready for review September 2, 2024 00:14
@DukePaulAtreid3s DukePaulAtreid3s marked this pull request as draft September 2, 2024 00:35
@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Sep 2, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 2, 2024
@DukePaulAtreid3s DukePaulAtreid3s marked this pull request as ready for review September 2, 2024 00:58
@Holli-Git
Copy link
Contributor

You still need something in testing

@DukePaulAtreid3s
Copy link
Contributor Author

DukePaulAtreid3s commented Sep 2, 2024

Done! And thank you so much for your help throughout this endeavor!

@Maleclypse
Copy link
Member

Can you empty commit or rebase? The test is stuck and I can’t make it restart successfully

@DukePaulAtreid3s
Copy link
Contributor Author

Can you empty commit or rebase? The test is stuck and I can’t make it restart successfully

Just retried it, should work now!

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 3, 2024
@Maleclypse Maleclypse merged commit c0f8c04 into CleverRaven:master Sep 3, 2024
37 of 41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants