Merge upstream

code/controllers/subsystem/garbage.dm

@@ -523,7 +523,6 @@ SUBSYSTEM_DEF(garbage)
 	SearchVar(start_landmarks_list)
 	SearchVar(department_security_spawns)
 	SearchVar(generic_event_spawns)
-	SearchVar(monkeystart)
 	SearchVar(wizardstart)
 	SearchVar(newplayer_start)
 	SearchVar(latejoin)
@@ -534,7 +533,6 @@ SUBSYSTEM_DEF(garbage)
 	SearchVar(tdome2)
 	SearchVar(tdomeobserve)
 	SearchVar(tdomeadmin)
-	SearchVar(prisonsecuritywarp)
 	SearchVar(prisonwarped)
 	SearchVar(blobstart)
 	SearchVar(secequipment)
@@ -927,10 +925,6 @@ SUBSYSTEM_DEF(garbage)
 	SearchVar(GALOSHES_DONT_HELP)
 	SearchVar(SLIDE_ICE)
 	SearchVar(limb_icon_cache)
-	SearchVar(MIN_IMPREGNATION_TIME)
-	SearchVar(MAX_IMPREGNATION_TIME)
-	SearchVar(MIN_ACTIVE_TIME)
-	SearchVar(MAX_ACTIVE_TIME)
 	SearchVar(default_martial_art)
 	SearchVar(plasmaman_on_fire)
 	SearchVar(ai_list)

code/controllers/subsystem/processing/overlays.dm

@@ -168,7 +168,7 @@ PROCESSING_SUBSYSTEM_DEF(overlays)
 	
 	var/list/cached_other = other.our_overlays
 	if(cached_other)
-		if(cut_old)
+		if(cut_old || !LAZYLEN(our_overlays))
 			our_overlays = cached_other.Copy()
 		else
 			our_overlays |= cached_other

code/controllers/subsystem/ticker.dm

@@ -56,6 +56,8 @@ SUBSYSTEM_DEF(ticker)
 
 	var/late_join_disabled
 
+	var/list/round_start_events
+
 /datum/controller/subsystem/ticker/Initialize(timeofday)
 	var/list/music = file2list(ROUND_START_MUSIC_LIST, "\n")
 	login_music = pick(music)
@@ -197,6 +199,11 @@ SUBSYSTEM_DEF(ticker)
 	transfer_characters()	//transfer keys to the new mobs
 
 	Master.RoundStart()	//let the party begin...
+	
+	for(var/I in round_start_events)
+		var/datum/callback/cb = I
+		cb.InvokeAsync()
+	LAZYCLEARLIST(round_start_events)
 
 	log_world("Game start took [(world.timeofday - init_start)/10]s")
 	round_start_time = world.time
@@ -229,6 +236,12 @@ SUBSYSTEM_DEF(ticker)
 	var/list/allmins = adm["present"]
 	send2irc("Server", "Round of [hide_mode ? "secret":"[mode.name]"] has started[allmins.len ? ".":" with no active admins online!"]")
 
+/datum/controller/subsystem/ticker/proc/OnRoundstart(datum/callback/cb)
+	if(current_state < GAME_STATE_PLAYING)
+		LAZYADD(round_start_events, cb)
+	else
+		cb.InvokeAsync()
+
 /datum/controller/subsystem/ticker/proc/station_explosion_detonation(atom/bomb)
 	if(bomb)	//BOOM
 		var/turf/epi = bomb.loc

code/controllers/subsystem/title.dm

@@ -12,8 +12,10 @@ SUBSYSTEM_DEF(title)
 		return
 
 	if(fexists("data/previous_title.dat"))
-		previous_icon = new("data/previous_title.dat")
-		fdel("data/previous_title.dat")	//linger not
+		var/previous_path = file2text("data/previous_title.dat")
+		if(istext(previous_path))
+			previous_icon = new(previous_icon)
+	fdel("data/previous_title.dat")
 
 	var/list/provisional_title_screens = flist("config/title_screens/images/")
 	var/list/title_screens = list()
@@ -41,7 +43,8 @@ SUBSYSTEM_DEF(title)
 
 /datum/controller/subsystem/title/Shutdown()
 	if(file_path)
-		fcopy(file_path, "data/previous_title.dat")
+		var/F = "data/previous_title.dat"
+		F << file_path
 
 /datum/controller/subsystem/title/Recover()
 	icon = SStitle.icon