diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 477017b41e4..ab5a5a80de4 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -255,6 +255,8 @@ GLOBAL_LIST_INIT(announcer_keys, list( #define SFX_HEADSET_PICKUP "headset_pickup" #define SFX_BANDAGE_BEGIN "bandage_begin" #define SFX_BANDAGE_END "bandage_end" +#define SFX_CLOTH_DROP "cloth_drop" +#define SFX_CLOTH_PICKUP "cloth_pickup" // Standard is 44.1khz #define MIN_EMOTE_PITCH 40000 diff --git a/code/game/objects/items/pillow.dm b/code/game/objects/items/pillow.dm index af2096a9c2c..b491d17d1fe 100644 --- a/code/game/objects/items/pillow.dm +++ b/code/game/objects/items/pillow.dm @@ -22,6 +22,8 @@ var/hit_sound ///if we have a brick inside us var/bricked = FALSE + drop_sound = SFX_CLOTH_DROP + pickup_sound = SFX_CLOTH_PICKUP /obj/item/pillow/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 1033bbab4a9..e9d25942d25 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -381,6 +381,8 @@ var/obj/item/bodypart/gauzed_bodypart heal_end_sound = SFX_BANDAGE_END heal_begin_sound = SFX_BANDAGE_BEGIN + drop_sound = SFX_CLOTH_DROP + pickup_sound = SFX_CLOTH_PICKUP /obj/item/stack/medical/gauze/Destroy(force) . = ..() @@ -583,6 +585,8 @@ repeating = TRUE sanitization = 0.75 flesh_regeneration = 3 + pickup_sound = SFX_CLOTH_PICKUP + drop_sound = SFX_CLOTH_DROP var/is_open = TRUE ///This var determines if the sterile packaging of the mesh has been opened. grind_results = list(/datum/reagent/medicine/spaceacillin = 2) @@ -763,6 +767,8 @@ other_delay = 1 SECONDS grind_results = list(/datum/reagent/medicine/c2/libital = 2) apply_verb = "applying to" + pickup_sound = SFX_CLOTH_PICKUP + // add a better drop sound more fitting for a lil' itty bitty band-aid /obj/item/stack/medical/bandage/makeshift name = "makeshift bandage" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 0254af8e242..3b1b0bde6bb 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -517,9 +517,11 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ force = 0 throwforce = 0 merge_type = /obj/item/stack/sheet/cloth - drop_sound = 'sound/items/handling/cloth_drop.ogg' - pickup_sound = 'sound/items/handling/cloth_pickup.ogg' + drop_sound = 'sound/items/handling/cloth/cloth_drop1.ogg' + pickup_sound = 'sound/items/handling/cloth/cloth_pickup1.ogg' grind_results = list(/datum/reagent/cellulose = 20) + pickup_sound = SFX_CLOTH_PICKUP + drop_sound = SFX_CLOTH_DROP /obj/item/stack/sheet/cloth/get_main_recipes() . = ..() @@ -548,8 +550,8 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ force = 0 throwforce = 0 merge_type = /obj/item/stack/sheet/durathread - drop_sound = 'sound/items/handling/cloth_drop.ogg' - pickup_sound = 'sound/items/handling/cloth_pickup.ogg' + drop_sound = 'sound/items/handling/cloth/cloth_drop1.ogg' + pickup_sound = 'sound/items/handling/cloth/cloth_pickup1.ogg' /obj/item/stack/sheet/durathread/Initialize(mapload) . = ..() @@ -579,8 +581,8 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ grind_results = list(/datum/reagent/cellulose = 20) var/loom_result = /obj/item/stack/sheet/cloth var/loom_time = 1 SECONDS - drop_sound = 'sound/items/handling/cloth_drop.ogg' - pickup_sound = 'sound/items/handling/cloth_pickup.ogg' + drop_sound = 'sound/items/handling/cloth/cloth_drop1.ogg' + pickup_sound = 'sound/items/handling/cloth/cloth_pickup1.ogg' /obj/item/stack/sheet/cotton/Initialize(mapload) . = ..() diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index a843c3e3e4b..1d456148e88 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -12,8 +12,8 @@ LINEN BINS righthand_file = 'icons/mob/inhands/items/bedsheet_righthand.dmi' icon_state = "sheetwhite" inhand_icon_state = "sheetwhite" - drop_sound = 'sound/items/handling/cloth_drop.ogg' - pickup_sound = 'sound/items/handling/cloth_pickup.ogg' + drop_sound = SFX_CLOTH_DROP + pickup_sound = SFX_CLOTH_PICKUP slot_flags = ITEM_SLOT_NECK layer = BELOW_MOB_LAYER throwforce = 0 diff --git a/code/game/sound.dm b/code/game/sound.dm index b51d3b94f1c..92966ab7e88 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -813,4 +813,19 @@ 'sound/items/gauze/bandage_end3.ogg', 'sound/items/gauze/bandage_end4.ogg', ) + // Old cloth sounds are named cloth_...1.ogg, I wanted to keep them so these new ones go further down the line. + if(SFX_CLOTH_DROP) + soundin = pick( + 'sound/items/handling/cloth/cloth_drop2.ogg', + 'sound/items/handling/cloth/cloth_drop3.ogg', + 'sound/items/handling/cloth/cloth_drop4.ogg', + 'sound/items/handling/cloth/cloth_drop5.ogg', + ) + if(SFX_CLOTH_PICKUP) + soundin = pick( + 'sound/items/handling/cloth/cloth_pickup2.ogg', + 'sound/items/handling/cloth/cloth_pickup3.ogg', + 'sound/items/handling/cloth/cloth_pickup4.ogg', + 'sound/items/handling/cloth/cloth_pickup5.ogg', + ) return soundin diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 78ea1d2f3b7..b8d77df4ad1 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -11,8 +11,8 @@ /obj/item/storage/belt/holster, ) armor_type = /datum/armor/none - drop_sound = 'sound/items/handling/cloth_drop.ogg' - pickup_sound = 'sound/items/handling/cloth_pickup.ogg' + drop_sound = 'sound/items/handling/cloth/cloth_drop1.ogg' + pickup_sound = 'sound/items/handling/cloth/cloth_pickup1.ogg' slot_flags = ITEM_SLOT_OCLOTHING var/blood_overlay_type = "suit" limb_integrity = 0 // disabled for most exo-suits diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 3fa11d2882c..2ff81ef4d0a 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -10,8 +10,8 @@ armor_type = /datum/armor/clothing_under supports_variations_flags = CLOTHING_DIGITIGRADE_MASK equip_sound = 'sound/items/equip/jumpsuit_equip.ogg' - drop_sound = 'sound/items/handling/cloth_drop.ogg' - pickup_sound = 'sound/items/handling/cloth_pickup.ogg' + drop_sound = 'sound/items/handling/cloth/cloth_drop1.ogg' + pickup_sound = 'sound/items/handling/cloth/cloth_pickup1.ogg' limb_integrity = 30 interaction_flags_click = ALLOW_RESTING diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 4a64335f8e6..b88a7e31f94 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -331,6 +331,8 @@ attack_verb_continuous = list("slaps") attack_verb_simple = list("slap") interaction_flags_atom = parent_type::interaction_flags_atom | INTERACT_ATOM_IGNORE_MOBILITY + drop_sound = SFX_CLOTH_DROP + pickup_sound = SFX_CLOTH_PICKUP /obj/item/surgical_drapes/Initialize(mapload) . = ..() diff --git a/sound/items/handling/cloth/attribution.txt b/sound/items/handling/cloth/attribution.txt new file mode 100644 index 00000000000..e7614c392d6 --- /dev/null +++ b/sound/items/handling/cloth/attribution.txt @@ -0,0 +1,10 @@ +{ +cloth_drop1.ogg +cloth_drop2.ogg +cloth_drop3.ogg +cloth_drop4.ogg +cloth_pickup1.ogg +cloth_pickup2.ogg +cloth_pickup3.ogg +cloth_pickup4.ogg +} - made by sadboyssuss \ No newline at end of file diff --git a/sound/items/handling/cloth_drop.ogg b/sound/items/handling/cloth/cloth_drop1.ogg similarity index 100% rename from sound/items/handling/cloth_drop.ogg rename to sound/items/handling/cloth/cloth_drop1.ogg diff --git a/sound/items/handling/cloth/cloth_drop2.ogg b/sound/items/handling/cloth/cloth_drop2.ogg new file mode 100644 index 00000000000..c7b169b073b Binary files /dev/null and b/sound/items/handling/cloth/cloth_drop2.ogg differ diff --git a/sound/items/handling/cloth/cloth_drop3.ogg b/sound/items/handling/cloth/cloth_drop3.ogg new file mode 100644 index 00000000000..ee71eb14c19 Binary files /dev/null and b/sound/items/handling/cloth/cloth_drop3.ogg differ diff --git a/sound/items/handling/cloth/cloth_drop4.ogg b/sound/items/handling/cloth/cloth_drop4.ogg new file mode 100644 index 00000000000..28c22cf2499 Binary files /dev/null and b/sound/items/handling/cloth/cloth_drop4.ogg differ diff --git a/sound/items/handling/cloth/cloth_drop5.ogg b/sound/items/handling/cloth/cloth_drop5.ogg new file mode 100644 index 00000000000..3727fb8a6ac Binary files /dev/null and b/sound/items/handling/cloth/cloth_drop5.ogg differ diff --git a/sound/items/handling/cloth_pickup.ogg b/sound/items/handling/cloth/cloth_pickup1.ogg similarity index 100% rename from sound/items/handling/cloth_pickup.ogg rename to sound/items/handling/cloth/cloth_pickup1.ogg diff --git a/sound/items/handling/cloth/cloth_pickup2.ogg b/sound/items/handling/cloth/cloth_pickup2.ogg new file mode 100644 index 00000000000..659bdc20557 Binary files /dev/null and b/sound/items/handling/cloth/cloth_pickup2.ogg differ diff --git a/sound/items/handling/cloth/cloth_pickup3.ogg b/sound/items/handling/cloth/cloth_pickup3.ogg new file mode 100644 index 00000000000..4b5ef7fcf24 Binary files /dev/null and b/sound/items/handling/cloth/cloth_pickup3.ogg differ diff --git a/sound/items/handling/cloth/cloth_pickup4.ogg b/sound/items/handling/cloth/cloth_pickup4.ogg new file mode 100644 index 00000000000..309b12863e4 Binary files /dev/null and b/sound/items/handling/cloth/cloth_pickup4.ogg differ diff --git a/sound/items/handling/cloth/cloth_pickup5.ogg b/sound/items/handling/cloth/cloth_pickup5.ogg new file mode 100644 index 00000000000..22b50e45d0a Binary files /dev/null and b/sound/items/handling/cloth/cloth_pickup5.ogg differ