From 852fc9f7dd2bbcbd1db44aee57ffb93d5e0c7310 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 2 Jan 2023 16:06:55 -0800 Subject: [PATCH] Merge pull request #8867 from Seris02/augmentfix fixes augment implants so you can't spam the fuck out of them --- code/modules/organs/internal/augment.dm | 6 +++--- code/modules/organs/internal/augment/armmounted.dm | 4 ++-- code/modules/organs/internal/augment/bio.dm | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/organs/internal/augment.dm b/code/modules/organs/internal/augment.dm index cfd5768846..8c99d07942 100644 --- a/code/modules/organs/internal/augment.dm +++ b/code/modules/organs/internal/augment.dm @@ -28,7 +28,7 @@ var/radial_state = null // Icon state for the augment's radial icon. var/aug_cooldown = 30 SECONDS - var/last_activate = null + var/cooldown = null /obj/item/organ/internal/augment/Initialize() . = ..() @@ -59,8 +59,8 @@ return if(aug_cooldown) - if(last_activate <= world.time + aug_cooldown) - last_activate = world.time + if(cooldown <= world.time) + cooldown = world.time + aug_cooldown else return diff --git a/code/modules/organs/internal/augment/armmounted.dm b/code/modules/organs/internal/augment/armmounted.dm index c22988de83..932f4cf646 100644 --- a/code/modules/organs/internal/augment/armmounted.dm +++ b/code/modules/organs/internal/augment/armmounted.dm @@ -135,8 +135,8 @@ return if(aug_cooldown) - if(last_activate <= world.time + aug_cooldown) - last_activate = world.time + if(cooldown <= world.time) + cooldown = world.time + aug_cooldown else return diff --git a/code/modules/organs/internal/augment/bio.dm b/code/modules/organs/internal/augment/bio.dm index 543394fcde..71aa461abb 100644 --- a/code/modules/organs/internal/augment/bio.dm +++ b/code/modules/organs/internal/augment/bio.dm @@ -93,8 +93,8 @@ return if(aug_cooldown) - if(last_activate <= world.time + aug_cooldown) - last_activate = world.time + if(cooldown <= world.time) + cooldown = world.time + aug_cooldown else return