Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

code/controllers/Processes/planet.dm

@@ -2,16 +2,77 @@ var/datum/controller/process/planet/planet_controller = null
 
 /datum/controller/process/planet
 	var/list/planets = list()
+	var/list/z_to_planet = list()
 
 /datum/controller/process/planet/setup()
-	name = "planet"
+	name = "planet controller"
 	planet_controller = src
-	schedule_interval = 600 // every minute
+	schedule_interval = 1 MINUTE
+
 	var/list/planet_datums = typesof(/datum/planet) - /datum/planet
 	for(var/P in planet_datums)
 		var/datum/planet/NP = new P()
 		planets.Add(NP)
 
+	allocateTurfs()
+
+/datum/controller/process/planet/proc/allocateTurfs()
+	for(var/turf/simulated/OT in outdoor_turfs)
+		for(var/datum/planet/P in planets)
+			if(OT.z in P.expected_z_levels)
+				P.planet_floors += OT
+				break
+	outdoor_turfs.Cut() //Why were you in there INCORRECTLY?
+
+	for(var/turf/unsimulated/wall/planetary/PW in planetary_walls)
+		for(var/datum/planet/P in planets)
+			if(PW.type == P.planetary_wall_type)
+				P.planet_walls += PW
+				break
+	planetary_walls.Cut()
+
+/datum/controller/process/planet/proc/unallocateTurf(var/turf/T)
+	for(var/planet in planets)
+		var/datum/planet/P = planet
+		if(T.z in P.expected_z_levels)
+			P.planet_floors -= T
+
 /datum/controller/process/planet/doWork()
+	if(outdoor_turfs.len || planetary_walls.len)
+		allocateTurfs()
+
 	for(var/datum/planet/P in planets)
-		P.process(schedule_interval / 10)
+		P.process(schedule_interval / 10)
+		SCHECK //Your process() really shouldn't take this long...
+		//Weather style needs redrawing
+		if(P.needs_work & PLANET_PROCESS_WEATHER)
+			P.needs_work &= ~PLANET_PROCESS_WEATHER
+			var/image/new_overlay = image(icon = P.weather_holder.current_weather.icon, icon_state = P.weather_holder.current_weather.icon_state, layer = LIGHTING_LAYER - 1)
+			//Redraw weather icons
+			for(var/T in P.planet_floors)
+				var/turf/simulated/turf = T
+				turf.overlays -= turf.weather_overlay
+				turf.weather_overlay = new_overlay
+				turf.overlays += turf.weather_overlay
+				SCHECK
+
+		//Sun light needs changing
+		if(P.needs_work & PLANET_PROCESS_SUN)
+			P.needs_work &= ~PLANET_PROCESS_SUN
+			//Redraw sun overlay
+			var/new_range = P.sun["range"]
+			var/new_brightness = P.sun["brightness"]
+			var/new_color = P.sun["color"]
+			for(var/T in P.planet_floors)
+				var/turf/simulated/turf = T
+				turf.set_light(new_range, new_brightness, new_color)
+				SCHECK
+
+		//Temperature needs updating
+		if(P.needs_work & PLANET_PROCESS_TEMP)
+			P.needs_work &= ~PLANET_PROCESS_TEMP
+			//Set new temperatures
+			for(var/W in P.planet_walls)
+				var/turf/unsimulated/wall/planetary/wall = W
+				wall.set_temperature(P.weather_holder.temperature)
+				SCHECK

code/controllers/configuration.dm

@@ -157,6 +157,8 @@ var/list/gamemode_cache = list()
 	var/slime_delay = 0
 	var/animal_delay = 0
 
+	var/footstep_volume = 0
+
 	var/admin_legacy_system = 0	//Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt
 	var/ban_legacy_system = 0	//Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt
 	var/use_age_restriction_for_jobs = 0 //Do jobs use account age restrictions? --requires database
@@ -772,6 +774,8 @@ var/list/gamemode_cache = list()
 				if("animal_delay")
 					config.animal_delay = value
 
+				if("footstep_volume")
+					config.footstep_volume = text2num(value)
 
 				if("use_loyalty_implants")
 					config.use_loyalty_implants = 1

code/controllers/verbs.dm

@@ -25,7 +25,7 @@
 		usr.client.debug_variables(antag)
 		message_admins("Admin [key_name_admin(usr)] is debugging the [antag.role_text] template.")
 
-/client/proc/debug_controller(controller in list("Master","Ticker","Ticker Process","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller", "Gas Data","Event","Plants","Alarm","Nano","Chemistry","Vote","Xenobio"))
+/client/proc/debug_controller(controller in list("Master","Ticker","Ticker Process","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller", "Gas Data","Event","Plants","Alarm","Nano","Chemistry","Vote","Xenobio","Planets"))
 	set category = "Debug"
 	set name = "Debug Controller"
 	set desc = "Debug the various periodic loop controllers for the game (be careful!)"
@@ -98,6 +98,9 @@
 		if("Xenobio")
 			debug_variables(xenobio_controller)
 			feedback_add_details("admin_verb", "DXenobio")
+		if("Planets")
+			debug_variables(planet_controller)
+			feedback_add_details("admin_verb", "DPlanets")
 	message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
 	return