FIX telekinesis unable to interact with things (#22881)

yogstation13 · Jan 20, 2025 · 84ad6a4 · 84ad6a4
1 parent 7f90984
commit 84ad6a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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