Open
Conversation
Contributor
|
Fix yo conflicts, Bobinater. |
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.
About The Pull Request
A counter proposal to #364 that includes the worn marksman carbine blueprint that it lacked on CE and has proper lines so #369 will function with it, assuming it is merged first then this one is TM'd. Without #369 this PR will NOT work.
Now to the meat; the Captain's deagle loadout now gets El Capitan, praised be. Also gives NCR Rangers SOFT YARDS trait.
EDIT: Now includes currently TM'd #351 into PR.
Pre-Merge Checklist
Changelog
🆑
add: Lines for NCR-ization of combat armor in cooperation with #369 ((DO NOT TM WITHOUT 369 MERGED))
balance: El Capitan given to captain loadout.
balance: Rangers now get SOFT YARDS.
/:cl: