From f4eea0e89deb44c8332c47e7280d81c59d1b3c7b Mon Sep 17 00:00:00 2001 From: Bop Date: Sun, 22 Dec 2024 05:34:16 +0700 Subject: [PATCH 1/4] unga bungaaaaaaaaaaaaaaaaaaaa --- code/_onclick/telekinesis.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 25fe8a0ac051..10539c82b7cd 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, TRUE, list()) // attack_hand, attack_paw, etc add_hiddenprint(user) return From 1ef3aa9e5bcf81f6b73a195c81121ad7eb14d650 Mon Sep 17 00:00:00 2001 From: Bop Date: Mon, 23 Dec 2024 02:02:08 +0700 Subject: [PATCH 2/4] eh --- code/game/machinery/_machinery.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index dff4821a28ff..a96e2b5a662d 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,9 @@ Class Procs: return FALSE return _try_interact(user, modifiers) +/obj/machinery/attack_tk(mob/user, modifiers) + return attack_hand(user, modifiers) + /obj/machinery/attack_ai(mob/user, modifiers) if(!(interaction_flags_machine & INTERACT_MACHINE_ALLOW_SILICON) && !IsAdminGhost(user)) return FALSE From 624d6680817a5772915d6bcc632ce60ce36877d2 Mon Sep 17 00:00:00 2001 From: Bop Date: Mon, 23 Dec 2024 02:08:52 +0700 Subject: [PATCH 3/4] doomedwwwa --- code/game/machinery/_machinery.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index a96e2b5a662d..7536373973eb 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -392,6 +392,7 @@ Class Procs: 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) From 4870d008594692528f5705712e9e3072aa8be556 Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 28 Dec 2024 16:52:46 +0700 Subject: [PATCH 4/4] Update code/_onclick/telekinesis.dm Co-authored-by: SapphicOverload <93578146+SapphicOverload@users.noreply.github.com> --- code/_onclick/telekinesis.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 10539c82b7cd..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, TRUE, list()) // attack_hand, attack_paw, etc + user.UnarmedAttack(src, FALSE, list()) // attack_hand, attack_paw, etc add_hiddenprint(user) return