Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

code/controllers/Processes/fast_process.dm

@@ -0,0 +1,17 @@
+/datum/controller/process/fast_process/setup()
+	name = "fast processing"
+	schedule_interval = 2 //every 0.2 seconds
+	start_delay = 9
+	log_startup_progress("Fast Processing starting up.")
+
+/datum/controller/process/fast_process/statProcess()
+	..()
+	stat(null, "[fast_processing.len] fast machines")
+
+/datum/controller/process/fast_process/doWork()
+	for(last_object in fast_processing)
+		var/obj/O = last_object
+		try
+			O.process()
+		catch(var/exception/e)
+			catchException(e, O)

code/controllers/Processes/machinery.dm

@@ -7,7 +7,7 @@
 
 /datum/controller/process/machinery/statProcess()
 	..()
-	stat(null, "[machines.len] machines")
+	stat(null, "[machine_processing.len] machines")
 	stat(null, "[powernets.len] powernets, [deferred_powernet_rebuilds.len] deferred")
 
 /datum/controller/process/machinery/doWork()
@@ -19,15 +19,15 @@
 /datum/controller/process/machinery/proc/process_sort()
 	if(machinery_sort_required)
 		machinery_sort_required = 0
-		machines = dd_sortedObjectList(machines)
+		machine_processing = dd_sortedObjectList(machine_processing)
 
 /datum/controller/process/machinery/proc/process_machines()
-	for(last_object in machines)
+	for(last_object in machine_processing)
 		var/obj/machinery/M = last_object
 		if(istype(M) && isnull(M.gcDestroyed))
 			try
 				if(M.process() == PROCESS_KILL)
-					machines.Remove(M)
+					machine_processing.Remove(M)
 					continue
 
 				if(M.use_power)
@@ -36,7 +36,7 @@
 				catchException(e, M)
 		else
 			catchBadType(M)
-			machines -= M
+			machine_processing -= M
 
 		SCHECK_EVERY(100)
 

code/controllers/Processes/shuttles.dm

@@ -183,8 +183,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
 				continue
 
 		var/turf/T = get_turf(thing)
-		// TODO: Tie into space manager
-		if(T && T.z == ZLEVEL_STATION)
+		if(T && is_station_level(T.z))
 			callShuttle = 0
 			break
 
@@ -230,8 +229,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
 		if(!M.roundstart_move)
 			continue
 		for(var/obj/docking_port/stationary/S in stationary)
-			// TODO: Tie into space manager
-			if(S.z != ZLEVEL_STATION && findtext(S.id, M.id))
+			if(!is_station_level(S.z) && findtext(S.id, M.id))
 				S.width = M.width
 				S.height = M.height
 				S.dwidth = M.dwidth

code/controllers/Processes/weather.dm

@@ -1,5 +1,5 @@
-// TODO: Tie into space manager
 //Used for all kinds of weather, ex. lavaland ash storms.
+// TODO: This could probably be better-integrated with the space manager
 var/global/datum/controller/process/weather/weather_master
 
 /datum/controller/process/weather
@@ -33,7 +33,7 @@ var/global/datum/controller/process/weather/weather_master
 		var/list/possible_weather_for_this_z = list()
 		for(var/V in existing_weather)
 			var/datum/weather/WE = V
-			if(WE.target_z == Z && WE.probability) //Another check so that it doesn't run extra weather
+			if(WE.target_level == Z && WE.probability) //Another check so that it doesn't run extra weather
 				possible_weather_for_this_z[WE] = WE.probability
 		var/datum/weather/W = pickweight(possible_weather_for_this_z)
 		run_weather(W.name)

code/controllers/configuration.dm

@@ -496,18 +496,6 @@
 				if("max_maint_drones")
 					config.max_maint_drones = text2num(value)
 
-				if("station_levels")
-					config.station_levels = text2numlist(value, ";")
-
-				if("admin_levels")
-					config.admin_levels = text2numlist(value, ";")
-
-				if("contact_levels")
-					config.contact_levels = text2numlist(value, ";")
-
-				if("player_levels")
-					config.player_levels = text2numlist(value, ";")
-
 				if("expected_round_length")
 					config.expected_round_length = MinutesToTicks(text2num(value))
 

code/controllers/master_controller.dm

@@ -52,7 +52,7 @@ var/global/pipe_processing_killed = 0
 	if(!config.disable_space_ruins)
 		var/timer = start_watch()
 		log_startup_progress("Creating random space levels...")
-		seedRuins(ZLEVEL_EMPTY, rand(0, 3), /area/space, space_ruins_templates)
+		seedRuins(level_name_to_num(EMPTY_AREA), rand(0, 3), /area/space, space_ruins_templates)
 		log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.")
 
 		// We'll keep this around for the time when we finally expunge all