diff --git a/GainStation13/sound/voice/voices/speak_1.ogg b/GainStation13/sound/voice/voices/speak_1.ogg new file mode 100644 index 00000000..ab8ddde4 Binary files /dev/null and b/GainStation13/sound/voice/voices/speak_1.ogg differ diff --git a/GainStation13/sound/voice/voices/speak_1_ask.ogg b/GainStation13/sound/voice/voices/speak_1_ask.ogg new file mode 100644 index 00000000..89d631c6 Binary files /dev/null and b/GainStation13/sound/voice/voices/speak_1_ask.ogg differ diff --git a/GainStation13/sound/voice/voices/speak_1_exclaim.ogg b/GainStation13/sound/voice/voices/speak_1_exclaim.ogg new file mode 100644 index 00000000..3be20fef Binary files /dev/null and b/GainStation13/sound/voice/voices/speak_1_exclaim.ogg differ diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 75fb8d9c..bd7f61a2 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -497,6 +497,7 @@ . = ..() message = null emote_type = EMOTE_VISIBLE + playsound(usr.loc, 'GainStation13/sound/voice/voices/speak_1.ogg', 90, 10) /datum/emote/living/custom/replace_pronoun(mob/user, message) return message diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 015b3930..57b7fc09 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -219,6 +219,23 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(pressure < ONE_ATMOSPHERE*0.4) //Thin air, let's italicise the message spans |= SPAN_ITALICS + if(message_mode == MODE_WHISPER) + switch(say_mod(message, message_mode)) + if("asks") + playsound(src.loc, 'GainStation13/sound/voice/voices/speak_1_ask.ogg', 45, 5, -3) + if("exclaims" || "yells") + playsound(src.loc, 'GainStation13/sound/voice/voices/speak_1_exclaim.ogg', 45, 5, -3) + else + playsound(src.loc, 'GainStation13/sound/voice/voices/speak_1.ogg', 45, 5, -3) + else + switch(say_mod(message, message_mode)) + if("asks") + playsound(src.loc, 'GainStation13/sound/voice/voices/speak_1_ask.ogg', 90, 10, message_range) + if("exclaims" || "yells") + playsound(src.loc, 'GainStation13/sound/voice/voices/speak_1_exclaim.ogg', 90, 10, message_range) + else + playsound(src.loc, 'GainStation13/sound/voice/voices/speak_1.ogg', 90, 10, message_range) + //playsound(user.loc, pick('GainStation13/sound/voice/voices/speak_1.ogg', 'GainStation13/sound/voice/voices/speak_1_ask.ogg', 'GainStation13/sound/voice/voices/speak_1_exclaim.ogg'), 90, 10) send_speech(message, message_range, src, bubble_type, spans, language, message_mode) if(succumbed) diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 460eaacd..d46b9d73 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -72,6 +72,8 @@ proc/get_top_level_mob(var/mob/S) if(M.stat == DEAD && M.client && (M.client?.prefs?.chat_toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T, null))) M.show_message(message) + playsound(usr.loc, 'GainStation13/sound/voice/voices/speak_1.ogg', 90, 10) + if(emote_type == EMOTE_AUDIBLE) user.audible_message(message=message,hearing_distance=1) else