From 8955dc7db6b04c19de41fbb8637fd2a50b2a224f Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Fri, 17 Jul 2020 21:31:55 +0200 Subject: [PATCH] Actual fix. Did a wrong analysis --- code/game/objects/structures/kitchen_spike.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index ad913540b50..c3f36e42f1d 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -69,15 +69,15 @@ if(isliving(G.affecting)) if(!has_buckled_mobs()) if(do_mob(user, src, 120)) - if(spike(G.affecting)) - G.affecting.visible_message("[user] slams [G.affecting] onto the meat spike!", "[user] slams you onto the meat spike!", "You hear a squishy wet noise.") - qdel(G) + var/mob/living/affected = G.affecting + if(spike(affected)) + affected.visible_message("[user] slams [affected] onto the meat spike!", "[user] slams you onto the meat spike!", "You hear a squishy wet noise.") return return ..() /obj/structure/kitchenspike/proc/spike(mob/living/victim) - if(!istype(victim) || QDELETED(victim)) + if(!istype(victim)) return FALSE if(has_buckled_mobs()) //to prevent spam/queing up attacks