From 2ad5c8ac7e21b958f2935be257a2ccc66ed2fdae Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 29 May 2017 09:15:08 -0500 Subject: [PATCH] Fixes doubled post-round end time. --- code/controllers/subsystem/ticker.dm.rej | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 code/controllers/subsystem/ticker.dm.rej diff --git a/code/controllers/subsystem/ticker.dm.rej b/code/controllers/subsystem/ticker.dm.rej new file mode 100644 index 0000000000..24900fe503 --- /dev/null +++ b/code/controllers/subsystem/ticker.dm.rej @@ -0,0 +1,10 @@ +diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks) +@@ -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)