diff --git a/code/game/objects/devices/scanners.dm b/code/game/objects/devices/scanners.dm
index f443f673ca..5795ea9c60 100644
--- a/code/game/objects/devices/scanners.dm
+++ b/code/game/objects/devices/scanners.dm
@@ -299,7 +299,7 @@ MASS SPECTROMETER
 		user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, "dead"), 1)
 		user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", fake_oxy < 50 ? "\red [fake_oxy]" : fake_oxy , M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1)
 	else
-		user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, (M.stat > 1 ? "dead" : text("[]% healthy", M.health))), 1)
+		user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, (M.stat > 1 ? "dead" : text("[]% healthy", M.health - M.halloss))), 1)
 		user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", M.getOxyLoss() > 50 ? "\red [M.getOxyLoss()]" : M.getOxyLoss(), M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1)
 	user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1)
 	user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)", 1)
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index ae2c4e43e7..ca0af38c00 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -1476,7 +1476,7 @@ datum
 
 			on_mob_life(var/mob/M)
 				if(!M) M = holder.my_atom
-				M:hallucination += 5
+				M:hallucination += 10
 				..()
 				return
 
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 5b0ad67a03..a41ddedcc4 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -82,27 +82,28 @@ mob/living/carbon/proc/handle_hallucinations()
 				//Flashes of danger
 				//src << "Danger Flash"
 				if(!halimage)
-					var/possible_points = list()
+					var/list/possible_points = list()
 					for(var/turf/simulated/floor/F in view(src,world.view))
 						possible_points += F
-					var/turf/simulated/floor/target = pick(possible_points)
+					if(possible_points.len)
+						var/turf/simulated/floor/target = pick(possible_points)
 
-					switch(rand(1,3))
-						if(1)
-							//src << "Space"
-							halimage = image('space.dmi',target,"[rand(1,25)]",TURF_LAYER)
-						if(2)
-							//src << "Fire"
-							halimage = image('fire.dmi',target,"1",TURF_LAYER)
-						if(3)
-							//src << "C4"
-							halimage = image('syndieweapons.dmi',target,"c4small_1",OBJ_LAYER+0.01)
+						switch(rand(1,3))
+							if(1)
+								//src << "Space"
+								halimage = image('space.dmi',target,"[rand(1,25)]",TURF_LAYER)
+							if(2)
+								//src << "Fire"
+								halimage = image('fire.dmi',target,"1",TURF_LAYER)
+							if(3)
+								//src << "C4"
+								halimage = image('syndieweapons.dmi',target,"c4small_1",OBJ_LAYER+0.01)
 
 
-					if(client) client.images += halimage
-					spawn(rand(10,50)) //Only seen for a brief moment.
-						if(client) client.images -= halimage
-						halimage = null
+						if(client) client.images += halimage
+						spawn(rand(10,50)) //Only seen for a brief moment.
+							if(client) client.images -= halimage
+							halimage = null
 
 
 			if(41 to 65)
@@ -143,24 +144,25 @@ mob/living/carbon/proc/handle_hallucinations()
 				//Flashes of danger
 				//src << "Danger Flash"
 				if(!halbody)
-					var/possible_points = list()
+					var/list/possible_points = list()
 					for(var/turf/simulated/floor/F in view(src,world.view))
 						possible_points += F
-					var/turf/simulated/floor/target = pick(possible_points)
-					switch(rand(1,4))
-						if(1)
-							halbody = image('human.dmi',target,"husk_l",TURF_LAYER)
-						if(2,3)
-							halbody = image('human.dmi',target,"husk_s",TURF_LAYER)
-						if(4)
-							halbody = image('alien.dmi',target,"alienother",TURF_LAYER)
-//						if(5)
-//							halbody = image('xcomalien.dmi',target,"chryssalid",TURF_LAYER)
+					if(possible_points.len)
+						var/turf/simulated/floor/target = pick(possible_points)
+						switch(rand(1,4))
+							if(1)
+								halbody = image('human.dmi',target,"husk_l",TURF_LAYER)
+							if(2,3)
+								halbody = image('human.dmi',target,"husk_s",TURF_LAYER)
+							if(4)
+								halbody = image('alien.dmi',target,"alienother",TURF_LAYER)
+	//						if(5)
+	//							halbody = image('xcomalien.dmi',target,"chryssalid",TURF_LAYER)
 
