From ce6a820f44bb780d229659c6c6921a845debe0fb Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 26 Aug 2021 13:25:20 -0400 Subject: [PATCH] Merge pull request #11495 from VOREStation/upstream-merge-8242 [MIRROR] Adds Headset Radio Sounds --- .../objects/items/devices/radio/headset.dm | 4 +++- .../preference_setup/global/setting_datums.dm | 6 ++++++ .../modules/client/preferences_toggle_procs.dm | 17 +++++++++++++++-- sound/effects/radio_common.ogg | Bin 0 -> 5866 bytes 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 sound/effects/radio_common.ogg diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 22cfcad31d..49a82e32db 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -16,7 +16,7 @@ var/obj/item/device/encryptionkey/keyslot2 = null var/ks1type = null var/ks2type = null - + drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' @@ -62,10 +62,12 @@ /obj/item/device/radio/headset/receive_range(freq, level, aiOverride = 0) if (aiOverride) + playsound(loc, 'sound/effects/radio_common.ogg', 25, 1, 1) return ..(freq, level) if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc if(H.l_ear == src || H.r_ear == src) + playsound(loc, 'sound/effects/radio_common.ogg', 25, 1, 1) return ..(freq, level) return -1 diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm index a0c91e60d6..679c8caa8d 100644 --- a/code/modules/client/preference_setup/global/setting_datums.dm +++ b/code/modules/client/preference_setup/global/setting_datums.dm @@ -295,6 +295,12 @@ var/list/_client_preferences_by_type enabled_description = "Show" disabled_description = "Hide" +/datum/client_preference/radio_sounds + description = "Radio Sounds" + key = "RADIO_SOUNDS" + enabled_description = "On" + disabled_description = "Off" + /datum/client_preference/runechat_mob description = "Runechat (Mobs)" key = "RUNECHAT_MOB" diff --git a/code/modules/client/preferences_toggle_procs.dm b/code/modules/client/preferences_toggle_procs.dm index e18dc500b0..e9a682e6a6 100644 --- a/code/modules/client/preferences_toggle_procs.dm +++ b/code/modules/client/preferences_toggle_procs.dm @@ -253,7 +253,7 @@ SScharacter_setup.queue_preferences_save(prefs) feedback_add_details("admin_verb","TAirPumpNoise") - + /client/verb/toggle_old_door_sounds() set name = "Toggle Door: Old Sounds" set category = "Preferences" @@ -268,7 +268,7 @@ SScharacter_setup.queue_preferences_save(prefs) feedback_add_details("admin_verb","TOldDoorSounds") - + /client/verb/toggle_department_door_sounds() set name = "Toggle Door: Department Sounds" set category = "Preferences" @@ -393,6 +393,19 @@ feedback_add_details("admin_verb","TStatusIndicators") +/client/verb/toggle_radio_sounds() + set name = "Toggle Radio Sounds" + set category = "Preferences" + set desc = "Enable/Disable hearing a sound when somebody speaks over your headset." + + var/pref_path = /datum/client_preference/radio_sounds + toggle_preference(pref_path) + SScharacter_setup.queue_preferences_save(prefs) + + to_chat(src, "You will now [(is_preference_enabled(/datum/client_preference/radio_sounds)) ? "hear" : "not hear"] radio sounds.") + + feedback_add_details("admin_verb","TRadioSounds") + // Not attached to a pref datum because those are strict binary toggles /client/verb/toggle_examine_mode() set name = "Toggle Examine Mode" diff --git a/sound/effects/radio_common.ogg b/sound/effects/radio_common.ogg new file mode 100644 index 0000000000000000000000000000000000000000..20a1d1da0a06d8f13bc7701a9bb3e392b78cb627 GIT binary patch literal 5866 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 Kkk%c5ZTt@th>p+z literal 0 HcmV?d00001