[s] Fixes TK remote grab exploit

This commit is contained in:
CitadelStationBot
2017-06-25 07:41:23 -05:00
parent 4293607509
commit 72e7632fa8
+10 -4
View File
@@ -11,7 +11,7 @@
*/ */
/atom/proc/attack_tk(mob/user) /atom/proc/attack_tk(mob/user)
if(user.stat) if(user.stat || !tkMaxRangeCheck(user, src))
return return
new /obj/effect/temp_visual/telekinesis(loc) new /obj/effect/temp_visual/telekinesis(loc)
user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc
@@ -20,14 +20,20 @@
/obj/attack_tk(mob/user) /obj/attack_tk(mob/user)
if(user.stat) if(user.stat)
return return
if(anchored)
return ..()
attack_tk_grab(user)
/obj/item/attack_tk(mob/user)
if(user.stat)
return
attack_tk_grab(user)
/obj/proc/attack_tk_grab(mob/user)
var/obj/item/tk_grab/O = new(src) var/obj/item/tk_grab/O = new(src)
O.tk_user = user O.tk_user = user
if(O.focus_object(src)) if(O.focus_object(src))
user.put_in_active_hand(O) user.put_in_active_hand(O)
else
qdel(O)
..()
/mob/attack_tk(mob/user) /mob/attack_tk(mob/user)
return return