-					if(client) client.images += halbody
-					spawn(rand(50,80)) //Only seen for a brief moment.
-						if(client) client.images -= halbody
-						halbody = null
+						if(client) client.images += halbody
+						spawn(rand(50,80)) //Only seen for a brief moment.
+							if(client) client.images -= halbody
+							halbody = null
 			if(71 to 75)
 				//Fake death
 //				src.sleeping_willingly = 1
@@ -211,7 +213,7 @@ proc/check_panel(mob/M)
 	if (istype(M, /mob/living/carbon/human) || istype(M, /mob/living/silicon/ai))
 		if(M.hallucination < 15)
 			return 1
-	return 0
+	return 0*/
 
 /obj/fake_attacker
 	icon = null
@@ -333,11 +335,10 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
 	/obj/item/weapon/cartridge/syndicate, /obj/item/clothing/under/chameleon,\
 	/obj/item/clothing/shoes/syndigaloshes, /obj/item/weapon/card/id/syndicate,\
 	/obj/item/clothing/mask/gas/voice, /obj/item/clothing/glasses/thermal,\
-	/obj/item/device/chameleon, /obj/item/weapon/card/emag, /obj/item/device/hacktool,\
+	/obj/item/device/chameleon, /obj/item/weapon/card/emag,\
 	/obj/item/weapon/storage/toolbox/syndicate, /obj/item/weapon/aiModule,\
 	/obj/item/device/radio/headset/traitor,	/obj/item/weapon/plastique,\
-	/obj/item/weapon/syndie/c4explosive, /obj/item/device/powersink,\
-	/obj/machinery/singularity_beacon/syndicate, /obj/item/weapon/storage/syndie_kit,\
+	/obj/item/device/powersink, /obj/item/weapon/storage/syndie_kit,\
 	/obj/item/toy/syndicateballoon, /obj/item/weapon/gun/energy/laser/captain,\
 	/obj/item/weapon/hand_tele, /obj/item/weapon/rcd, /obj/item/weapon/tank/jetpack,\
 	/obj/item/clothing/under/rank/captain, /obj/item/device/aicard,\
@@ -400,4 +401,4 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
 	target << F.up
 	*/
 
-	F.updateimage()*/
\ No newline at end of file
+	F.updateimage()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index d4f8f7e80e..df617feb08 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -122,9 +122,9 @@
 
 		handle_disabilities()
 			if(hallucination > 0)
-				//if(hallucinations.len == 0 && hallucination >= 20 && health > 0)
-				//	if(prob(2))
-				//		fake_attack(src)
+				if(hallucinations.len == 0 && hallucination >= 20 && health > 0)
+					if(prob(5))
+						fake_attack(src)
 				//for(var/atom/a in hallucinations)
 				//	a.hallucinate(src)
 				if(!handling_hal && hallucination > 20)
diff --git a/html/changelog.html b/html/changelog.html
index ed65eba29e..b3918318f5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -92,7 +92,16 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 <div class="commit sansserif">
-	<h2 class="date">01/04/2012</h2>
+	<h2 class="date">01/03/2012</h2>
+	<h3 class="author">SkyMarshal updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Tweak/Bugfix for Hallucinations.  Much more robust.</li>
+	</ul>
+</div>
+
+
+<div class="commit sansserif">
+	<h2 class="date">01/03/2012</h2>
 	<h3 class="author">SkyMarshal updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="rscadd">Ported BS12 Detective Work System</li>