Merge branch 'master' into upstream-merge-31643

code/modules/atmospherics/gasmixtures/gas_types.dm

@@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
 		.[gas_path] = gas_info
 
 /proc/gas_id2path(id)
-	var/meta_gas = meta_gas_list()
+	var/list/meta_gas = GLOB.meta_gas_info
 	for(var/path in meta_gas)
 		if(meta_gas[path][META_GAS_ID] == id)
 			return path

code/modules/atmospherics/gasmixtures/immutable_mixtures.dm

@@ -54,7 +54,7 @@
 	initial_temperature = TCMB
 
 /datum/gas_mixture/immutable/space/heat_capacity()
-	return 7000
+	return HEAT_CAPACITY_VACUUM
 
 /datum/gas_mixture/immutable/space/remove()
 	return copy() //we're always empty, so we can just return a copy.

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -217,7 +217,9 @@
 
 		if(abs(temperature_delta) > 1)
 			var/air_heat_capacity = air1.heat_capacity()
-			var/heat = ((1 - cold_protection) * 0.1 + conduction_coefficient) * temperature_delta * (1 / air_heat_capacity + 1 / heat_capacity)
+
+			var/heat = ((1 - cold_protection) * 0.1 + conduction_coefficient) * temperature_delta * (air_heat_capacity * heat_capacity / (air_heat_capacity + heat_capacity))
+
 			air1.temperature = max(air1.temperature - heat / air_heat_capacity, TCMB)
 			mob_occupant.bodytemperature = max(mob_occupant.bodytemperature + heat / heat_capacity, TCMB)
 

code/modules/atmospherics/machinery/portable/canister.dm

@@ -273,7 +273,7 @@
 		return ..()
 
 /obj/machinery/portable_atmospherics/canister/obj_break(damage_flag)
-	if((flags_1 & BROKEN) || (flags_1 & NODECONSTRUCT_1))
+	if((stat & BROKEN) || (flags_1 & NODECONSTRUCT_1))
 		return
 	canister_break()