Skip to content

Commit

Permalink
Remove radio receive sound, allow talk sound for all frequencies (#933)
Browse files Browse the repository at this point in the history
Closes #932
1. Удалил звук получения сообщения (включая important от глав), нам
хватает нашего ТТС.
2. Разрешил звук отправки для всех радиочастот. - Его все также можно
убрать через префы.
  • Loading branch information
dj-34 authored Dec 30, 2024
1 parent 6fae39a commit 67ef60a
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions code/game/objects/items/devices/radio/radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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))
Expand All @@ -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
Expand Down

0 comments on commit 67ef60a

Please sign in to comment.