Adds CBRN ERT #4337
Merged
Adds CBRN ERT #4337
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Sprites
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
BeagleGaming1
added
the
Balance
koltoast
reviewed
Sep 5, 2023
BeagleGaming1
commented
Sep 5, 2023
3 tasks
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
Adds the CBRN ERT, with a 10/120 chance of responding to distress signals.
Explain why it's good for the game
It is a USCM-aligned ERT that could be used for events
Changelog
🆑
add: Added CBRN ERT with new CBRN MOPP equipment. (Sprites by DrMacCool and Esselnek, names and descriptions by TopHatPenguin and Kaga)
add: ERT Squads (Marine Raider and new CBRN) get assigned to their squad even if spawned as an ERT, and do not automatically unlock it for overwatch
balance: Tool Webbing can now only hold tools, instead of just being a better webbing
spellcheck: Corrected spelling of "Intercepted Transmission" for ERTs
fix: USCM faction squads that are not default marine squads should no longer cause a crew manifest runtime
/:cl: