From 6def6cddda29190d5b196631fb629048fcd94655 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 4 Jun 2017 11:06:14 -0500 Subject: [PATCH] Refactors yet another spawn cooldown (#1384) --- code/game/machinery/doors/airlock.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 32f7ada6e3..c3c718966d 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -333,16 +333,14 @@ /obj/machinery/door/airlock/proc/shock(mob/user, prb) if(!hasPower()) // unpowered, no shock return FALSE - if(hasShocked) + if(hasShocked > world.time) return FALSE //Already shocked someone recently? if(!prob(prb)) return FALSE //you lucked out, no shock for you do_sparks(5, TRUE, src) var/tmp/check_range = TRUE if(electrocute_mob(user, get_area(src), src, 1, check_range)) - hasShocked = TRUE - spawn(10) - hasShocked = FALSE + hasShocked = world.time + 10 return TRUE else return FALSE