Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 84ad6a4

Browse files
FIX telekinesis unable to interact with things (#22881)
1 parent 7f90984 commit 84ad6a4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

code/_onclick/telekinesis.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
if(user.stat || !tkMaxRangeCheck(user, src))
2020
return
2121
new /obj/effect/temp_visual/telekinesis(get_turf(src))
22-
user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc
22+
user.UnarmedAttack(src, FALSE, list()) // attack_hand, attack_paw, etc
2323
add_hiddenprint(user)
2424
return
2525

code/game/machinery/_machinery.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,6 @@ Class Procs:
299299

300300
return user.can_interact_with(src) //AIs don't care about petty mortal concerns like needing to be next to a machine to use it, but borgs do care somewhat
301301

302-
. = ..()
303-
if(!.)
304-
return FALSE
305-
306302
if(panel_open && !(interaction_flags_machine & INTERACT_MACHINE_OPEN))
307303
return FALSE
308304

@@ -395,6 +391,10 @@ Class Procs:
395391
return FALSE
396392
return _try_interact(user, modifiers)
397393

394+
/obj/machinery/attack_tk(mob/user, modifiers)
395+
new /obj/effect/temp_visual/telekinesis(get_turf(src))
396+
return attack_hand(user, modifiers)
397+
398398
/obj/machinery/attack_ai(mob/user, modifiers)
399399
if(!(interaction_flags_machine & INTERACT_MACHINE_ALLOW_SILICON) && !IsAdminGhost(user))
400400
return FALSE

0 commit comments

Comments
 (0)