Skip to content
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 20 commits into from
Feb 15, 2020

Conversation

fengjixuchui
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

ektoplazm and others added 20 commits February 13, 2020 12:32
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
Armor Name to object, fix looks_like
Updating magazine_well for the regular UPS
[ My Sweet Cataclysm ] Gummed effect duration capped at 30 s
FIx plural of granola
@fengjixuchui fengjixuchui merged commit 6c4f2b0 into fengjixuchui:master Feb 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants