From dc4ed47936f7b6ffef0c00e5fdfd6ae00a41376d Mon Sep 17 00:00:00 2001 From: AnturK Date: Mon, 29 May 2017 16:14:40 +0200 Subject: [PATCH] Fixes double roundend time. (#27840) --- 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 ec36b20f876..586a99c3f47 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -832,7 +832,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 && !skip_delay)