Adds grenades properly to RnD, 9x39mm magazines, some remaps and fixes ordering on TAP and SRM jobs#1203
Open
KriegersMustDie wants to merge 12 commits intoSector-Crescent:masterfrom
Conversation
Signed-off-by: KriegersMustDie <87212324+KriegersMustDie@users.noreply.github.com>
Signed-off-by: KriegersMustDie <87212324+KriegersMustDie@users.noreply.github.com>
Collaborator
|
merge conflicts |
|
This should be quickly dealt with. I gave SHI their research nades already also maybe having ammo be research locked might be a good idea as well. Like nobody is making the pulse rifle yet its ammo is craftable at any lathe. |
This file contains hidden or 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
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.
Add: Grenades (SHI, DSM, NCWL, NCSP) to RnD (SHI, DSM, NCWL, CD)
Changed
This PR is dedicated to the brave freedom fighters of 11/11.