cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes stun batons (#22103)

Browse Source
This commit is contained in:
KorPhaeron
2016-12-11 09:28:57 -05:00
committed by AnturK
parent 354c03418b
commit e74daaa50c
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/game/objects/items/weapons/stunbaton.dm
View File

@@ -117,24 +117,23 @@
..()
return
var/mob/living/carbon/human/L = M
if(!istype(L))
return
if(check_martial_counter(L, user))
return
if(ishuman(M))
var/mob/living/carbon/human/L = M
if(check_martial_counter(L, user))
return
if(user.a_intent != INTENT_HARM)
if(status)
if(baton_stun(L, user))
user.do_attack_animation(L)
if(baton_stun(M, user))
user.do_attack_animation(M)
return
else
L.visible_message("<span class='warning'>[user] has prodded [L] with [src]. Luckily it was off.</span>", \
M.visible_message("<span class='warning'>[user] has prodded [M] with [src]. Luckily it was off.</span>", \
"<span class='warning'>[user] has prodded you with [src]. Luckily it was off</span>")
else
if(status)
baton_stun(L, user)
baton_stun(M, user)
..()