up #47
Merged
up #47
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
fixes ammo disassembly and allow players to input number of rounds
bugfix: added check to disassembly time to prevent instant disassembly of non-ammo items
incorporate BevapDin's suggested revisions
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.
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
Factoring out the similar loops to check for nearby tables, and using the new `map::has_nearby_table` function instead.
No more 1900+kcal sauteed fiddleheads
tool Name to object, leave the s
Comestible modern json
* Name to object * Name to object * Name to object
Ammo modern json
Factor out map::has_nearby_table for eating/butchering checks
Add debug menu item for spawning nested mapgen
Bugfix house_wooded stairs to nowhere
Prevent broken legs dropping weapon
Liquid-loaded robots drop bottled liquids when they drop ammo on-death. As the liquid should drop on the ground but doesn't, dropping the flag fixes obvious problems
Routine i18n updates on 7 Feb 2020
Remove DROPS_AMMO from firefighter bot
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