From adbf0bb2ccb084062db51472b651840cf5812cd2 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Mon, 15 Oct 2018 00:54:17 -0400 Subject: [PATCH] stunbaton runtime fix --- code/game/objects/items/weapons/stunbaton.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 56bf5538b02..18053e9c0ca 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -139,12 +139,15 @@ /obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user) + if(!ismob(L)) + return + if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that playsound(L, 'sound/weapons/Genhit.ogg', 50, 1) return - + L.Stun(stunforce) L.Weaken(stunforce) L.apply_effect(STUTTER, stunforce)