World.dm Refactor

2017-05-18 16:37:46 -05:00
parent 97286d25fc
commit 94b7e560ab
19 changed files with 182 additions and 33 deletions
@@ -55,6 +55,8 @@ SUBSYSTEM_DEF(blackbox)
 	return FALSE

 /datum/controller/subsystem/blackbox/Shutdown()
+	set_val("ahelp_unresolved", GLOB.ahelp_tickets.active_tickets.len)
+
 	var/pda_msg_amt = 0
 	var/rc_msg_amt = 0

@@ -37,4 +37,11 @@ SUBSYSTEM_DEF(server_maint)
 		if (MC_TICK_CHECK) //one day, when ss13 has 1000 people per server, you guys are gonna be glad I added this tick check
 			return

+/datum/controller/subsystem/server_maint/Shutdown()
+	kick_clients_in_lobby("<span class='boldannounce'>The round came to an end with you in the lobby.</span>", TRUE) //second parameter ensures only afk clients are kicked
+	for(var/thing in GLOB.clients)
+		var/client/C = thing
+		if(C && config.server)	//if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
+			C << link("byond://[config.server]")
+
 #undef PING_BUFFER_TIME
@@ -0,0 +1,9 @@
+diff a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm	(rejected hunks)
+@@ -5,6 +5,7 @@ SUBSYSTEM_DEF(server_maint)
+ 	wait = 6
+ 	flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
+ 	priority = 10
+	init_order = INIT_ORDER_SERVER_MAINT
+ 	var/list/currentrun
+ 
+ /datum/controller/subsystem/server_maint/Initialize(timeofday)
@@ -20,6 +20,7 @@ SUBSYSTEM_DEF(ticker)

 	var/login_music							//music played in pregame lobby
 	var/round_end_sound						//music/jingle played when the world reboots
+	var/round_end_sound_sent = TRUE			//If all clients have loaded it

 	var/list/datum/mind/minds = list()		//The characters in the game. Used for objective tracking.

@@ -619,9 +620,9 @@ SUBSYSTEM_DEF(ticker)

 	sleep(50)
 	if(mode.station_was_nuked)
-		world.Reboot("Station destroyed by Nuclear Device.", "end_proper", "nuke")
+		Reboot("Station destroyed by Nuclear Device.", "end_proper", "nuke")
 	else
-		world.Reboot("Round ended.", "end_proper", "proper completion")
+		Reboot("Round ended.", "end_proper", "proper completion")

 /datum/controller/subsystem/ticker/proc/send_tip_of_the_round()
 	var/m
@@ -788,3 +789,68 @@ SUBSYSTEM_DEF(ticker)
 		start_at = world.time + newtime
 	else
 		timeLeft = newtime
+
+/datum/controller/subsystem/ticker/proc/load_mode()
+	var/list/Lines = world.file2list("data/mode.txt")
+	if(Lines.len)
+		if(Lines[1])
+			GLOB.master_mode = Lines[1]
+			GLOB.world_game_log << "Saved mode is '[GLOB.master_mode]'"
+
+/datum/controller/subsystem/ticker/proc/save_mode(the_mode)
+	var/F = file("data/mode.txt")
+	fdel(F)
+	F << the_mode
+
+/datum/controller/subsystem/ticker/proc/SetRoundEndSound(the_sound)
+	set waitfor = FALSE
+	round_end_sound_sent = FALSE
+	round_end_sound = fcopy_rsc(the_sound)
+	for(var/thing in GLOB.clients)
+		var/client/C = thing
+		if (!C)
+			continue
+		C.Export("##action=load_rsc", round_end_sound)
+	round_end_sound_sent = TRUE
+
+/datum/controller/subsystem/ticker/proc/Reboot(reason, feedback_c, feedback_r, delay)
+	set waitfor = FALSE
+	if(usr && !check_rights(R_SERVER, TRUE))
+		return
+
+	if(!delay)
+		delay = config.round_end_countdown * 10
+
+	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
+	UNTIL(round_end_sound_sent && (world.time - start_wait) > (delay * 2))	//don't wait forever
+	sleep(delay - (world.time - start_wait))
+
+	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>")
+
+	world.Reboot()
+
+/datum/controller/subsystem/ticker/Shutdown()
+	if(!round_end_sound)
+		round_end_sound = pick(\
+		'sound/roundend/newroundsexy.ogg',
+		'sound/roundend/apcdestroyed.ogg',
+		'sound/roundend/bangindonk.ogg',
+		'sound/roundend/leavingtg.ogg',
+		'sound/roundend/its_only_game.ogg',
+		'sound/roundend/yeehaw.ogg',
+		'sound/roundend/disappointed.ogg'\
+		)
+
+	world << sound(round_end_sound)
@@ -0,0 +1,9 @@
+diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm	(rejected hunks)
+@@ -60,6 +60,7 @@ SUBSYSTEM_DEF(ticker)
+ 	var/list/round_start_events
+ 
+ /datum/controller/subsystem/ticker/Initialize(timeofday)
+	load_mode()
+ 	var/list/music = world.file2list(ROUND_START_MUSIC_LIST, "\n")
+ 	login_music = pick(music)
+ 
@@ -55,6 +55,12 @@ SUBSYSTEM_DEF(title)
 		var/F = file("data/previous_title.dat")
 		F << file_path

+	for(var/thing in GLOB.clients)
+		if(!thing)
+			continue
+		var/obj/screen/splash/S = new(thing, FALSE)
+		S.Fade(FALSE,FALSE)
+
 /datum/controller/subsystem/title/Recover()
 	icon = SStitle.icon
 	splash_turf = SStitle.splash_turf
@@ -137,7 +137,7 @@ SUBSYSTEM_DEF(vote)
 				active_admins = 1
 				break
 		if(!active_admins)
-			world.Reboot("Restart vote successful.", "end_error", "restart vote")
+			SSticker.Reboot("Restart vote successful.", "end_error", "restart vote")
 		else
 			to_chat(world, "<span style='boldannounce'>Notice:Restart vote will not restart the server automatically because there are active admins on.</span>")
 			message_admins("A restart vote has passed, but there are active admins on with +server, so it has been canceled. If you wish, you may restart the server.")
@@ -0,0 +1,10 @@
+diff a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm	(rejected hunks)
+@@ -116,7 +116,7 @@ SUBSYSTEM_DEF(vote)
+ 					restart = 1
+ 			if("gamemode")
+ 				if(GLOB.master_mode != .)
+-					world.save_mode(.)
+					SSticker.save_mode(.)
+ 					if(SSticker.HasRoundStarted())
+ 						restart = 1
+ 					else