Merge pull request #11524 from Fox-McCloud/the-end

The End
This commit is contained in:
variableundefined
2019-05-27 19:45:51 +08:00
committed by GitHub
23 changed files with 80 additions and 1125 deletions
+3 -11
View File
@@ -59,7 +59,7 @@ SUBSYSTEM_DEF(ticker)
world.name = "[config.server_name]: [station_name()]"
else
world.name = station_name()
return ..()
@@ -75,11 +75,11 @@ SUBSYSTEM_DEF(ticker)
if(GAME_STATE_PREGAME)
// This is so we dont have sleeps in controllers, because that is a bad, bad thing
pregame_timeleft = max(0,round_start_time - world.time)
if(pregame_timeleft <= 600 && !tipped) // 60 seconds
send_tip_of_the_round()
tipped = TRUE
if(pregame_timeleft <= 0 || force_start)
current_state = GAME_STATE_SETTING_UP
Master.SetRunLevel(RUNLEVEL_SETUP)
@@ -278,14 +278,6 @@ SUBSYSTEM_DEF(ticker)
auto_toggle_ooc(0) // Turn it off
round_start_time = world.time
/* DONE THROUGH PROCESS SCHEDULER
supply_controller.process() //Start the supply shuttle regenerating points -- TLE
master_controller.process() //Start master_controller.process()
lighting_controller.process() //Start processing DynamicAreaLighting updates
*/
processScheduler.start()
if(config.sql_enabled)
spawn(3000)
statistic_cycle() // Polls population totals regularly and stores them in an SQL DB