cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes stun-harmbatong. (#61418)

Browse Source 
Title. I have been told the refactor broke stun'n'harm batoning for stunbatons so I'm fixing it.
This commit is contained in:
Ghom
2021-09-20 17:57:46 +02:00
committed by GitHub
parent 0b27bf0871
commit d65566005a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/baton.dm
+2 -2
View File
@@ -488,8 +488,8 @@
if(. != BATON_DO_NORMAL_ATTACK)
return
if(LAZYACCESS(modifiers, RIGHT_CLICK))
if(active && cooldown_check <= world.time && check_parried(target, user))
finalize_baton_attack(target, user, modifiers)
if(active && cooldown_check <= world.time && !check_parried(target, user))
finalize_baton_attack(target, user, modifiers, in_attack_chain = FALSE)
else if(!user.combat_mode)
target.visible_message(span_warning("[user] prods [target] with [src]. Luckily it was off."), \
span_warning("[user] prods you with [src]. Luckily it was off."))