From a821d90a37e2d09634765a3719b2d4bf17d4a0f3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 30 May 2017 15:54:42 -0500 Subject: [PATCH] commit --- code/controllers/subsystem/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c839c7c33d..0d1eaadc08 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -857,7 +857,7 @@ SUBSYSTEM_DEF(ticker) to_chat(world, "Rebooting World in [delay/10] [(delay >= 10 && delay < 20) ? "second" : "seconds"]. [reason]") var/start_wait = world.time - UNTIL(round_end_sound_sent && (world.time - start_wait) > (delay * 2)) //don't wait forever + UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2)) //don't wait forever sleep(delay - (world.time - start_wait)) if(delay_end)