From b33750ece817c8a06cbc71e3b6ae32bf2af37d04 Mon Sep 17 00:00:00 2001 From: fludd12 Date: Thu, 29 Jun 2017 17:24:57 -0400 Subject: [PATCH] Fixes the last fixes --- code/modules/mob/living/carbon/human/human_defense.dm | 3 --- code/modules/mob/living/carbon/human/species/species.dm | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 9e8fcf8d50b..6a63a30fc5c 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -468,8 +468,5 @@ emp_act ..() /mob/living/carbon/human/water_act(volume, temperature, source) - ..() - if(temperature >= 330) bodytemperature = bodytemperature + (temperature - bodytemperature) - if(temperature <= 280) bodytemperature = bodytemperature - (bodytemperature - temperature) species.water_act(src,volume,temperature,source) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 76000a4c431..8320136e2be 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -679,4 +679,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) - return \ No newline at end of file + 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