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

code/controllers/ProcessScheduler/core/process.dm

@@ -105,6 +105,10 @@
 	last_task = 0
 	last_object = null
 
+/datum/controller/process/Destroy()
+	..()
+	return QDEL_HINT_HARDDEL_NOW
+
 /datum/controller/process/proc/started()
 	// Initialize run_start so we can detect hung processes.
 	run_start = TimeOfGame
@@ -180,8 +184,7 @@
 		// Allow inheritors to clean up if needed
 		onKill()
 
-		// This should del
-		del(src)
+		qdel(src)
 
 // Do not call this directly - use SHECK or SCHECK_EVERY
 /datum/controller/process/proc/sleepCheck(var/tickId = 0)

code/controllers/ProcessScheduler/core/processScheduler.dm

@@ -58,6 +58,10 @@ var/global/datum/controller/processScheduler/processScheduler
 	timeAllowance = world.tick_lag * 0.5
 	timeAllowanceMax = world.tick_lag
 
+/datum/controller/processScheduler/Destroy()
+	..()
+	return QDEL_HINT_HARDDEL_NOW
+
 /**
  * deferSetupFor
  * @param path processPath
@@ -72,7 +76,7 @@ var/global/datum/controller/processScheduler/processScheduler
 /datum/controller/processScheduler/proc/setup()
 	// There can be only one
 	if(processScheduler && (processScheduler != src))
-		del(src)
+		qdel(src)
 		return 0
 
 	var/process

code/controllers/Processes/fires.dm

@@ -0,0 +1,23 @@
+var/global/datum/controller/process/fire/fire_master
+
+/datum/controller/process/fire
+	var/list/burning = list()
+
+/datum/controller/process/fire/setup()
+	name = "fire"
+	schedule_interval = 20 //every 2 seconds
+	fire_master = src
+	log_startup_progress("Fire process starting up.")
+
+/datum/controller/process/fire/statProcess()
+	..()
+	stat(null, "[burning.len] burning objects")
+
+/datum/controller/process/fire/doWork()
+	for(var/obj/burningobj in burning)
+		if(burningobj.burn_state == ON_FIRE)
+			if(burningobj.burn_world_time < world.time)
+				burningobj.burn()
+				SCHECK
+		else
+			burning.Remove(burningobj)

code/controllers/Processes/shuttles.dm

@@ -183,6 +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)
 			callShuttle = 0
 			break
@@ -229,6 +230,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))
 				S.width = M.width
 				S.height = M.height

code/controllers/Processes/weather.dm

@@ -1,3 +1,4 @@
+// TODO: Tie into space manager
 //Used for all kinds of weather, ex. lavaland ash storms.
 var/global/datum/controller/process/weather/weather_master
 

code/controllers/configuration.dm

@@ -61,6 +61,7 @@
 	var/ToRban = 0
 	var/automute_on = 0					//enables automuting/spam prevention
 	var/jobs_have_minimal_access = 0	//determines whether jobs use minimal access or expanded access.
+	var/round_abandon_penalty_period = 30 MINUTES // Time from round start during which ghosting out is penalized
 
 	var/reactionary_explosions = 0 //If we use reactionary explosions, explosions that react to walls and doors
 
@@ -560,6 +561,9 @@
 				if("max_loadout_points")
 					config.max_loadout_points = text2num(value)
 
+				if("round_abandon_penalty_period")
+					config.round_abandon_penalty_period = MinutesToTicks(text2num(value))
+
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 

code/controllers/master_controller.dm

@@ -24,7 +24,7 @@ var/global/pipe_processing_killed = 0
 	//There can be only one master_controller. Out with the old and in with the new.
 	if(master_controller != src)
 		if(istype(master_controller))
-			del(master_controller)
+			qdel(master_controller)
 		master_controller = src
 
 	var/watch=0
@@ -38,16 +38,32 @@ var/global/pipe_processing_killed = 0
 	if(!syndicate_code_phrase)		syndicate_code_phrase	= generate_code_phrase()
 	if(!syndicate_code_response)	syndicate_code_response	= generate_code_phrase()
 
+/datum/controller/game_controller/Destroy()
+	..()
+	return QDEL_HINT_HARDDEL_NOW
+
 /datum/controller/game_controller/proc/setup()
 	world.tick_lag = config.Ticklag
 
-	zlevels.initialize()
-
 	preloadTemplates()
 	if(!config.disable_away_missions)
 		createRandomZlevel()
+	// Create 6 extra space levels to put space ruins on
 	if(!config.disable_space_ruins)
-		seedRuins(7, rand(0, 3), /area/space, space_ruins_templates)
+		var/timer = start_watch()
+		log_startup_progress("Creating random space levels...")
+		seedRuins(ZLEVEL_EMPTY, 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
+		// code that checks on hard-defined z positions
+
+		// var/num_extra_space = 6
+		// for(var/i = 1, i <= num_extra_space, i++)
+		// 	var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED)
+		// 	seedRuins(zlev, rand(0, 3), /area/space, space_ruins_templates)
+
+	space_manager.do_transition_setup()
 
 	setup_objects()
 	setupgenetics()