From 84ad6a4d3061edd7a48342be5d56ed36b50bab3c Mon Sep 17 00:00:00 2001
From: Bop <smmsmsmsmmm@gmail.com>
Date: Mon, 20 Jan 2025 11:31:22 +0700
Subject: [PATCH] FIX telekinesis unable to interact with things (#22881)

---
 code/_onclick/telekinesis.dm      | 2 +-
 code/game/machinery/_machinery.dm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 25fe8a0ac051..6c0793ef17a2 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -19,7 +19,7 @@
 	if(user.stat || !tkMaxRangeCheck(user, src))
 		return
 	new /obj/effect/temp_visual/telekinesis(get_turf(src))
-	user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc
+	user.UnarmedAttack(src, FALSE, list()) // attack_hand, attack_paw, etc
 	add_hiddenprint(user)
 	return
 
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 0537d3ea8a24..45ae03ed5194 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -299,10 +299,6 @@ Class Procs:
 
 		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
 
-	. = ..()
-	if(!.)
-		return FALSE
-
 	if(panel_open && !(interaction_flags_machine & INTERACT_MACHINE_OPEN))
 		return FALSE
 
@@ -395,6 +391,10 @@ Class Procs:
 		return FALSE
 	return _try_interact(user, modifiers)
 
+/obj/machinery/attack_tk(mob/user, modifiers)
+	new /obj/effect/temp_visual/telekinesis(get_turf(src))
+	return attack_hand(user, modifiers)
+
 /obj/machinery/attack_ai(mob/user, modifiers)
 	if(!(interaction_flags_machine & INTERACT_MACHINE_ALLOW_SILICON) && !IsAdminGhost(user))
 		return FALSE