From 8cceffb59432dbadc4dd7d32d9b36ea793aa31c5 Mon Sep 17 00:00:00 2001 From: QuoteFox <49098813+quotefox@users.noreply.github.com> Date: Sun, 28 Mar 2021 18:53:32 +0100 Subject: [PATCH] radio in sounds. --- code/controllers/subsystem/input.dm | 8 ++++---- .../game/objects/items/devices/radio/radio.dm | 1 + code/modules/mob/living/say.dm | 2 +- sound/voice/radio.ogg | Bin 4388 -> 4479 bytes 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index 21badd71..246ad746 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -33,10 +33,10 @@ SUBSYSTEM_DEF(input) "Tab" = "\".winset \\\"input.focus=true?map.focus=true input.background-color=[COLOR_INPUT_DISABLED]:input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"", "O" = "ooc", "Ctrl+O" = "looc", - "Ctrl+T" = "say", + "Ctrl+T" = "say_indicator", "T" = "say_indicator", "Y" = "whisper", - "Ctrl+M" = "me", + "Ctrl+M" = "me_indicato", "M" = "me_indicator", "Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs "Any" = "\"KeyDown \[\[*\]\]\"", @@ -50,9 +50,9 @@ SUBSYSTEM_DEF(input) "old_hotkeys" = list( "Tab" = "\".winset \\\"mainwindow.macro=old_default input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"", "O" = "ooc", - "T" = "say", + "T" = "say_indicator", "Ctrl+T" = "say_indicator", - "M" = "me", + "M" = "me_indicator", "Ctrl+M" = "me_indicator", "Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs "Any" = "\"KeyDown \[\[*\]\]\"", diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 3c235de1..82a905ce 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -200,6 +200,7 @@ if(!language) language = M.get_default_language() INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans.Copy(), language) + playsound(src, 'sound/voice/radioin.ogg', 50, 0) return ITALICS | REDUCE_RANGE /obj/item/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 6c72662e..54f61f4d 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if (client?.prefs.chat_on_map && stat != UNCONSCIOUS && (client.prefs.see_chat_non_mob || ismob(speaker)) && can_hear()) create_chat_message(speaker, message_language, raw_message, spans, message_mode) if (client?.prefs.radiosounds && stat != UNCONSCIOUS && can_hear() && radio_freq) - playsound_local(src,'sound/voice/radio.ogg', 30, 1) + playsound_local(src,'sound/voice/radio.ogg', 30, 0) // Recompose message for AI hrefs, language incomprehension. message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode, FALSE, source) diff --git a/sound/voice/radio.ogg b/sound/voice/radio.ogg index 0dcb87214ff4563daca5be5dd76c503717fa9d9b..395980cf67672ca346a5d62c1836d48bf6431ac3 100644 GIT binary patch literal 4479 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 literal 4388 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