Updates #51
Merged
Updates #51
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
Went with 67% at 5 units, as one assumes some chopping is needed.
* 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
The Travis CI test using the sanitizers is *still* timing out sometimes, so disable the next-slowest test. This one should save about 90 seconds.
Made a test category so I didn't need to disable them individually.
Another test that's slow on a CI run that's sometimes taking too long.
* Add -Wlogical-op -Wrestrict These don't trigger anything in our code, but are useful gcc warnings to have enabled. * Remove redundant declarations * Remove unused macros * Fix format signedness * NULL -> nullptr * Guard dbg declaration in sounds.cpp * Enable a few more gcc warning options * Add -Wnon-virtual-dtor and virtual destructors This warning detects classes with virtual functions but a non-virtual destructor. Deleting instances through pointers whose type is such a class is undefined behaviour. I'm not certain whether any of the classes I've added the virtual destructors to here actually needed it, but there should be negligible performance impact, and it's a good warning to have enabled. * Remove -Wrestrict Turns out it's not actually supported by gcc 5.3.
fix laundromat
* Decreasing how many Zombie brides and priests there are. * Running JSON lint for the zombie brides JSON changes.
* Disable grenade_lethality test for sanitizer CI The Travis CI test using the sanitizers is *still* timing out sometimes, so disable the next-slowest test. This one should save about 90 seconds. * Disable all starve tests on clang sanitizer test Made a test category so I didn't need to disable them individually. * Disable vehicle efficiency on the gcc asan build Another test that's slow on a CI run that's sometimes taking too long.
Fix bug where crouching affects lighting
#37794) * Converting multi-cooker to another item when filled with dish. To prevent other crafting processes to touch it when it is cooking.
Include JSON formatting tool binary in release.
* container name to object, volume to string * Update data/json/items/containers.json Co-Authored-By: I-am-Erk <[email protected]> * Update data/json/items/tool/container.json Co-Authored-By: I-am-Erk <[email protected]> * Update data/json/items/containers.json Co-Authored-By: I-am-Erk <[email protected]> Co-authored-by: I-am-Erk <[email protected]>
This matches the savings in other chemical processes which refine liquids.
Ammo name to object
Gun name to object
Fix translation of vehicle owner
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.
Updating to current commits