rej clean

2017-05-30 15:55:00 -05:00
parent a821d90a37
commit bc5ecc91b5
6 changed files with 0 additions and 68 deletions
@@ -1,10 +0,0 @@
-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)