Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay

Fix various bugs with telekinesis
This commit is contained in:
Jordan Brown
2018-05-25 10:49:21 -05:00
committed by letterjay
parent cc088d9113
commit e582e7019e
10 changed files with 35 additions and 21 deletions
+1 -1
View File
@@ -473,7 +473,7 @@
var/mob/living/carbon/C = usr
C.swap_hand()
else
var/turf/T = params2turf(modifiers["screen-loc"], get_turf(usr.client ? usr.client.eye : usr))
var/turf/T = params2turf(modifiers["screen-loc"], get_turf(usr.client ? usr.client.eye : usr), usr.client)
params += "&catcher=1"
if(T)
T.Click(location, control, params)
+7 -1
View File
@@ -15,7 +15,7 @@
/atom/proc/attack_tk(mob/user)
if(user.stat || !tkMaxRangeCheck(user, src))
return
new /obj/effect/temp_visual/telekinesis(loc)
new /obj/effect/temp_visual/telekinesis(get_turf(src))
user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc
add_hiddenprint(user)
return
@@ -104,6 +104,12 @@
qdel(src)
return
/obj/item/tk_grab/examine(user)
if (focus)
focus.examine(user)
else
..()
/obj/item/tk_grab/attack_self(mob/user)
if(!focus)
return