forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FIx plural of granola (CleverRaven#38029) #83
Merged
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
Increasing from 1L to 1.5L in order to account for increased volume of all heavy batteries
13 Feb 2020 Ultimate Cataclysm Demo Update
* Avoid double activation penalty for mp3 player This makes mp3 players take the same amount of time to activate or deactivate as music-playing smartphones. PR #37584 added 200 (de-)activation time to the smartphones, but since the mp3 player already had its own 200 move cost, this made the mp3 player take twice as long as the other devices. * Mention music instead of earbuds in message Previous message was vague Fixes #37996
Generic modern json
Generic modern json
Armor name to object
Armor Name to object, fix looks_like
Comestible Name to object
Updating magazine_well for the regular UPS
[ My Sweet Cataclysm ] Gummed effect duration capped at 30 s
FIx plural of granola
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