Merge branch 'master' into upstream-merge-31727

code/controllers/subsystem/ticker.dm

@@ -33,8 +33,8 @@ SUBSYSTEM_DEF(ticker)
 	SCRIPTURE_APPLICATION = FALSE) //list of clockcult scripture states for announcements
 
 	var/delay_end = 0						//if set true, the round will not restart on it's own
-
 	var/admin_delay_notice = ""				//a message to display to anyone who tries to restart the world after a delay
+	var/ready_for_reboot = FALSE			//all roundend preparation done with, all that's left is reboot
 
 	var/triai = 0							//Global holder for Triumvirate
 	var/tipped = 0							//Did we broadcast the tip of the day yet?
@@ -584,10 +584,17 @@ SUBSYSTEM_DEF(ticker)
 	SSblackbox.Seal()
 
 	sleep(50)
-	if(mode.station_was_nuked)
-		Reboot("Station destroyed by Nuclear Device.", "nuke")
+	ready_for_reboot = TRUE
+	standard_reboot()
+
+/datum/controller/subsystem/ticker/proc/standard_reboot()
+	if(ready_for_reboot)
+		if(mode.station_was_nuked)
+			Reboot("Station destroyed by Nuclear Device.", "nuke")
+		else
+			Reboot("Round ended.", "proper completion")
 	else
-		Reboot("Round ended.", "proper completion")
+		CRASH("Attempted standard reboot without ticker roundend completion")
 
 /datum/controller/subsystem/ticker/proc/send_tip_of_the_round()
 	var/m

code/controllers/subsystem/weather.dm

@@ -41,5 +41,14 @@ SUBSYSTEM_DEF(weather)
 		if(W.name == weather_name && W.target_z == Z)
 			W.telegraph()
 
+/datum/controller/subsystem/weather/proc/is_weather_affecting_area(area/A, weather_datum_type)
+	for(var/V in processing)
+		var/datum/weather/W = V
+		if(!istype(W, weather_datum_type))
+			continue
+		if(A in W.impacted_areas)
+			return TRUE
+	return FALSE
+
 /datum/controller/subsystem/weather/proc/make_z_eligible(zlevel)
 	eligible_zlevels |= zlevel