Merge branch 'master' into more-ashwalker-woes

code/datums/atmosphere/_atmosphere.dm

@@ -16,6 +16,9 @@
 /datum/atmosphere/New()
 	generate_gas_string()
 
+/datum/atmosphere/proc/check_for_sanity(datum/gas_mixture/mix)
+	return
+
 /datum/atmosphere/proc/generate_gas_string()
 	var/list/spicy_gas = restricted_gases.Copy()
 	var/target_pressure = rand(minimum_pressure, maximum_pressure)
@@ -52,6 +55,8 @@
 		gasmix.adjust_moles(gastype, -moles_to_remove)
 	gasmix.set_moles(gastype, FLOOR(gasmix.get_moles(gastype), 0.1))
 
+	check_for_sanity(gasmix)
+
 	// Now finally lets make that string
 	var/list/gas_string_builder = list()
 	for(var/id in gasmix.get_gases())

code/datums/atmosphere/planetary.dm

@@ -20,9 +20,15 @@
 	minimum_pressure = HAZARD_LOW_PRESSURE + 10
 	maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
 
-	minimum_temp = BODYTEMP_COLD_DAMAGE_LIMIT + 1
+	minimum_temp = 270
 	maximum_temp = 320
 
+/datum/atmosphere/lavaland/check_for_sanity(datum/gas_mixture/mix)
+	var/datum/breathing_class/o2_class = GLOB.gas_data.breathing_classes[BREATH_OXY]
+	while(o2_class.get_effective_pp(mix) < 10)
+		mix.adjust_moles(GAS_CO2, -0.5)
+		mix.adjust_moles(GAS_O2, 0.5)
+
 /datum/atmosphere/icemoon
 	id = ICEMOON_DEFAULT_ATMOS