diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index eed8e9fd64d..b680e1e0654 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -16,6 +16,9 @@
 	var/current_heat_capacity = 50
 
 
+	return_air()
+		return air_contents
+
 
 	New()
 		..()
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index a793517042d..e2e156857e9 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -599,15 +599,9 @@
 			if(istype(loc, /turf/space))
 				environment_heat_capacity = loc:heat_capacity
 				loc_temp = 2.7
-			else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
-				loc_temp = loc:air_contents.temperature
-			else if(istype(get_turf(src), /turf/simulated))
-				var/turf/simulated/T = get_turf(src)
-				var/zone/zone = T.zone
-				if(zone && zone.air)
-					loc_temp = zone.air.temperature
 			else
 				loc_temp = environment.temperature
+			world << loc_temp
 
 			var/thermal_protection = get_thermal_protection()
 
diff --git a/code/setup.dm b/code/setup.dm
index 9be56d9f79e..9060feafac7 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -19,9 +19,9 @@
 
 #define MOLES_PLASMA_VISIBLE	0.5 //Moles in a standard cell after which plasma is visible
 
-#define SPECIFIC_HEAT_TOXIN		200
-#define SPECIFIC_HEAT_AIR		20
-#define SPECIFIC_HEAT_CDO		30
+#define SPECIFIC_HEAT_TOXIN		700
+#define SPECIFIC_HEAT_AIR		100
+#define SPECIFIC_HEAT_CDO		150
 #define HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) \
 	(carbon_dioxide*SPECIFIC_HEAT_CDO + (oxygen+nitrogen)*SPECIFIC_HEAT_AIR + toxins*SPECIFIC_HEAT_TOXIN)