From 96aa64be5d9cefb9355e802a6d66de50162ba336 Mon Sep 17 00:00:00 2001
From: "joe.heinemeyer@gmail.com"
 <joe.heinemeyer@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 2 Mar 2012 16:03:46 +0000
Subject: [PATCH] Added some hallucination/Detective work stuff I realized I
 missed AFTER I went to bed last night.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3231 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/machinery/doors/airlock.dm         |  2 ++
 code/game/machinery/doors/door.dm            |  2 ++
 code/game/objects/devices/PDA/PDA.dm         |  2 +-
 code/modules/mob/living/carbon/human/life.dm | 12 ++++++++----
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index abad2f6528f..514f6833f64 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -914,6 +914,8 @@ About the new airlock wires panel:
 			if(src.shock(user, 75))
 				return
 
+	if (istype(C, /obj/item/device/detective_scanner))
+		return
 	src.add_fingerprint(user)
 	if((istype(C, /obj/item/weapon/weldingtool) && !( src.operating ) && src.density))
 		var/obj/item/weapon/weldingtool/W = C
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index efe8eb5b863..637a98bbf0a 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -112,6 +112,8 @@
 
 
 	attackby(obj/item/I as obj, mob/user as mob)
+		if (istype(I, /obj/item/device/detective_scanner))
+			return
 		if(src.operating || isrobot(user))	return //borgs can't attack doors open because it conflicts with their AI-like interaction with them.
 		src.add_fingerprint(user)
 		if(!src.requiresID())
diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index 3288bb14e7d..74e7902aad0 100644
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -739,7 +739,7 @@
 					O.show_message("\red [user] has analyzed [C]'s vitals!", 1)
 
 				user.show_message("\blue Analyzing Results for [C]:")
-				user.show_message("\blue \t Overall Status: [C.stat > 1 ? "dead" : "[C.health]% healthy"]", 1)
+				user.show_message("\blue \t Overall Status: [C.stat > 1 ? "dead" : "[C.health - C.halloss]% healthy"]", 1)
 				user.show_message("\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.getToxLoss() > 50 ? "\red" : "\blue"][C.getToxLoss()]-[C.getFireLoss() > 50 ? "\red" : "\blue"][C.getFireLoss()]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]", 1)
 				user.show_message("\blue \t Key: Suffocation/Toxin/Burns/Brute", 1)
 				user.show_message("\blue \t Body Temperature: [C.bodytemperature-T0C]&deg;C ([C.bodytemperature*1.8-459.67]&deg;F)", 1)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index df617feb083..74d9a0d6b6b 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -698,7 +698,7 @@
 
 			if(sleeping)
 				Paralyse(3)
-				if (prob(10) && health) spawn(0) emote("snore")
+				if (prob(10) && health && !hal_crit) spawn(0) emote("snore")
 				sleeping--
 
 			if(resting)
@@ -903,7 +903,7 @@
 
 
 
-			if (sleep) sleep.icon_state = text("sleep[]", sleeping)
+			if (sleep && !hal_crit) sleep.icon_state = text("sleep[]", sleeping)
 			if (rest) rest.icon_state = text("rest[]", resting)
 
 			if (healths)
@@ -925,6 +925,10 @@
 							healths.icon_state = "health6"
 				else
 					healths.icon_state = "health7"
+				if(hal_screwyhud == 1)
+					healths.icon_state = "health6"
+				if(hal_screwyhud == 2)
+					healths.icon_state = "health7"
 
 			if (nutrition_icon)
 				switch(nutrition)
@@ -964,8 +968,8 @@
 			if(resting || lying || sleeping)	rest.icon_state = "rest[(resting || lying || sleeping) ? 1 : 0]"
 
 
-			if (toxin)	toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
-			if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
+			if (toxin || hal_screwyhud == 4)	toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
+			if (oxygen || hal_screwyhud == 3) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
 			if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"
 			//NOTE: the alerts dont reset when youre out of danger. dont blame me,
 			//blame the person who coded them. Temporary fix added.