From 03be640d019b2281321675d4dcce7ae1439beae4 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 14 Jun 2015 11:17:04 +0200 Subject: [PATCH] mob/living/Life() now handles random events (vomiting etc). --- code/modules/mob/living/carbon/human/life.dm | 8 ++++---- code/modules/mob/living/life.dm | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index aaf61f07c09..165d69bc7b1 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) - //Random events (vomiting etc) - handle_random_events() - //stuff in the stomach handle_stomach() @@ -1416,7 +1413,10 @@ O.process_hud(src) if(!druggy && !seer) see_invisible = SEE_INVISIBLE_LIVING -/mob/living/carbon/human/proc/handle_random_events() +/mob/living/carbon/human/handle_random_events() + if(in_stasis) + return + // Puke if toxloss is too high if(!stat) if (getToxLoss() >= 45 && nutrition > 20) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index a0ac76b4527..b4772bf89fe 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -21,6 +21,9 @@ //Blood handle_blood() + //Random events (vomiting etc) + handle_random_events() + . = 1 //Handle temperature/pressure differences between body and environment @@ -39,5 +42,8 @@ /mob/living/proc/handle_blood() return +/mob/living/proc/handle_random_events() + return + /mob/living/proc/handle_environment(var/datum/gas_mixture/environment) return