From 030586802fdd0e69a6627d7f69db355bf7033bd0 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Wed, 18 May 2016 22:59:40 -0400 Subject: [PATCH] [s] Fixes a major exploit with TK in-hand clicking. (#17760) * Adds a sanity check to sbeacondrop spawns * generalized fix with qdeleted --- code/_onclick/telekinesis.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 1fb7b369327..a8fbcf17bb9 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -96,8 +96,12 @@ var/const/tk_maxrange = 15 /obj/item/tk_grab/attack_self(mob/user) - if(focus) - focus.attack_self_tk(user) + if(!focus) + return + if(qdeleted(focus)) + qdel(src) + return + focus.attack_self_tk(user) /obj/item/tk_grab/afterattack(atom/target, mob/living/carbon/user, proximity, params)//TODO: go over this if(!target || !user)