standardizes Reboot(), allows round to be delayed after it finishes and removes immediate reboot verb

This commit is contained in:
Jordie0608
2015-06-01 22:07:22 +10:00
parent 2aa0247b00
commit bd7019e033
9 changed files with 35 additions and 109 deletions
+2 -18
View File
@@ -103,25 +103,9 @@ var/datum/subsystem/ticker/ticker
declare_completion()
spawn(50)
if(mode.station_was_nuked)
feedback_set_details("end_proper","nuke")
if(!delay_end)
world << "\blue <B>Rebooting due to destruction of station in [restart_timeout/10] seconds</B>"
world.Reboot("Station destroyed by Nuclear Device.", "end_proper", "nuke")
else
feedback_set_details("end_proper","proper completion")
if(!delay_end)
world << "\blue <B>Restarting in [restart_timeout/10] seconds</B>"
if(blackbox)
blackbox.save_all_data_to_sql()
if(delay_end)
world << "\blue <B>An admin has delayed the round end</B>"
else
sleep(restart_timeout)
kick_clients_in_lobby("\red The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked
world.Reboot()
world.Reboot("Round ended.", "end_proper", "proper completion")
/datum/subsystem/ticker/proc/setup()
//Create and announce mode
+1 -7
View File
@@ -115,14 +115,8 @@ var/datum/subsystem/vote/SSvote
restart = 1
else
master_mode = .
if(restart)
world << "World restarting due to vote..."
feedback_set_details("end_error","restart vote")
if(blackbox) blackbox.save_all_data_to_sql()
sleep(50)
log_game("Rebooting due to restart vote")
world.Reboot()
world.Reboot("Restart vote successful.", "end_error", "restart vote")
return .