From 295532b9ffbbd876a4c41eab9f169dfd87155ccd Mon Sep 17 00:00:00 2001 From: Kyep Date: Mon, 26 Nov 2018 15:18:11 -0800 Subject: [PATCH] only switch if existing target unconscious --- code/modules/mob/living/simple_animal/hostile/hellhound.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hellhound.dm b/code/modules/mob/living/simple_animal/hostile/hellhound.dm index fb6e6d0df6c..65a2391acb1 100644 --- a/code/modules/mob/living/simple_animal/hostile/hellhound.dm +++ b/code/modules/mob/living/simple_animal/hostile/hellhound.dm @@ -102,8 +102,10 @@ /mob/living/simple_animal/hostile/hellhound/attackby(obj/item/C, mob/user, params) . = ..() - if(target) - target = user + if(target && isliving(target)) + var/mob/living/L = target + if(L.stat != CONSCIOUS) + target = user /mob/living/simple_animal/hostile/hellhound/proc/special_aoe() if(world.time < (smoke_lastuse + smoke_freq))