[s] Fixes a major exploit with TK in-hand clicking. (tgstation#17760)

* Adds a sanity check to sbeacondrop spawns * generalized fix with qdeleted
new525 · May 19, 2016 · 0305868 · 0305868
1 parent 2460d53
commit 0305868
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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)