From 494dff37e93931c1fa086fd105413ddb25a63fb1 Mon Sep 17 00:00:00 2001 From: Citinited Date: Fri, 12 Jan 2018 01:44:31 +0000 Subject: [PATCH] water_act now gradually heats and cools mobs --- code/modules/mob/living/carbon/human/species/species.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index d59a2e15a39..b7834d873f1 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -565,7 +565,5 @@ It'll return null if the organ doesn't correspond, so include null checks when u H.see_invisible = H.see_override /datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source) - if(temperature >= 330) - M.bodytemperature = M.bodytemperature + (temperature - M.bodytemperature) - if(temperature <= 280) - M.bodytemperature = M.bodytemperature - (M.bodytemperature - temperature) \ No newline at end of file + if(abs(temperature - M.bodytemperature) > 10) //If our water and mob temperature varies by more than 10K, cool or/ heat them appropriately + M.bodytemperature = (temperature + M.bodytemperature) * 0.5 //Approximation for gradual heating or cooling