SUS Bathroom Dec 31st #38
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
…dependent of the compass.
Removed `auto` where apropriate
add looks like
I moved the parts I understood and didn't move the specific mapgens. Will likely create own lab finales eventually.
- Check result of `inventory::find_item` before using it. Using `INT_MIN` is safe (`inventory::find_item` will return a null item reference), but this is clearer. - Add assertions to catch future errors. - Compare item pointers, not names.
…awing is disabled
Fix mysterious creation of submap (0,0,-9).
* Adds 3 kinds of golems. They still need more work. * Changes to golems. Still not done. Add broken golems and effect/spells later. * Add slow effect. * Add spells for golems. * Update monsterspells.json * Update effects.json * Update monsters.json * Create constructs.json * Create deconstruction.json * Update deconstruction.json * Update monsterspells.json * Edit golem descriptions. * Update deconstruction.json * Added golems to forest mon_group I didn't have a better idea where to add them. * Fix monsters weight. * Change weight from grams to kilograms. * Tweak spells. * Change valid targets for gas_attack spell Co-Authored-By: Curtis Merrill <curtis.r.merrill@gmail.com> * Lint * One more lint * Fix regeneration for lemure. * some fixes * remove merge error * more color fixes Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
#36037) * Add new options to always prompt fo rdangerous terrain and only while crouching. * Changed default to legacy behavior
* Jsonize crafting skill penalty from mutations * Halve the penalty from paws mutations
Tweak vinegar recipe
…erride Add the mandatory override specifier to make clang-tidy happy
Fix building with ccache.
change <last_name> to <family_name> in graffiti list
…icles Deprecate atomic cars
* Adds 4-door Hatchback, renames old Hatchback to City Car * Adds car_hatch spawns at 50% car spawn rate, reduces car_mini spawns by 50% * Fixes car_hatch item group spawns. * Increase car_hatch fuel tank size to 40L (midpoint between city car and regular car)
Make JSON formatter conserve escape sequences
Replace characters in the Graphical Overmap mod with escape sequences
Fix token from %d to %s in color-related debug message
* autoswim * prompting and smarter choice
new tileset retrodays+
* Add triffid flower. * Add triffid flower to spawns.
Found by clang-tidy in the Travis tests for #36604.
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