From 81ccf07d809d980e1bf16eef3098314840b159ca Mon Sep 17 00:00:00 2001
From: DelZeta <DelZeta@users.noreply.github.com>
Date: Thu, 20 Aug 2015 02:26:46 -0700
Subject: [PATCH] Halloss now decays naturally after hallucinations, to avoid
 edge cases with other sources.

---
 code/modules/mob/living/carbon/human/life.dm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index ea570e42e1..631be0d51a 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -963,12 +963,9 @@
 						spawn(rand(20,50))
 							if(C)
 								C.dir = 1
-			if(hallucination <= 2)
+			hallucination -= 2
+			if(hallucination < 0)
 				hallucination = 0
-				halloss = 0
-			else
-				hallucination -= 2
-
 		else
 			for(var/atom/a in hallucinations)
 				qdel(a)