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.

Sign up for GitHub

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

Reverts batons to their previous state (somewhat) #4656

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −2
Open

Reverts batons to their previous state (somewhat) #4656

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e6cbd1
Reverts batons to their previous state (somewhat)
F-e-r-n Dec 24, 2024
c6378c9
Ook edit
F-e-r-n Dec 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/game/objects/items/melee/baton.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,10 @@
armor_type = /datum/armor/baton_security
throwforce = 7
force_say_chance = 50
stamina_damage = 145
stamina_damage = 85 //monke edit
knockdown_time = 5 SECONDS
clumsy_knockdown_time = 15 SECONDS
cooldown = 1 SECONDS
cooldown = 2.5 SECONDS //monke edit
on_stun_sound = 'sound/weapons/egloves.ogg'
on_stun_volume = 50
active = FALSE
Expand Down
Loading