diff --git a/baystation12.dme b/baystation12.dme
index cf5a652545b..ad8fb0bba94 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -185,6 +185,7 @@
 #define FILE_DIR "sound/mecha"
 #define FILE_DIR "sound/misc"
 #define FILE_DIR "sound/piano"
+#define FILE_DIR "sound/scary"
 #define FILE_DIR "sound/voice"
 #define FILE_DIR "sound/weapons"
 // END_FILE_DIR
diff --git a/code/game/objects/storage/coat.dm b/code/game/objects/storage/coat.dm
index b905b54f133..7776e2835f1 100644
--- a/code/game/objects/storage/coat.dm
+++ b/code/game/objects/storage/coat.dm
@@ -1,5 +1,5 @@
 
-/obj/item/clothing/suit/storage/
+/obj/item/clothing/suit/storage
 	var/obj/screen/storage/boxes
 	var/obj/screen/close/closer
 	var/obj/slot1
@@ -95,7 +95,6 @@
 	return
 
 /obj/item/clothing/suit/storage/proc/orient2hud(mob/user as mob)
-
 	if (src == user.l_hand)
 		src.orient_objs(3, 5, 3, 3)
 	else if (src == user.r_hand)
@@ -119,9 +118,8 @@
 			cx = tx
 			cy--
 		//Foreach goto(56)
-	src.closer.screen_loc = text("[],[]", mx, my)
+	src.closer.screen_loc = text("[],[]", mx+1, my)
 	return
-
 /*/obj/item/clothing/suit/storage/New()
 
 	src.boxes = new /obj/screen/storage(  )
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 50e7b16f2b6..3ead36c0de6 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -132,11 +132,12 @@ mob/living/carbon/proc/handle_hallucinations()
 							src << 'Taser.ogg'
 				//Rare audio
 					if(12)
-						switch(rand(1,4))
-							if(1) src << 'ghost.ogg'
-							if(2) src << 'ghost2.ogg'
-							if(3) src << 'Heart Beat.ogg'
-							if(4) src << 'screech.ogg'
+						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',\
+							'look_up1.ogg', 'look_up2.ogg', 'over_here1.ogg', 'over_here2.ogg', 'over_here3.ogg',\
+							'turn_around1.ogg', 'turn_around2.ogg', 'veryfar_noise.ogg', 'wail.ogg')
+						src << pick(creepyasssounds)
 			if(66 to 70)
 				//Flashes of danger
 				//src << "Danger Flash"
@@ -150,9 +151,9 @@ mob/living/carbon/proc/handle_hallucinations()
 					if(2,3)
 						halbody = image('human.dmi',target,"husk_s",TURF_LAYER)
 						spawn(2)
-							step_towards(halbody,my_target)
-							sleep
-							step_towards(halbody,my_target)
+							step_towards(halbody,src)
+							sleep(2)
+							step_towards(halbody,src)
 
 				if(client) client.images += halbody
 				spawn(rand(50,80)) //Only seen for a brief moment.
diff --git a/sound/scary/behind_you1.ogg b/sound/scary/behind_you1.ogg
new file mode 100644
index 00000000000..d3ddef74805
Binary files /dev/null and b/sound/scary/behind_you1.ogg differ
diff --git a/sound/scary/behind_you2.ogg b/sound/scary/behind_you2.ogg
new file mode 100644
index 00000000000..530a71698cb
Binary files /dev/null and b/sound/scary/behind_you2.ogg differ
diff --git a/sound/scary/far_noise.ogg b/sound/scary/far_noise.ogg
new file mode 100644
index 00000000000..11d849a89f2
Binary files /dev/null and b/sound/scary/far_noise.ogg differ
diff --git a/sound/scary/growl1.ogg b/sound/scary/growl1.ogg
new file mode 100644
index 00000000000..80aca01ce75
Binary files /dev/null and b/sound/scary/growl1.ogg differ
diff --git a/sound/scary/growl2.ogg b/sound/scary/growl2.ogg
new file mode 100644
index 00000000000..f10abf0fb26
Binary files /dev/null and b/sound/scary/growl2.ogg differ
diff --git a/sound/scary/growl3.ogg b/sound/scary/growl3.ogg
new file mode 100644
index 00000000000..3f3799bc0f2
Binary files /dev/null and b/sound/scary/growl3.ogg differ
diff --git a/sound/scary/i_see_you1.ogg b/sound/scary/i_see_you1.ogg
new file mode 100644
index 00000000000..66d5b65d598
Binary files /dev/null and b/sound/scary/i_see_you1.ogg differ
diff --git a/sound/scary/i_see_you2.ogg b/sound/scary/i_see_you2.ogg
new file mode 100644
index 00000000000..da908f2c4b4
Binary files /dev/null and b/sound/scary/i_see_you2.ogg differ
diff --git a/sound/scary/im_here1.ogg b/sound/scary/im_here1.ogg
new file mode 100644
index 00000000000..b3a7142365e
Binary files /dev/null and b/sound/scary/im_here1.ogg differ
diff --git a/sound/scary/im_here2.ogg b/sound/scary/im_here2.ogg
new file mode 100644
index 00000000000..bd841bcdb14
Binary files /dev/null and b/sound/scary/im_here2.ogg differ
diff --git a/sound/scary/look_up1.ogg b/sound/scary/look_up1.ogg
new file mode 100644
index 00000000000..045d5d4a768
Binary files /dev/null and b/sound/scary/look_up1.ogg differ
diff --git a/sound/scary/look_up2.ogg b/sound/scary/look_up2.ogg
new file mode 100644
index 00000000000..1e6f14b21be
Binary files /dev/null and b/sound/scary/look_up2.ogg differ
diff --git a/sound/scary/over_here1.ogg b/sound/scary/over_here1.ogg
new file mode 100644
index 00000000000..90f557b005b
Binary files /dev/null and b/sound/scary/over_here1.ogg differ
diff --git a/sound/scary/over_here2.ogg b/sound/scary/over_here2.ogg
new file mode 100644
index 00000000000..2719e204a27
Binary files /dev/null and b/sound/scary/over_here2.ogg differ
diff --git a/sound/scary/over_here3.ogg b/sound/scary/over_here3.ogg
new file mode 100644
index 00000000000..1ef1a1d8340
Binary files /dev/null and b/sound/scary/over_here3.ogg differ
diff --git a/sound/scary/turn_around1.ogg b/sound/scary/turn_around1.ogg
new file mode 100644
index 00000000000..7a83755a93f
Binary files /dev/null and b/sound/scary/turn_around1.ogg differ
diff --git a/sound/scary/turn_around2.ogg b/sound/scary/turn_around2.ogg
new file mode 100644
index 00000000000..f4328458dd9
Binary files /dev/null and b/sound/scary/turn_around2.ogg differ
diff --git a/sound/scary/veryfar_noise.ogg b/sound/scary/veryfar_noise.ogg
new file mode 100644
index 00000000000..b27ce5dce99
Binary files /dev/null and b/sound/scary/veryfar_noise.ogg differ
diff --git a/sound/scary/wail.ogg b/sound/scary/wail.ogg
new file mode 100644
index 00000000000..66318be3e94
Binary files /dev/null and b/sound/scary/wail.ogg differ