From da94f632516b736b793194ccc07f1a428ff9f24a Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Sun, 3 Jul 2022 07:25:09 -0500 Subject: [PATCH] Nerfs telekinesis (#18177) * tk nerfed from .3 to 3 seconds * Update telekinesis.dm * removes those (), I didn't need em --- 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 5e22e548a99..531f39182e2 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 > 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