From 67ef60ad6a076b5704874a10f72d0c1868326b39 Mon Sep 17 00:00:00 2001 From: dj-34 Date: Mon, 30 Dec 2024 21:35:12 +0500 Subject: [PATCH] Remove radio receive sound, allow talk sound for all frequencies (#933) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes https://github.com/ss220club/Bandastation/issues/932 1. Удалил звук получения сообщения (включая important от глав), нам хватает нашего ТТС. 2. Разрешил звук отправки для всех радиочастот. - Его все также можно убрать через префы. --- code/game/objects/items/devices/radio/radio.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 25060d23af5b2..acb4c378d8d0c 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -353,7 +353,7 @@ if(isliving(talking_movable)) var/mob/living/talking_living = talking_movable var/volume_modifier = (talking_living.client?.prefs.read_preference(/datum/preference/numeric/sound_radio_noise)) - if(radio_noise && talking_living.can_hear() && volume_modifier && signal.frequency != FREQ_COMMON && !LAZYACCESS(message_mods, MODE_SEQUENTIAL) && COOLDOWN_FINISHED(src, audio_cooldown)) + if(radio_noise && talking_living.can_hear() && volume_modifier && !LAZYACCESS(message_mods, MODE_SEQUENTIAL) && COOLDOWN_FINISHED(src, audio_cooldown)) // BANDASTATION EDIT - Remove: signal.frequency != FREQ_COMMON COOLDOWN_START(src, audio_cooldown, 0.5 SECONDS) var/sound/radio_noise = sound('sound/items/radio/radio_talk.ogg', volume = volume_modifier) radio_noise.frequency = get_rand_frequency_low_range() @@ -432,7 +432,8 @@ if(!isliving(loc)) return - + // BANDASTATION REMOVAL - START + /** var/mob/living/holder = loc var/volume_modifier = (holder.client?.prefs.read_preference(/datum/preference/numeric/sound_radio_noise)) if(!radio_noise || HAS_TRAIT(holder, TRAIT_DEAF) || !holder.client?.prefs.read_preference(/datum/preference/numeric/sound_radio_noise)) @@ -448,6 +449,8 @@ var/sound/radio_important = sound('sound/items/radio/radio_important.ogg', volume = volume_modifier) radio_important.frequency = get_rand_frequency_low_range() SEND_SOUND(holder, radio_important) + */ + // BANDASTATION REMOVAL - END /obj/item/radio/ui_state(mob/user) return GLOB.inventory_state