Merge branch 'master' into development

# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm

code/controllers/configuration.dm

@@ -288,7 +288,7 @@ var/list/gamemode_cache = list()
 				if (M.votable)
 					src.votable_modes += M.config_tag
 	src.votable_modes += ROUNDTYPE_STR_SECRET
-	votable_modes += ROUNDTYPE_STR_MIXED_SECRET
+//	votable_modes += ROUNDTYPE_STR_MIXED_SECRET
 
 /datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
 	var/list/Lines = file2list(filename)
@@ -594,7 +594,7 @@ var/list/gamemode_cache = list()
 
 				if("alert_yellow")
 					config.alert_desc_yellow_to = value
-		
+
 				if("alert_delta")
 					config.alert_desc_delta = value
 
@@ -821,7 +821,7 @@ var/list/gamemode_cache = list()
 					access_deny_vms = text2num(value)
 				if("access_warn_vms")
 					access_warn_vms = text2num(value)
-				
+
 				if("cargo_load_items_from")
 					cargo_load_items_from = value
 

code/controllers/subsystems/initialization/misc_early.dm

@@ -1,5 +1,6 @@
 // This is one of the first subsystems initialized by the MC.
 // Stuff that should be loaded before everything else that isn't significant enough to get its own SS goes here.
+// The area list is put together here, because some things need it early on. Turrets controls, for example.
 
 /datum/controller/subsystem/misc_early
 	name = "Early Miscellaneous Init"
@@ -8,6 +9,10 @@
 
 /datum/controller/subsystem/misc_early/Initialize(timeofday)
 	uplink = new
+
+	// Generate the area list.
+	resort_all_areas()
+
 	// Create the data core, whatever that is.
 	data_core = new /datum/datacore()
 
@@ -43,3 +48,10 @@
 		discord_bot.alert_server_visibility()
 
 	..()
+
+/proc/resort_all_areas()
+	all_areas = list()
+	for (var/area/A in world)
+		all_areas += A
+
+	sortTim(all_areas, /proc/cmp_name_asc)

code/controllers/subsystems/initialization/misc_late.dm

@@ -1,5 +1,4 @@
 // This subsystem loads later in the init process. Not last, but after most major things are done.
-// We sort the area list here because SSatoms needs to run first.
 
 /datum/controller/subsystem/misc_late
 	name = "Late Miscellaneous Init"
@@ -7,9 +6,6 @@
 	flags = SS_NO_FIRE | SS_NO_DISPLAY
 
 /datum/controller/subsystem/misc_late/Initialize(timeofday)
-	// Generate the area list.
-	resort_all_areas()
-
 	var/turf/picked
 	// Setup the teleport locs.
 	for (var/thing in all_areas)
@@ -42,13 +38,6 @@
 
 	..(timeofday)
 
-/proc/resort_all_areas()
-	all_areas = list()
-	for (var/area/A in world)
-		all_areas += A
-
-	sortTim(all_areas, /proc/cmp_name_asc)
-
 /proc/sorted_add_area(area/A)
 	all_areas += A