woo

2017-05-29 01:59:49 -05:00
parent 1f618ab39e
commit 5fe7f7083a
2 changed files with 11 additions and 18 deletions
@@ -744,6 +744,15 @@ 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)
+
+
 	modevoted = SSticker.modevoted

 /datum/controller/subsystem/ticker/proc/send_news_report()
@@ -844,7 +853,7 @@ SUBSYSTEM_DEF(ticker)
 	if(delay_end)
 		to_chat(world, "<span class='boldannounce'>An admin has delayed the round end.</span>")
 		return
-	
+
 	to_chat(world, "<span class='boldannounce'>Rebooting World in [delay/10] [(delay >= 10 && delay < 20) ? "second" : "seconds"]. [reason]</span>")

 	var/start_wait = world.time
@@ -854,7 +863,7 @@ SUBSYSTEM_DEF(ticker)
 	if(delay_end)
 		to_chat(world, "<span class='boldannounce'>Reboot was cancelled by an admin.</span>")
 		return
-	
+
 	SSblackbox.set_details("[feedback_c]","[feedback_r]")

 	log_game("<span class='boldannounce'>Rebooting World. [reason]</span>")
@@ -1,16 +0,0 @@
-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"