Merge with upstream #2
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
Replaces the placeholder repairs like i accidentally left in with proper flags.
Co-Authored-By: ZhilkinSerg <[email protected]>
Co-Authored-By: ZhilkinSerg <[email protected]>
Co-Authored-By: ZhilkinSerg <[email protected]>
Eyeballing the size of pills using centimeter-long cubes is well within average human's capabilities. Telling apart 10mL and 1mL shouldn't require a stack of items.
Suggestions by @codemime
Co-Authored-By: ZhilkinSerg <[email protected]>
Corrected whistle multitool weight and volume
Armor name to object
…th-description Update json_info barrel_length description
…lags Remove placeholder repairs_like
* Gun barrel length to string * Correct volumes * Actual volumes based on testing from master
Display item volumes with a higher precision
called other item groups; deleted redundant item entries
…revamp kitchen item group revamp
Fix ammo disassembly and allow for disassembly of multiple rounds
…-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
* Added recipe for ghee I noticed we didn't have a ghee recipe, so I added one. It seemed similar to cooking_oil2 so I used that as a base. Should I add a rag to the components to represent straining through cheesecloth? Should it require a strainer? * Now you need a strainer of some sort. added a variety * Make craft time realistic Co-Authored-By: I-am-Erk <[email protected]> * Added an indian cookbook, moved curry and ghee recipes to that Tested and things seem to be working * Itemgroups added The book should spawn in a number of different places now, with a fairly low distribution. Not married to those numbers, though * Set ghee recipe to be in cookbook * Removed Indian Cookbook from books, itemgroups, and recipes Co-authored-by: I-am-Erk <[email protected]>
Tweaked description window x start point
Fix typo on pages.h
Ammo Name to object leave the s, double have decimal
* Ignore missing author login instead of crashing. * Import changelogs up to January 2020. * Copyedit changelog
…ts (#37604) * Add boiled fiddleheads to any_veggy Fiddleheads should be more well integrated into the game. I've added them to any_veggy and removed the ability to boil fiddleheads in broth to avoid recursion errors * Update cooking_components.json Added a requirement list including cooking oils and butter, because many recipes should work fine with any of them * Added new list to pancakes recipe for testing So I can test the "any_butter_or_oil" requirement I swapped out the cooking oils for it * cooking_oil1 isn't a thing >__< * lint * Tests Past. Cake recipe time I ran a simple test, seeing if I could craft pancakes with butter. Worked fine. I'm gonna edit recipe_food.json next. Tests to follow * Added new cooking component: fry_oil For when you want the food to absorb some of the fat it's being deep fried in. Potato chips and French fries both use fry_oil, which contains cooking_oil, cooking_oil2, and ghee. All tested. Works properly for me * Update recipe_food.json Changed a bunch of recipes to use any_butter_or_oil. Tested each one. Seems to work fine * Fixed syntax error * Many minor changes to recipes I made fried liver and fried tripe use fry_oil Canged some pan frying oils to any_butter_or_oil Added boiled and sauteed fiddleheads to salad recipe Added salsify_baked to any_veggie * Took dandelion_cooked out of recipe because it's already in veggy_any * Update tile_config.json * Trying to pass tests * Update veggy_dishes.json Co-authored-by: I-am-Erk <[email protected]>
Prevent potential DBZ in vehicle smash code
Gun-name-to-object-leave-the-s
To avoid meaningless repetitive editing.
…to-object Tool_armor, gun and monster name to object
…sidebar-option Fix duplicate sound display for labels sidebar
* use different pos as random NPC can be invalidated * remove random guy
Fix clang-tidy error with panels.cpp
Improve submap encapsulation
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.
I merge, you merge, we all merge and stuff.