This commit is contained in:
hal9000PR
2021-06-16 13:23:34 +01:00
committed by GitHub
parent 4d26621d0b
commit b7d9fcf87a
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -300,11 +300,11 @@
else if(bodytemperature < dna.species.cold_level_1)
if(status_flags & GODMODE)
return 1
return TRUE
if(stat == DEAD)
return 1
return TRUE
if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell) && !(HAS_TRAIT(src, TRAIT_RESISTCOLD)))
var/mult = dna.species.coldmod * physiology.cold_mod
if(bodytemperature >= dna.species.cold_level_2 && bodytemperature <= dna.species.cold_level_1)
throw_alert("temp", /obj/screen/alert/cold, 1)
@@ -271,7 +271,7 @@
. += hungry/50
if(HAS_TRAIT(H, TRAIT_FAT))
. += (1.5 - flight)
if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !(HAS_TRAIT(H, TRAIT_RESISTCOLD)))
. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
return .