From c8b7a773993be6db98d65c38cedb2590babefbda Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Wed, 17 Jun 2015 15:19:41 +0200 Subject: [PATCH] mob/living/Life() now handles stomach contents. --- code/modules/mob/living/carbon/human/life.dm | 5 +---- code/modules/mob/living/life.dm | 12 +++++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 65cb0aface..0495bcc32b 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -74,9 +74,6 @@ handle_organs() stabilize_body_temperature() //Body temperature adjusts itself (self-regulation) - //stuff in the stomach - handle_stomach() - handle_shock() handle_pain() @@ -1426,7 +1423,7 @@ if(L && L.lum_r + L.lum_g + L.lum_b == 0) playsound_local(src,pick(scarySounds),50, 1, -1) -/mob/living/carbon/human/proc/handle_stomach() +/mob/living/carbon/human/handle_stomach() spawn(0) for(var/mob/living/M in stomach_contents) if(M.loc != src) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 23724cc0d2..5db47928f5 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -26,13 +26,16 @@ . = 1 - //Check if we're on fire - handle_fire() - //Handle temperature/pressure differences between body and environment if(environment) handle_environment(environment) + //Check if we're on fire + handle_fire() + + //stuff in the stomach + handle_stomach() + /mob/living/proc/handle_breathing() return @@ -50,3 +53,6 @@ /mob/living/proc/handle_environment(var/datum/gas_mixture/environment) return + +/mob/living/proc/handle_stomach() + return