Merge pull request CleverRaven#38146 from Ramza13/battery #87
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
rebalanced hauling pain penalty and gave a stamina discount to dragging wheeled vehicles
Based upon emperical observations of what was once a shake I found in the back of the office fridge, mixed protein shakes *do not* have an indefinite shelf-life. This commit adds a 2-day spoilage counter to all protein shakes.
This error is fatal, and not all mods are clean with respect to it, so leaving it in regular play would break a bunch of people's games. (Even if it were non-fatal, it would be super annoying for players to click through many debugmsgs). Make it test-mode only to avoid that. Unfortunately, that means that mappers who don't run the tests won't find out about their mapgen typos until they PR them, but I think it's the best we can do for now.
The undefined key error has two special case characters. This needs to be documented.
The Travis CI job for the clang build with sanitizers is timing out. Speed it up by disabling the currently-slowest test, which is starve_test. This should save 2 minutes and hopefully bring it back under the 50 minute time limit.
Armor name to object
Comestible name to object, flags to array
Canning juices now results in canned products
* fix sandbag recipe components sandbag needed 3200 sand to craft. should be 60 * update item sandbag weight * Update chemicals_and_resources.json * make sandbag recipe reversible? * changed 3200 sand to 3000 (15L worth) if sandbag is 16L and canvas sack takes up 1L then 3000 sand would make 16L. I could change the weight back those couple hundred grams too on the sandbag if u all want to be super accurate and technical * changed uncraft recipe changed from 60 sand to 3000 sand * removed reversible
* Tweaked professions, point cost and description * Added hulks to monstergroups * Revert "Added hulks to monstergroups" This reverts commit 3e1d625.
Armor name to object, volume to string, fix looks_like
Disable starve_test on sanitizer run
Comestible name to object, flags to array
Trench Knife is now an unarmed weapon
Comestible Name to object, double have decimal
Armor name to object, fix looks_like
Reduced crafting time of making a livestock carrier using a cargo carrier as a base. The current recipe has it using the same amount of time while building a brand new one from scratch takes the same amount of time. Reasoning is that an animal locker from scratch takes 1 hour and building one from a wire basket is 25 minutes. Adding 5 minutes attends for the amount of extra effort it would take to remove what you need while welding the pipes on to make the cage. Looking at animal locker recipe, it takes the same welding charges to make the animal locker so the welding time should be similar.
Mapgen missing key detection
Add spoilage to reconstituted protein shakes
Move string consts from iuse
Move string consts to single location
Move string consts from iexamine.cpp
Dismissed followers form new goals and dont hang around creepily.
* added destruction message * removed exclamation from damage messages
Reduce crafting time for repurposing cargo carrier
* add a note about SUS * Update ITEM_SPAWN.md
Rename BLOB to species_BLOB
…lags-to-array Comestible name to object, flags to array
Pass CLI arguments from cataclysm-launcher shell script to cataclysm binary
* Updated BINDIST_EXTRAS * Rename LICENSE-OFL-Terminus-Font.TXT to LICENSE-OFL-Terminus-Font.txt * Update LICENSE.txt
Remove outdated fonts and set fallback font to unifont
Fixed typo in string const causing battery issues.
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