forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge pull request CleverRaven#38241 from Fris0uman/liquid_bash #90
Merged
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
Made second vet office. Modification of spawns will come out at later date.
Tweak mapgen for animal pound
…ragment mass. (#37710) * Smaller fragments Change fragment from nailbombs to 0.4g (half a nail) And change to 1g from 2g for fragmenting metal bombs.
Went with 67% at 5 units, as one assumes some chopping is needed.
* house palette tweak minor changes to make palette more versatile * Update house_general_palette.json
* Update spike recipe. Now uses 1 chunk of steel: a survvior cannot possibly hammer out a spike from 2 steel pieces with only a rock and no welding equipment. Where does the second steel chunk go, anyway?
In one conversation path, Luo could not be recruited. Added the appropriate flag to the json to allow correct recruiting.
* One and only
Bionic name to object
Permit making candles from lard
Ammo name to object
Magazine name to object
bionic_item name to object
🍅 Add batch time to ketchup in recipe_food.json
Add purse to bride and ballroom dancer professions
Tweaked canning ratios for fruit, tomatoes, and liver
Make spots craftable in the dark
Disallow bashing liquids
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