Merge branch 'master' into more-ashwalker-woes

2021-10-18 04:35:57 -07:00
parent c169a0408a b593774cc9
commit 136ca1f107
275 changed files with 21641 additions and 18315 deletions
@@ -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