diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 6817b591bd0..2255627fe97 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -23,10 +23,6 @@
obj_integrity = 300
max_integrity = 300
-/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W, mob/user, params)
- playsound(src.loc, "rustle", 50, 1, -5)
- return ..()
-
/*
* Backpack Types
*/
diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm
index 927f7a74c6c..fa7760847db 100644
--- a/code/game/objects/items/weapons/storage/book.dm
+++ b/code/game/objects/items/weapons/storage/book.dm
@@ -203,7 +203,3 @@ var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", "
var/unholy2clean = A.reagents.get_reagent_amount("unholywater")
A.reagents.del_reagent("unholywater")
A.reagents.add_reagent("holywater",unholy2clean)
-
-/obj/item/weapon/storage/book/bible/attackby(obj/item/weapon/W, mob/user, params)
- playsound(src.loc, "rustle", 50, 1, -5)
- return ..()
diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm
index c0a392ff390..3b262817b56 100644
--- a/code/game/objects/items/weapons/storage/internal.dm
+++ b/code/game/objects/items/weapons/storage/internal.dm
@@ -3,6 +3,7 @@
max_w_class = 2
max_combined_w_class = 50 // Limited by slots, not combined weight class
w_class = 4
+ rustle_jimmies = FALSE
/obj/item/weapon/storage/internal/ClickAccessible(mob/user, depth=1)
if(loc)
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index a7022cec871..26131f7cdbf 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -153,17 +153,8 @@
/obj/item/weapon/storage/secure/briefcase/attack_hand(mob/user)
if ((src.loc == user) && (src.locked == 1))
usr << "[src] is locked and cannot be opened!"
- else if ((src.loc == user) && (!src.locked))
- playsound(src.loc, "rustle", 50, 1, -5)
- if (user.s_active)
- user.s_active.close(user) //Close and re-open
- src.show_to(user)
else
..()
- for(var/mob/M in range(1))
- if (M.s_active == src)
- src.close(M)
- src.orient2hud(user)
src.add_fingerprint(user)
return
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index dda9c69aa43..873f534e578 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -24,6 +24,7 @@
var/allow_quick_gather //Set this variable to allow the object to have the 'toggle mode' verb, which quickly collects all items from a tile.
var/collection_mode = 1; //0 = pick one at a time, 1 = pick all on tile, 2 = pick all of a type
var/preposition = "in" // You put things 'in' a bag, but trays need 'on'.
+ var/rustle_jimmies = TRUE //Play the rustle sound on insertion
/obj/item/weapon/storage/MouseDrop(atom/over_object)
@@ -326,6 +327,8 @@
observe.client.screen -= W
add_fingerprint(usr)
+ if(rustle_jimmies)
+ playsound(src.loc, "rustle", 50, 1, -5)
if(!prevent_warning)
for(var/mob/M in viewers(usr, null))
@@ -527,4 +530,4 @@
/obj/item/weapon/storage/contents_explosion(severity, target)
for(var/atom/A in contents)
A.ex_act(severity, target)
- CHECK_TICK
+ CHECK_TICK
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 81afcef314b..84424372171 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -9,7 +9,7 @@
integrity_failure = 0
can_weld_shut = 0
cutting_tool = /obj/item/weapon/wirecutters
- open_sound = 'sound/effects/rustle2.ogg'
+ open_sound = "rustle"
cutting_sound = 'sound/items/poster_ripped.ogg'
material_drop = /obj/item/stack/sheet/cardboard
delivery_icon = "deliverybox"
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 8b1f75d410c..7b17e260006 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -353,7 +353,6 @@
S = M.get_item_by_slot(slot_back) //else we put in backpack
if(istype(S) && S.can_be_inserted(src,1))
S.handle_item_insertion(src)
- playsound(src.loc, "rustle", 50, 1, -5)
return TRUE
M << "You are unable to equip that!"