Skip to content

Unification of need_charges_msg#85148

Merged
Maleclypse merged 1 commit intoCleverRaven:masterfrom
Uwuewsky:battery-msg
Feb 7, 2026
Merged

Unification of need_charges_msg#85148
Maleclypse merged 1 commit intoCleverRaven:masterfrom
Uwuewsky:battery-msg

Conversation

@Uwuewsky
Copy link
Contributor

@Uwuewsky Uwuewsky commented Feb 6, 2026

Summary

None

Purpose of change

  1. (off)'s
off1
  1. The game have many different messages for depleted batteries (need_charges_msg). The main issue is that these messages are too long and only appear in the activation menu, where screen space is limited.

Describe the solution

Replace all messages like The %s's batteries are dead with The batteries are dead. This wording is independent of the item's name, shorter, and more readable.

Minor related fixes:
Added the missing ammo_scale to shocktonfa, which prevented its flashlight from turning off when the battery died. Removed the unnecessary need_charges requirement, as turning the tonfa off does not require charge.
Laptops use the same messages for lighting up the screen.

Describe alternatives you've considered

Maybe a different message wording? It will display for both a depleted and a missing battery.
Maybe use the singular form The battery is dead.

Testing

off2

Additional context

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-requesting reviews from non-collaborators: @Standing-Storm

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Melee Melee weapons, tactics, techniques, reach attack Mods: Aftershock Anything to do with the Aftershock mod Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Items: Armor / Clothing Armor and clothing Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Mind Over Matter astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Feb 6, 2026
@Uwuewsky Uwuewsky closed this Feb 6, 2026
@Uwuewsky Uwuewsky reopened this Feb 6, 2026
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 6, 2026
@Maleclypse Maleclypse merged commit 402075f into CleverRaven:master Feb 7, 2026
49 of 57 checks passed
@Uwuewsky Uwuewsky deleted the battery-msg branch February 7, 2026 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Melee Melee weapons, tactics, techniques, reach attack Mods: Aftershock Anything to do with the Aftershock mod Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Mind Over Matter Mods: Xedra Evolved Anything to do with Xedra Evolved

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants