From 61ac035415a45de70b5a047687cbcf49dbdbb808 Mon Sep 17 00:00:00 2001 From: fludd12 Date: Fri, 30 Jun 2017 01:00:06 -0400 Subject: [PATCH] Fixes the last fixes of the last fixes frick why --- code/modules/mob/living/carbon/human/human_defense.dm | 1 + code/modules/mob/living/carbon/human/species/species.dm | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 6a63a30fc5c..fa31b3bc52b 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -468,5 +468,6 @@ emp_act ..() /mob/living/carbon/human/water_act(volume, temperature, source) + ..() 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 8320136e2be..30bcdd1914a 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -679,5 +679,7 @@ 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(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