From e1f4835b498baea59ac359398078dbe4834b97e7 Mon Sep 17 00:00:00 2001 From: Robustin Date: Sun, 21 Jan 2018 10:22:53 -0500 Subject: [PATCH 1/2] Ends the great monkey freezing epidemic --- code/modules/mob/living/carbon/monkey/life.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index ca78e165c2..e3423f5da6 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -70,9 +70,14 @@ if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases if(loc_temp < bodytemperature) - bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX) + bodytemperature += max((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX) else +<<<<<<< HEAD bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX) +======= + bodytemperature += min((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX) + +>>>>>>> b1adcc0... Ends the great monkey freezing epidemic (#34686) if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) switch(bodytemperature) From 6094f87105d2cde01545347a60589d9526c3b975 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 21 Jan 2018 14:20:03 -0600 Subject: [PATCH 2/2] Update life.dm --- code/modules/mob/living/carbon/monkey/life.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index e3423f5da6..b451a2b591 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -72,13 +72,8 @@ if(loc_temp < bodytemperature) bodytemperature += max((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX) else -<<<<<<< HEAD - bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX) -======= bodytemperature += min((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX) ->>>>>>> b1adcc0... Ends the great monkey freezing epidemic (#34686) - if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) switch(bodytemperature) if(360 to 400)