From 4d1892b6c7ba3ce99db6496b3120a69ee1d4a574 Mon Sep 17 00:00:00 2001 From: GDN Date: Fri, 1 Jul 2022 18:19:56 -0500 Subject: [PATCH 1/3] tk nerfed from .3 to 3 seconds --- 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 5e22e548a99d..f162e61c2870 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -104,7 +104,7 @@ /obj/item/tk_grab/afterattack(atom/target , mob/living/user, proximity, params)//TODO: go over this if(!target || !user) return - if(last_throw+3 > world.time) + if(last_throw + 3 SECONDS > world.time) return if(!host || host != user) qdel(src) From ac0f603a9489021245f3dc7a3ce5a392146e4481 Mon Sep 17 00:00:00 2001 From: GDN Date: Sat, 2 Jul 2022 12:32:03 -0500 Subject: [PATCH 2/3] Update telekinesis.dm --- code/_onclick/telekinesis.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index f162e61c2870..3c29363e597d 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -4,7 +4,7 @@ This needs more thinking out, but I might as well. */ #define TK_MAXRANGE 15 - +#define TK_COOLDOWN (1.5 SECONDS) /* Telekinetic attack: @@ -101,10 +101,10 @@ afterattack(target, user) return TRUE -/obj/item/tk_grab/afterattack(atom/target , mob/living/user, proximity, params)//TODO: go over this +/obj/item/tk_grab/afterattack(atom/target , mob/living/user, proximity, params) if(!target || !user) return - if(last_throw + 3 SECONDS > world.time) + if(last_throw + TK_COOLDOWN > world.time) return if(!host || host != user) qdel(src) @@ -197,3 +197,5 @@ overlays.Cut() if(focus && focus.icon && focus.icon_state) overlays += icon(focus.icon,focus.icon_state) + +#undef TK_COOLDOWN From 731e0f7296b2e00aa8df041e42e40ef720ac2083 Mon Sep 17 00:00:00 2001 From: GDN Date: Sat, 2 Jul 2022 12:37:58 -0500 Subject: [PATCH 3/3] removes those (), I didn't need em --- 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 3c29363e597d..531f39182e28 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -4,7 +4,7 @@ This needs more thinking out, but I might as well. */ #define TK_MAXRANGE 15 -#define TK_COOLDOWN (1.5 SECONDS) +#define TK_COOLDOWN 1.5 SECONDS /* Telekinetic attack: