Skip to content
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
merged 45 commits into from
Feb 23, 2020

Conversation

fengjixuchui
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

arijust and others added 30 commits February 15, 2020 18:03
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.
Permit making candles from lard
@fengjixuchui fengjixuchui merged commit 60ecce5 into fengjixuchui:master Feb 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.