shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes full controller recovery not restoring appropriate runlevel

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-24 08:25:49 -05:00
parent f276937bc5
commit 20089a34e8
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master.dm
+2 -1
View File
@@ -177,7 +177,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
to_chat(world, "<span class='boldannounce'>[msg]</span>")
log_world(msg)
SetRunLevel(1)
if (!current_runlevel)
SetRunLevel(1)
// Sort subsystems by display setting for easy access.
sortTim(subsystems, /proc/cmp_subsystem_display)
code/controllers/subsystem/ticker.dm.rej
+16
View File
@@ -0,0 +1,16 @@
diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks)
@@ -719,6 +719,14 @@ SUBSYSTEM_DEF(ticker)
cinematic = SSticker.cinematic
maprotatechecked = SSticker.maprotatechecked
+ switch (current_state)
+ if(GAME_STATE_SETTING_UP)
+ Master.SetRunLevel(RUNLEVEL_SETUP)
+ if(GAME_STATE_PLAYING)
+ Master.SetRunLevel(RUNLEVEL_GAME)
+ if(GAME_STATE_FINISHED)
+ Master.SetRunLevel(RUNLEVEL_POSTGAME)
+
/datum/controller/subsystem/ticker/proc/send_news_report()
var/news_message
var/news_source = "Nanotrasen News Network"