diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index 88520028f4d..7ee9f68d9da 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -63,7 +63,8 @@ #define COOLDOWN_START(cd_source, cd_index, cd_time) (cd_source.cd_index = world.time + cd_time) -#define COOLDOWN_CHECK(cd_source, cd_index) (cd_source.cd_index < world.time) +//Returns true if the cooldown has run its course, false otherwise +#define COOLDOWN_FINISHED(cd_source, cd_index) (cd_source.cd_index < world.time) #define COOLDOWN_RESET(cd_source, cd_index) cd_source.cd_index = 0 diff --git a/code/datums/action.dm b/code/datums/action.dm index 591b8667f77..b0d93058423 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -537,7 +537,7 @@ if(!isturf(owner.loc)) //Don't let the player use this to escape mechs/welded closets. to_chat(owner, "You need more space to activate this implant!") return - if(COOLDOWN_CHECK(src, box_cooldown)) + if(!COOLDOWN_FINISHED(src, box_cooldown)) return COOLDOWN_START(src, box_cooldown, 10 SECONDS) var/box = new boxtype(owner.drop_location()) diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 73fd0e16ef8..099f4af782b 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -51,7 +51,7 @@ damage *= 0.75 - if(!COOLDOWN_CHECK(src, caltrop_cooldown)) + if(COOLDOWN_FINISHED(src, caltrop_cooldown)) COOLDOWN_START(src, caltrop_cooldown, 1 SECONDS) //cooldown to avoid message spam. var/atom/A = parent if(!H.incapacitated(ignore_restraints = TRUE)) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index e18db2f9ab8..3ff83aa2a3f 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -404,7 +404,7 @@ /obj/machinery/door/airlock/proc/shock(mob/living/user, prb) if(!istype(user) || !hasPower()) // unpowered, no shock return FALSE - if(COOLDOWN_CHECK(src, shockCooldown)) + if(!COOLDOWN_FINISHED(src, shockCooldown)) return FALSE //Already shocked someone recently? if(!prob(prb)) return FALSE //you lucked out, no shock for you