Merge pull request CleverRaven#37779 from ashGlaw/Fix-Sauteed-Fiddleh… #75
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
…-fix Military base monstergroups fix
tool Name to object
* Comestible alcohol name to object * Name to object
* Gun barrel length to string * Correct volumes * Actual volumes based on testing from master * Gun barrel length to string
* Audit holster capacities * Fix professions having holsters they can't put gun back into * Shotguns won't fit in fast-draw holster
* Audit Bond Arms Derringer * Audit Colt Lightning .45 Carbine * Audit Uberti Cattleman
ARMOR Name to object
Monsterdrops.json sorting
Change pouch to ragpouch in looks_like
Sauteed fiddleheads were never meant to have 1900+ kcal. Forcing the use of cooking oil or butter brings their range of calories back into reasonable levels.
Updated turret mount description
…amining-in-aim Allowed scrolling while examining items in AIM
* Name to object, volume to string * Name to object, leave the s
* Name to object * Name to object, leave the s
Added position query for spray can and markers actions.
* Added a nickname * Added some names to en.json * removed fake location
* Added cardboard material * Added cardboard to misc repair kit * Added cardboard as an item * Replaced paper with cardboard in item materials * Added cardboard to uncraft recipes * Changed fletching requirement * Reverted changes from conflict * Raised weight/dropped charge amount * Dropped amount needed for recipes * Adjusted deconstruction recipes
Fixing style
No more 1900+kcal sauteed fiddleheads
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