From 532af461f1be63242faa594dabca747db48a940d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 28 Apr 2017 21:04:00 -0500 Subject: [PATCH] Adds death checks to two hallucinations, preventing the dead from spasming --- code/modules/flufftext/Hallucination.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index cd034a1117..4c1328a38b 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -178,7 +178,7 @@ Gunshots/explosions/opening doors/less rare audio (done) /obj/effect/hallucination/simple/xeno/throw_impact(A) update_icon("alienh_pounce") - if(A == target) + if(A == target && target.stat!=DEAD) target.Weaken(5) target.visible_message("[target] flails around wildly.","[name] pounces on you!") @@ -286,7 +286,7 @@ Gunshots/explosions/opening doors/less rare audio (done) bubblegum = new(wall, target) sleep(10) //ominous wait var/charged = FALSE //only get hit once - while(get_turf(bubblegum) != landing && target) + while(get_turf(bubblegum) != landing && target && target.stat != DEAD) bubblegum.forceMove(get_step_towards(bubblegum, landing)) bubblegum.setDir(get_dir(bubblegum, landing)) target.playsound_local(get_turf(bubblegum), 'sound/effects/meteorimpact.ogg', 150, 1)