Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -99,6 +99,8 @@
 		"power" = use_power,
 		"scrubbing" = scrubbing,
 		"panic" = panic,
+		"filter_o2" = ("oxygen" in scrubbing_gas),
+		"filter_n2" = ("nitrogen" in scrubbing_gas),
 		"filter_co2" = ("carbon_dioxide" in scrubbing_gas),
 		"filter_phoron" = ("phoron" in scrubbing_gas),
 		"filter_n2o" = ("sleeping_agent" in scrubbing_gas),
@@ -192,6 +194,16 @@
 
 	var/list/toggle = list()
 
+	if(!isnull(signal.data["o2_scrub"]) && text2num(signal.data["o2_scrub"]) != ("oxygen" in scrubbing_gas))
+		toggle += "oxygen"
+	else if(signal.data["toggle_o2_scrub"])
+		toggle += "oxygen"
+
+	if(!isnull(signal.data["n2_scrub"]) && text2num(signal.data["n2_scrub"]) != ("nitrogen" in scrubbing_gas))
+		toggle += "nitrogen"
+	else if(signal.data["toggle_n2_scrub"])
+		toggle += "nitrogen"
+
 	if(!isnull(signal.data["co2_scrub"]) && text2num(signal.data["co2_scrub"]) != ("carbon_dioxide" in scrubbing_gas))
 		toggle += "carbon_dioxide"
 	else if(signal.data["toggle_co2_scrub"])

code/ATMOSPHERICS/datum_pipeline.dm

@@ -203,11 +203,17 @@ datum/pipeline
 	//surface must be the surface area in m^2
 	proc/radiate_heat_to_space(surface, thermal_conductivity)
 		var/gas_density = air.total_moles/air.volume
-		thermal_conductivity *= min(gas_density / ( RADIATOR_OPTIMUM_PRESSURE/(R_IDEAL_GAS_EQUATION*T20C) ), 1)
+		thermal_conductivity *= min(gas_density / ( RADIATOR_OPTIMUM_PRESSURE/(R_IDEAL_GAS_EQUATION*GAS_CRITICAL_TEMPERATURE) ), 1) //mult by density ratio
 		
-		//if the h/e pipes radiate less than the AVERAGE_SOLAR_RADIATION, then they will heat up, otherwise they will cool down. It turns out the critical temperature is -26 C
-		var/heat_gain = surface*(AVERAGE_SOLAR_RADIATION - STEFAN_BOLTZMANN_CONSTANT*thermal_conductivity*(air.temperature - COSMIC_RADIATION_TEMPERATURE) ** 4)
+		// We only get heat from the star on the exposed surface area.
+		// If the HE pipes gain more energy from AVERAGE_SOLAR_RADIATION than they can radiate, then they have a net heat increase.
+		var/heat_gain = AVERAGE_SOLAR_RADIATION * (RADIATOR_EXPOSED_SURFACE_AREA_RATIO * surface) * thermal_conductivity
+		
+		// Previously, the temperature would enter equilibrium at 26C or 294K.
+		// Only would happen if both sides (all 2 square meters of surface area) were exposed to sunlight.  We now assume it aligned edge on.
+		// It currently should stabilise at 129.6K or -143.6C
+		heat_gain -= surface * STEFAN_BOLTZMANN_CONSTANT * thermal_conductivity * (air.temperature - COSMIC_RADIATION_TEMPERATURE) ** 4
 		
 		air.add_thermal_energy(heat_gain)
 		if(network)
-			network.update = 1
+			network.update = 1

code/ATMOSPHERICS/he_pipes.dm

@@ -3,18 +3,23 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging
 	icon = 'icons/atmos/heat.dmi'
 	icon_state = "intact"
 	pipe_icon = "hepipe"
+	color = "#404040"
 	level = 2
 	var/initialize_directions_he
 	var/surface = 2	//surface area in m^2
+	var/icon_temperature = T20C //stop small changes in temperature causing an icon refresh
 
 	minimum_temperature_difference = 20
 	thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
 
+	buckle_lying = 1
+
 	// BubbleWrap
 	New()
 		..()
 		initialize_directions_he = initialize_directions	// The auto-detection from /pipe is good enough for a simple HE pipe
 	// BubbleWrap END
+		color = "#404040" //we don't make use of the fancy overlay system for colours, use this to set the default.
 
 	initialize()
 		normalize_dir()
@@ -48,19 +53,53 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging
 		if(!parent)
 			..()
 		else
-			var/environment_temperature = 0
+			var/datum/gas_mixture/pipe_air = return_air()
 			if(istype(loc, /turf/simulated/))
+				var/environment_temperature = 0
 				if(loc:blocks_air)
 					environment_temperature = loc:temperature
 				else
 					var/datum/gas_mixture/environment = loc.return_air()
 					environment_temperature = environment.temperature
-				var/datum/gas_mixture/pipe_air = return_air()
 				if(abs(environment_temperature-pipe_air.temperature) > minimum_temperature_difference)
 					parent.temperature_interact(loc, volume, thermal_conductivity)
 			else if(istype(loc, /turf/space/))
 				parent.radiate_heat_to_space(surface, 1)
 
+			if(buckled_mob)
+				var/hc = pipe_air.heat_capacity()
+				var/avg_temp = (pipe_air.temperature * hc + buckled_mob.bodytemperature * 3500) / (hc + 3500)
+				pipe_air.temperature = avg_temp
+				buckled_mob.bodytemperature = avg_temp
+
+				var/heat_limit = 1000
+
+				var/mob/living/carbon/human/H = buckled_mob
+				if(istype(H) && H.species)
+					heat_limit = H.species.heat_level_3
+
+				if(pipe_air.temperature > heat_limit + 1)
+					buckled_mob.apply_damage(4 * log(pipe_air.temperature - heat_limit), BURN, "chest", used_weapon = "Excessive Heat")
+
+			//fancy radiation glowing
+			if(pipe_air.temperature && (icon_temperature > 500 || pipe_air.temperature > 500)) //start glowing at 500K
+				if(abs(pipe_air.temperature - icon_temperature) > 10)
+					icon_temperature = pipe_air.temperature
+
+					var/h_r = heat2color_r(icon_temperature)
+					var/h_g = heat2color_g(icon_temperature)
+					var/h_b = heat2color_b(icon_temperature)
+
+					if(icon_temperature < 2000) //scale up overlay until 2000K
+						var/scale = (icon_temperature - 500) / 1500
+						h_r = 64 + (h_r - 64)*scale
+						h_g = 64 + (h_g - 64)*scale
+						h_b = 64 + (h_b - 64)*scale
+
+					animate(src, color = rgb(h_r, h_g, h_b), time = 20, easing = SINE_EASING)
+
+
+
 
 obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
 	icon = 'icons/atmos/junction.dmi'

code/ATMOSPHERICS/pipes.dm

@@ -12,6 +12,10 @@
 	var/alert_pressure = 80*ONE_ATMOSPHERE
 		//minimum pressure before check_pressure(...) should be called
 
+	can_buckle = 1
+	buckle_require_restraints = 1
+	buckle_lying = -1
+
 /obj/machinery/atmospherics/pipe/drain_power()
 	return -1