cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

stam crit (#50297)

Browse Source
This commit is contained in:
Akrilla
2020-03-30 17:29:55 -03:00
committed by GitHub
parent 0c67ccf379
commit 078d7bebc4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stunbaton.dm
+3 -2
View File
@@ -253,12 +253,13 @@
/// After the initial stun period, we check to see if the target needs to have the stun applied.
/obj/item/melee/baton/proc/apply_stun_effect_end(mob/living/target)
var/trait_check = HAS_TRAIT(target, TRAIT_STUNRESISTANCE) //var since we check it in out to_chat as well as determine stun duration
if(!target.IsKnockdown())
to_chat(target, "<span class='warning'>Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]</span>")
if(trait_check)
target.Knockdown(stun_time * 0.1)
else
target.Knockdown(stun_time)
if(!target.IsKnockdown())
to_chat(target, "<span class='warning'>Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]</span>")
/obj/item/melee/baton/emp_act(severity)
. = ..()