From 67502c5d2e33a92e3401fde4117865161b3556cb Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Wed, 29 Feb 2012 22:20:35 -0700
Subject: [PATCH] Bugfixes for Hallucinations, borgs'n'doors, and airlocks
 autorefreshing.

---
 code/WorkInProgress/virus2/base.dm          | 12 ------------
 code/game/machinery/doors/airlock.dm        |  2 ++
 code/game/machinery/doors/door.dm           |  2 +-
 code/modules/chemical/Chemistry-Reagents.dm |  2 +-
 code/modules/flufftext/Hallucination.dm     |  1 +
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/code/WorkInProgress/virus2/base.dm b/code/WorkInProgress/virus2/base.dm
index d5520802310..e66a8828f09 100644
--- a/code/WorkInProgress/virus2/base.dm
+++ b/code/WorkInProgress/virus2/base.dm
@@ -427,12 +427,6 @@ proc/airborne_can_reach(turf/source, turf/target)
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		mob.toxloss += 15
 
-/*/datum/disease2/effect/greater/hallucinations
-	name = "Hallucinational Syndrome"
-	stage = 3
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		mob.hallucination += 25*/
-
 /datum/disease2/effect/greater/sleepy
 	name = "Resting syndrome"
 	stage = 3
@@ -514,12 +508,6 @@ proc/airborne_can_reach(turf/source, turf/target)
 			var/obj/effect/decal/cleanable/mucus/this = new(mob.loc)
 			this.virus2 = mob.virus2
 
-/*/datum/disease2/effect/lesser/hallucinations
-	name = "Hallucinational Syndrome"
-	stage = 3
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		mob.hallucination += 5*/
-
 /*/datum/disease2/effect/lesser/arm
 	name = "Disarming Syndrome"
 	stage = 4
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 62af9606a3c..12d038aa1e5 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1256,6 +1256,8 @@ About the new airlock wires panel:
 		src.updateUsrDialog()
 		if((istype(usr.equipped(), /obj/item/device/hacktool)))
 			return attack_ai(usr, usr.equipped())
+		else if(issilicon(usr))
+			return attack_ai(usr)
 	return
 
 
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index fe46d91232e..128b01d9eef 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -131,7 +131,7 @@
 /obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob)
 	if(istype(I, /obj/item/device/detective_scanner))
 		return ..()
-	if (src.operating)
+	if (src.operating || isrobot(user))
 		return
 	src.add_fingerprint(user)
 	if (!src.requiresID())
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index 66b0a8fc454..3259719e4c2 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -1548,7 +1548,7 @@ datum
 					M:heal_organ_damage(3,3)
 					M:adjustToxLoss(-3)
 					M:halloss = 0
-					M:hallucination -= 5
+					M:hallucination = max(M:hallucination - 5,0)
 				..()
 				return
 
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 48f8df1be85..2e5c004bd67 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -132,6 +132,7 @@ mob/living/carbon/proc/handle_hallucinations()
 							src << 'Taser.ogg'
 				//Rare audio
 					if(12)
+//These sounds are (mostly) taken from Hidden: Source
 						var/list/creepyasssounds = list('ghost.ogg', 'ghost2.ogg', 'Heart Beat.ogg', 'screech.ogg',\
 							'behind_you1.ogg', 'behind_you2.ogg', 'far_noise.ogg', 'growl1.ogg', 'growl2.ogg',\
 							'growl3.ogg', 'im_here1.ogg', 'im_here2.ogg', 'i_see_you1.ogg', 'i_see_you2.ogg',\