Fixes doubled post-round end time.

2017-05-29 09:15:08 -05:00
parent c463043fc3
commit 2ad5c8ac7e
1 changed files with 10 additions and 0 deletions
@@ -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, "<span class='boldannounce'>Rebooting World in [delay/10] [(delay >= 10 && delay < 20) ? "second" : "seconds"]. [reason]</span>")
+ 
+ 	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)