Merge pull request CleverRaven#39629 from Brian-Otten/post-apoc-price… #143
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
Military pilot added to the overrun and helicopter crash scenarios
Added leg ammo pouch and an additional magazine
Tidying up
This might make the trait work?
Co-Authored-By: anothersimulacrum <[email protected]>
Co-Authored-By: anothersimulacrum <[email protected]>
Co-Authored-By: anothersimulacrum <[email protected]>
Co-Authored-By: anothersimulacrum <[email protected]>
Hopefully this will pass the test
Co-Authored-By: Anton Burmistrov <[email protected]>
got rid of full stop
Fixed typo
Based on the item description, this would not be worn on the waist.
Remove WAIST tag from utility vest
Update armor.json
Add documentation on interface accessibility
Use correct sh syntax for string comparison
Fix items spawning with fewer charges than defined in their item group entry
* Created json-variants of above-ground and underground sections of cave location and made it spawn * Removed hardcoded cave mapgen
* Colorize butchering tool info * Match quality color
Remove table buff/debuff for medicine
New Military Pilot Profession
Add grenade belts to loot pool
Build and use json_formatter in Visual Studio
Adds post apoc prices to corpses, generic, and gunmods. (part 10 of reworking all prices)
Adds post apoc prices to magazines. (part 11 of reworking all prices)
Adds post apoc prices to resources. (part 12 of reworking all prices)
Adds post apoc prices to tools. (part 13 of reworking all prices)
Add prices to vehicle parts. (part 14 of reworking all prices)
Adds prices to unsorted json. (part 15 of reworking all prices)
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.
Summary
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context