cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes grabbing the tk grab (#22952)

Browse Source
This commit is contained in:
XDTM
2017-01-12 21:05:49 +01:00
committed by KorPhaeron
parent de63aee96e
commit 1a747a0d59
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/_onclick/telekinesis.dm
View File

@@ -92,6 +92,8 @@ var/const/tk_maxrange = 15
qdel(src) qdel(src)
return return
/obj/item/tk_grab/attack_hand(mob/user)
return
/obj/item/tk_grab/attack_self(mob/user) /obj/item/tk_grab/attack_self(mob/user)
if(!focus) if(!focus)
@@ -100,6 +102,7 @@ var/const/tk_maxrange = 15
qdel(src) qdel(src)
return return
focus.attack_self_tk(user) focus.attack_self_tk(user)
update_icon()
/obj/item/tk_grab/afterattack(atom/target, mob/living/carbon/user, proximity, params)//TODO: go over this /obj/item/tk_grab/afterattack(atom/target, mob/living/carbon/user, proximity, params)//TODO: go over this
if(!target || !user) if(!target || !user)
@@ -136,11 +139,13 @@ var/const/tk_maxrange = 15
var/resolved = target.attackby(I, user, params) var/resolved = target.attackby(I, user, params)
if(!resolved && target && I) if(!resolved && target && I)
I.afterattack(target,user,1) // for splashing with beakers I.afterattack(target,user,1) // for splashing with beakers
update_icon()
else else
apply_focus_overlay() apply_focus_overlay()
focus.throw_at(target, 10, 1,user) focus.throw_at(target, 10, 1,user)
last_throw = world.time last_throw = world.time
user.changeNext_move(CLICK_CD_MELEE) user.changeNext_move(CLICK_CD_MELEE)
update_icon()
/proc/tkMaxRangeCheck(mob/user, atom/target, atom/focus) /proc/tkMaxRangeCheck(mob/user, atom/target, atom/focus)
var/d = get_dist(user, target) var/d = get_dist(user, target)