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 0dcb8721..395980cf 100644 Binary files a/sound/voice/radio.ogg and b/sound/voice/radio.ogg differ