Merge pull request #9683 from Ghommie/Ghommie-cit303

Dullahans fixes and QoL.
2019-11-14 15:52:11 -07:00
parent 3cf1b09e0c e0afed1f8e
commit 318c03cc28
15 changed files with 128 additions and 88 deletions
@@ -209,7 +209,7 @@

 		if(ishuman(occupant))
 			var/mob/living/carbon/human/H = occupant
-			cold_protection = H.get_cold_protection(air1.temperature)
+			cold_protection = H.get_thermal_protection(air1.temperature, TRUE)

 		if(abs(temperature_delta) > 1)
 			var/air_heat_capacity = air1.heat_capacity()