diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 9d0a017bff8..b0acd65b10a 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -251,6 +251,8 @@ GLOBAL_LIST_INIT(announcer_keys, list( #define SFX_CLOWN_CAR_LOAD "clown_car_load" #define SFX_SEATBELT_BUCKLE "buckle" #define SFX_SEATBELT_UNBUCKLE "unbuckle" +#define SFX_HEADSET_EQUIP "headset_equip" +#define SFX_HEADSET_PICKUP "headset_pickup" // Standard is 44.1khz #define MIN_EMOTE_PITCH 40000 diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 578c671bf53..bd41fb7023e 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -30,6 +30,10 @@ GLOBAL_LIST_INIT(channel_tokens, list( interaction_flags_mouse_drop = FORBID_TELEKINESIS_REACH slot_flags = ITEM_SLOT_EARS dog_fashion = null + equip_sound = SFX_HEADSET_EQUIP + pickup_sound = SFX_HEADSET_PICKUP + drop_sound = 'sound/items/handling/headset/headset_drop1.ogg' + sound_vary = TRUE var/obj/item/encryptionkey/keyslot2 = null /// A list of all languages that this headset allows the user to understand. Populated by language encryption keys. var/list/language_list diff --git a/code/game/sound.dm b/code/game/sound.dm index fccdd8df4cd..15be685ea48 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -788,4 +788,15 @@ 'sound/machines/buckle/unbuckle2.ogg', 'sound/machines/buckle/unbuckle3.ogg', ) + if(SFX_HEADSET_EQUIP) + soundin = pick( + 'sound/items/equip/headset_equip1.ogg', + 'sound/items/equip/headset_equip2.ogg', + ) + if(SFX_HEADSET_PICKUP) + soundin = pick( + 'sound/items/handling/headset/headset_pickup1.ogg', + 'sound/items/handling/headset/headset_pickup2.ogg', + 'sound/items/handling/headset/headset_pickup3.ogg', + ) return soundin diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm index a1cfd37ec0d..a9a70101afb 100644 --- a/code/modules/clothing/head/costume.dm +++ b/code/modules/clothing/head/costume.dm @@ -184,6 +184,9 @@ desc = "A neon-blue pair of headphones. They look neo-futuristic." icon_state = "decker_hat" inhand_icon_state = null + equip_sound = SFX_HEADSET_EQUIP + pickup_sound = SFX_HEADSET_PICKUP + drop_sound = 'sound/items/handling/headset/headset_drop1.ogg' /obj/item/clothing/head/costume/yuri name = "yuri initiate helmet" diff --git a/code/modules/instruments/piano_synth.dm b/code/modules/instruments/piano_synth.dm index 8e107d494c7..5de8659b65e 100644 --- a/code/modules/instruments/piano_synth.dm +++ b/code/modules/instruments/piano_synth.dm @@ -26,6 +26,9 @@ force = 0 w_class = WEIGHT_CLASS_SMALL custom_price = PAYCHECK_CREW * 2.5 + equip_sound = SFX_HEADSET_EQUIP + pickup_sound = SFX_HEADSET_PICKUP + drop_sound = 'sound/items/handling/headset/headset_drop1.ogg' instrument_range = 1 circuit_type = /obj/item/circuit_component/synth/headphones shell_capacity = SHELL_CAPACITY_TINY diff --git a/sound/items/equip/attribution.txt b/sound/items/equip/attribution.txt index d0380ef3934..73cd515d674 100644 --- a/sound/items/equip/attribution.txt +++ b/sound/items/equip/attribution.txt @@ -1,2 +1,7 @@ sneakers equip1 made by sadboysuss license: CC-BY-SA 3.0 + +{ +headset_equip1.ogg +headset_equip2.ogg +} - made by sadboysuss diff --git a/sound/items/equip/headset_equip1.ogg b/sound/items/equip/headset_equip1.ogg new file mode 100644 index 00000000000..297fbcab3cf Binary files /dev/null and b/sound/items/equip/headset_equip1.ogg differ diff --git a/sound/items/equip/headset_equip2.ogg b/sound/items/equip/headset_equip2.ogg new file mode 100644 index 00000000000..db7c87d21ad Binary files /dev/null and b/sound/items/equip/headset_equip2.ogg differ diff --git a/sound/items/handling/headset/attribution.txt b/sound/items/handling/headset/attribution.txt new file mode 100644 index 00000000000..8273ac3be25 --- /dev/null +++ b/sound/items/handling/headset/attribution.txt @@ -0,0 +1,6 @@ +{ +headset_pickup1.ogg +headset_pickup2.ogg +headset_pickup3.ogg +headset_drop1.ogg +} - made by sadboysuss \ No newline at end of file diff --git a/sound/items/handling/headset/headset_drop1.ogg b/sound/items/handling/headset/headset_drop1.ogg new file mode 100644 index 00000000000..d2c4a82b55b Binary files /dev/null and b/sound/items/handling/headset/headset_drop1.ogg differ diff --git a/sound/items/handling/headset/headset_pickup1.ogg b/sound/items/handling/headset/headset_pickup1.ogg new file mode 100644 index 00000000000..aea8150bd7f Binary files /dev/null and b/sound/items/handling/headset/headset_pickup1.ogg differ diff --git a/sound/items/handling/headset/headset_pickup2.ogg b/sound/items/handling/headset/headset_pickup2.ogg new file mode 100644 index 00000000000..87df489086b Binary files /dev/null and b/sound/items/handling/headset/headset_pickup2.ogg differ diff --git a/sound/items/handling/headset/headset_pickup3.ogg b/sound/items/handling/headset/headset_pickup3.ogg new file mode 100644 index 00000000000..e12c1539d66 Binary files /dev/null and b/sound/items/handling/headset/headset_pickup3.ogg differ