From 3eb11eb48fc5eab5980d7af87b26271ae110f947 Mon Sep 17 00:00:00 2001
From: LaharlMontogmmery <sebmetroid@hotmail.com>
Date: Thu, 18 Jun 2015 19:55:15 +0200
Subject: [PATCH] Add extra rustling. Also adding mouse_over for lockers.

---
 .../objects/items/weapons/storage/lockbox.dm  |  7 +++
 .../objects/items/weapons/storage/secure.dm   |  2 +-
 .../objects/items/weapons/storage/storage.dm  |  4 +-
 tgstation.dme                                 | 47 +++++++++++++++++++
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 5f787339557..ac320fd7d07 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -41,6 +41,13 @@
 		user << "<span class='danger'>It's locked!</span>"
 	return
 
+/obj/item/weapon/storage/lockbox/MouseDrop(over_object, src_location, over_location)
+	if (locked)
+		src.add_fingerprint(usr)
+		usr << "<span class='warning'>It's locked!</span>"
+		return 0
+	..()
+
 /obj/item/weapon/storage/lockbox/emag_act(mob/user as mob)
 	if(!broken)
 		broken = 1
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 469e74ca57e..8cffa2dee32 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -76,7 +76,7 @@
 	if (locked)
 		src.add_fingerprint(usr)
 		usr << "<span class='warning'>It's locked!</span>"
-		return
+		return 0
 	..()
 
 /obj/item/weapon/storage/secure/attack_self(mob/user as mob)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index f93dfacfc68..2d8abf62273 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -64,7 +64,9 @@
 //Check if this storage can dump the items
 /obj/item/weapon/storage/proc/content_can_dump(atom/dest_object, mob/user)
 	if(Adjacent(user) && dest_object.Adjacent(user))
-		return dest_object.storage_contents_dump_act(src, user)
+		if(dest_object.storage_contents_dump_act(src, user))
+			playsound(loc, "rustle", 50, 1, -5)
+			return 1
 	return 0
 
 //Object behaviour on storage dump
diff --git a/tgstation.dme b/tgstation.dme
index 6f47e668fda..376a48dff48 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6,6 +6,53 @@
 
 // BEGIN_FILE_DIR
 #define FILE_DIR .
+#define FILE_DIR "html"
+#define FILE_DIR "icons"
+#define FILE_DIR "icons/ass"
+#define FILE_DIR "icons/effects"
+#define FILE_DIR "icons/mecha"
+#define FILE_DIR "icons/misc"
+#define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/mob/inhands"
+#define FILE_DIR "icons/obj"
+#define FILE_DIR "icons/obj/assemblies"
+#define FILE_DIR "icons/obj/atmospherics"
+#define FILE_DIR "icons/obj/clothing"
+#define FILE_DIR "icons/obj/doors"
+#define FILE_DIR "icons/obj/flora"
+#define FILE_DIR "icons/obj/food"
+#define FILE_DIR "icons/obj/guns"
+#define FILE_DIR "icons/obj/hydroponics"
+#define FILE_DIR "icons/obj/machines"
+#define FILE_DIR "icons/obj/pipes"
+#define FILE_DIR "icons/obj/power_cond"
+#define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/spideros_icons"
+#define FILE_DIR "icons/stamp_icons"
+#define FILE_DIR "icons/Testing"
+#define FILE_DIR "icons/turf"
+#define FILE_DIR "icons/vending_icons"
+#define FILE_DIR "nano"
+#define FILE_DIR "nano/images"
+#define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
+#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/arcade"
+#define FILE_DIR "sound/effects"
+#define FILE_DIR "sound/guitar"
+#define FILE_DIR "sound/hallucinations"
+#define FILE_DIR "sound/items"
+#define FILE_DIR "sound/machines"
+#define FILE_DIR "sound/magic"
+#define FILE_DIR "sound/mecha"
+#define FILE_DIR "sound/misc"
+#define FILE_DIR "sound/piano"
+#define FILE_DIR "sound/spookoween"
+#define FILE_DIR "sound/violin"
+#define FILE_DIR "sound/voice"
+#define FILE_DIR "sound/voice/complionator"
+#define FILE_DIR "sound/vox_fem"
+#define FILE_DIR "sound/weapons"
 // END_FILE_DIR
 
 // BEGIN_PREFERENCES