diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index 7cdb9d40615..abf63eb3c75 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -43,7 +43,10 @@ /// Determines whether we play a rustle animation when inserting/removing items. var/animated = TRUE /// Determines whether we play a rustle sound when inserting/removing items. - var/rustle_sound = TRUE + var/do_rustle = TRUE + var/rustle_vary = TRUE + /// Path for the item's rustle sound. + var/rustle_sound = SFX_RUSTLE /// The sound to play when we open/access the storage var/open_sound var/open_sound_vary = TRUE @@ -529,8 +532,8 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(silent) return - if(rustle_sound) - playsound(parent, SFX_RUSTLE, 50, TRUE, -5) + if(do_rustle) + playsound(parent, rustle_sound, 50, rustle_vary, -5) if(!silent_for_user) to_chat(user, span_notice("You put [thing] [insert_preposition]to [parent].")) @@ -560,7 +563,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) reset_item(thing) thing.forceMove(remove_to_loc) - if(rustle_sound && !silent) + if(do_rustle && !silent) playsound(parent, SFX_RUSTLE, 50, TRUE, -5) else thing.moveToNullspace() @@ -794,7 +797,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(dest_object.atom_storage) to_chat(user, span_notice("You dump the contents of [parent] into [dest_object].")) - if(rustle_sound) + if(do_rustle) playsound(parent, SFX_RUSTLE, 50, TRUE, -5) for(var/obj/item/to_dump in real_location) @@ -957,7 +960,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(animated) animate_parent() - if(rustle_sound) + if(do_rustle && !silent) playsound(parent, (open_sound ? open_sound : SFX_RUSTLE), 50, open_sound_vary, -5) return TRUE diff --git a/code/datums/storage/subtypes/extract_inventory.dm b/code/datums/storage/subtypes/extract_inventory.dm index 9d75b6eb1d3..621e4465451 100644 --- a/code/datums/storage/subtypes/extract_inventory.dm +++ b/code/datums/storage/subtypes/extract_inventory.dm @@ -5,7 +5,7 @@ attack_hand_interact = FALSE quickdraw = FALSE locked = STORAGE_FULLY_LOCKED - rustle_sound = FALSE + do_rustle = FALSE silent = TRUE // Snowflake so you can feed it insert_on_attack = FALSE diff --git a/code/datums/storage/subtypes/pockets.dm b/code/datums/storage/subtypes/pockets.dm index edf3816c274..4e0e233121a 100644 --- a/code/datums/storage/subtypes/pockets.dm +++ b/code/datums/storage/subtypes/pockets.dm @@ -2,7 +2,7 @@ max_slots = 2 max_specific_storage = WEIGHT_CLASS_SMALL max_total_storage = 50 - rustle_sound = FALSE + do_rustle = FALSE /datum/storage/pockets/attempt_insert(obj/item/to_insert, mob/user, override, force, messages) . = ..() diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 32b825f803f..d68c3c58f0b 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -824,7 +824,7 @@ AddElement(/datum/element/update_icon_updates_onmob) atom_storage.max_slots = 1 - atom_storage.rustle_sound = FALSE + atom_storage.do_rustle = FALSE atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY atom_storage.set_holdable(/obj/item/melee/sabre) atom_storage.click_alt_open = FALSE @@ -872,7 +872,7 @@ AddElement(/datum/element/update_icon_updates_onmob) atom_storage.max_slots = 1 - atom_storage.rustle_sound = FALSE + atom_storage.do_rustle = FALSE atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY atom_storage.set_holdable(/obj/item/melee/parsnip_sabre) atom_storage.click_alt_open = FALSE diff --git a/code/game/objects/items/storage/boxes/_boxes.dm b/code/game/objects/items/storage/boxes/_boxes.dm index 56915d8a5fc..94015272996 100644 --- a/code/game/objects/items/storage/boxes/_boxes.dm +++ b/code/game/objects/items/storage/boxes/_boxes.dm @@ -19,6 +19,8 @@ . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL update_appearance() + atom_storage.open_sound = 'sound/items/cardboard_box_open.ogg' + atom_storage.rustle_sound = 'sound/items/cardboard_box_rustle.ogg' /obj/item/storage/box/suicide_act(mob/living/carbon/user) var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD) diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index bee7fdd524f..368ef9c0b40 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -84,6 +84,7 @@ atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL atom_storage.open_sound = 'sound/items/medkit_open.ogg' atom_storage.open_sound_vary = TRUE + atom_storage.rustle_sound = 'sound/items/medkit_rustle.ogg' /obj/item/storage/medkit/regular icon_state = "medkit" diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 905f2e40f47..d2bb90e69e4 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -33,7 +33,8 @@ if(prob(1)) latches = "triple_latch" update_appearance() - + atom_storage.open_sound = 'sound/items/toolbox_open.ogg' + atom_storage.rustle_sound = 'sound/items/toolbox_rustle.ogg' AddElement(/datum/element/falling_hazard, damage = force, wound_bonus = wound_bonus, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound) /obj/item/storage/toolbox/update_overlays() diff --git a/code/game/objects/structures/toiletbong.dm b/code/game/objects/structures/toiletbong.dm index 0ea21e9ff84..254f151c017 100644 --- a/code/game/objects/structures/toiletbong.dm +++ b/code/game/objects/structures/toiletbong.dm @@ -15,7 +15,7 @@ AddComponent(/datum/component/simple_rotation, post_rotation = CALLBACK(src, PROC_REF(post_rotation))) create_storage(max_total_storage = 100, max_slots = 12, canhold = /obj/item/food) atom_storage.attack_hand_interact = FALSE - atom_storage.rustle_sound = FALSE + atom_storage.do_rustle = FALSE atom_storage.animated = FALSE weed_overlay = mutable_appearance('icons/obj/watercloset.dmi', "[base_icon_state]_overlay") diff --git a/code/modules/clothing/under/accessories/_accessories.dm b/code/modules/clothing/under/accessories/_accessories.dm index 91854bc386b..5b25418838a 100644 --- a/code/modules/clothing/under/accessories/_accessories.dm +++ b/code/modules/clothing/under/accessories/_accessories.dm @@ -89,7 +89,7 @@ atom_storage.close_all() attach_to.clone_storage(atom_storage) attach_to.atom_storage.set_real_location(src) - attach_to.atom_storage.rustle_sound = TRUE // it's on the suit now + attach_to.atom_storage.do_rustle = TRUE // it's on the suit now var/num_other_accessories = LAZYLEN(attach_to.attached_accessories) layer = FLOAT_LAYER + clamp(attach_to.max_number_of_accessories - num_other_accessories, 0, 10) diff --git a/code/modules/mob/living/basic/drone/drone_tools.dm b/code/modules/mob/living/basic/drone/drone_tools.dm index 32ec1bb1528..7effefcd7f9 100644 --- a/code/modules/mob/living/basic/drone/drone_tools.dm +++ b/code/modules/mob/living/basic/drone/drone_tools.dm @@ -25,7 +25,7 @@ atom_storage.max_total_storage = 40 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_slots = 10 - atom_storage.rustle_sound = FALSE + atom_storage.do_rustle = FALSE atom_storage.set_holdable(drone_builtins) diff --git a/sound/items/attributions.txt b/sound/items/attributions.txt index 9ad1a09d8cb..318488414e5 100644 --- a/sound/items/attributions.txt +++ b/sound/items/attributions.txt @@ -56,3 +56,11 @@ gas_tank_drop.ogg gas_tank_pick_up.ogg } - https://freesound.org/people/Globofonia/sounds/698346/ , License CC0 edited by grungussuss + +{ +cardboad_box_open.ogg - made by sadboysuss +cardboad_box_rustle.ogg - made by sadboysuss +toolbox_open.ogg - made by sadboysuss +toolbox_rustle.ogg - made by sadboysuss +medkit_rustle.ogg - made by sadboysuss +} - license: CC-by-SA diff --git a/sound/items/cardboard_box_open.ogg b/sound/items/cardboard_box_open.ogg new file mode 100644 index 00000000000..1ad890d159a Binary files /dev/null and b/sound/items/cardboard_box_open.ogg differ diff --git a/sound/items/cardboard_box_rustle.ogg b/sound/items/cardboard_box_rustle.ogg new file mode 100644 index 00000000000..01dcc5567b7 Binary files /dev/null and b/sound/items/cardboard_box_rustle.ogg differ diff --git a/sound/items/medkit_rustle.ogg b/sound/items/medkit_rustle.ogg new file mode 100644 index 00000000000..55ebc82b911 Binary files /dev/null and b/sound/items/medkit_rustle.ogg differ diff --git a/sound/items/toolbox_open.ogg b/sound/items/toolbox_open.ogg new file mode 100644 index 00000000000..9dea5428d04 Binary files /dev/null and b/sound/items/toolbox_open.ogg differ diff --git a/sound/items/toolbox_rustle.ogg b/sound/items/toolbox_rustle.ogg new file mode 100644 index 00000000000..939d003b18f Binary files /dev/null and b/sound/items/toolbox_rustle.ogg differ