Skip to content

Coexist#373

Open
Bobinater wants to merge 3 commits intoFoundation-19:masterfrom
Bobinater:AllPeopleAreEqual
Open

Coexist#373
Bobinater wants to merge 3 commits intoFoundation-19:masterfrom
Bobinater:AllPeopleAreEqual

Conversation

@Bobinater
Copy link
Contributor

@Bobinater Bobinater commented Jan 21, 2026

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

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

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:

@Bobinater Bobinater changed the title Update ncr.dm Coexist Jan 21, 2026
@Aurrain
Copy link
Contributor

Aurrain commented Jan 27, 2026

Fix yo conflicts, Bobinater.

@Aurrain Aurrain added needs work Something isn't right with this PR faction changes Changes something involving factions. balance This PR messes with the general balance of the game labels Jan 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

balance This PR messes with the general balance of the game faction changes Changes something involving factions. needs work Something isn't right with this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants