From 15906c566be5afe19b4c26fd16f9aafe67740fc0 Mon Sep 17 00:00:00 2001 From: datlo Date: Fri, 2 Apr 2021 19:50:50 +0200 Subject: [PATCH 1/3] Make the heat resistance mutation fully fireproof --- code/modules/mob/living/carbon/human/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 2fff14882ad..f9f61c8ad73 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -358,7 +358,7 @@ return var/thermal_protection = get_thermal_protection() - if(thermal_protection >= FIRE_IMMUNITY_MAX_TEMP_PROTECT) + if(thermal_protection >= FIRE_IMMUNITY_MAX_TEMP_PROTECT || HAS_TRAIT(src, TRAIT_RESISTHEAT)) return if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT) bodytemperature += 11 From dac70ec726cd340ae5529d78aca1904de0ab6421 Mon Sep 17 00:00:00 2001 From: datlo Date: Fri, 2 Apr 2021 20:09:18 +0200 Subject: [PATCH 2/3] move check to better proc --- code/modules/mob/living/carbon/human/life.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f9f61c8ad73..ec15c898493 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -358,7 +358,7 @@ return var/thermal_protection = get_thermal_protection() - if(thermal_protection >= FIRE_IMMUNITY_MAX_TEMP_PROTECT || HAS_TRAIT(src, TRAIT_RESISTHEAT)) + if(thermal_protection >= FIRE_IMMUNITY_MAX_TEMP_PROTECT) return if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT) bodytemperature += 11 @@ -366,6 +366,10 @@ bodytemperature += (BODYTEMP_HEATING_MAX + (fire_stacks * 12)) /mob/living/carbon/human/proc/get_thermal_protection() + + if(HAS_TRAIT(src, TRAIT_RESISTHEAT)) + return FIRE_IMMUNITY_MAX_TEMP_PROTECT + var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures if(wear_suit) if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT) From 38e0183df8c7ba557c041497332d44b088b72ede Mon Sep 17 00:00:00 2001 From: datlo Date: Sat, 3 Apr 2021 21:28:33 +0200 Subject: [PATCH 3/3] Update code/modules/mob/living/carbon/human/life.dm Co-authored-by: dearmochi --- code/modules/mob/living/carbon/human/life.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index ec15c898493..32317cc2ea5 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -366,7 +366,6 @@ bodytemperature += (BODYTEMP_HEATING_MAX + (fire_stacks * 12)) /mob/living/carbon/human/proc/get_thermal_protection() - if(HAS_TRAIT(src, TRAIT_RESISTHEAT)) return FIRE_IMMUNITY_MAX_TEMP_PROTECT