Merge branch 'master' into upstream-merge-31727

code/controllers/configuration/configuration.dm

@@ -168,7 +168,10 @@ GLOBAL_PROTECT(config_dir)
 				mode_names[M.config_tag] = M.name
 				probabilities[M.config_tag] = M.probability
 				mode_reports[M.config_tag] = M.generate_report()
-				mode_false_report_weight[M.config_tag] = M.false_report_weight
+				if(M.probability)
+					mode_false_report_weight[M.config_tag] = M.false_report_weight
+				else
+					mode_false_report_weight[M.config_tag] = 1
 				if(M.votable)
 					votable_modes += M.config_tag
 		qdel(M)

code/controllers/configuration/entries/config.dm

@@ -208,9 +208,9 @@ CONFIG_DEF(string/panic_server_name)
 /datum/config_entry/string/panic_server_name/ValidateAndSet(str_val)
 	return str_val != "\[Put the name here\]" && ..()
 
-CONFIG_DEF(string/panic_address)	//Reconnect a player this linked server if this server isn't accepting new players
+CONFIG_DEF(string/panic_server_address)	//Reconnect a player this linked server if this server isn't accepting new players
 
-/datum/config_entry/string/panic_address/ValidateAndSet(str_val)
+/datum/config_entry/string/panic_server_address/ValidateAndSet(str_val)
 	return str_val != "byond://address:port" && ..()
 
 CONFIG_DEF(string/invoke_youtubedl)
@@ -377,7 +377,7 @@ CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val))
 
 CONFIG_DEF(flag/resume_after_initializations)
 
-CONFIG_TWEAK(flag/ValidateAndSet(str_val))
+CONFIG_TWEAK(flag/resume_after_initializations/ValidateAndSet(str_val))
 	. = ..()
 	if(. && Master.current_runlevel)
 		world.sleep_offline = !value
@@ -385,3 +385,6 @@ CONFIG_TWEAK(flag/ValidateAndSet(str_val))
 CONFIG_DEF(number/rounds_until_hard_restart)
 	value = -1
 	min_val = 0
+
+CONFIG_DEF(string/default_view)
+	value = "15x15"

code/controllers/configuration/entries/game_options.dm

@@ -263,4 +263,4 @@ CONFIG_DEF(number/emergency_shuttle_autocall_threshold)
 	max_val = 1
 	integer = FALSE
 
-CONFIG_DEF(flag/ic_printing)
+CONFIG_DEF(flag/ic_printing)

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