From 6b2eb4c39a150a596a491c5e428574260d7abf32 Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Thu, 12 Jun 2025 08:05:52 -0700 Subject: [PATCH] Make emote_sound_mode work on normal sound emotes (#17819) * Make emote_sound_mode work on normal sound emotes * Make the code better --------- Co-authored-by: Cameron Lennox --- code/modules/emotes/emote_define.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index ba035b627fe..c09bc9625df 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -191,7 +191,10 @@ var/global/list/emotes_by_key if(sound_to_play) if(istype(user, /mob)) var/mob/u = user - playsound(user.loc, sound_to_play, use_sound["vol"], u.read_preference(/datum/preference/toggle/random_emote_pitch) && sound_vary, extrarange = use_sound["exr"], frequency = u.voice_freq, preference = sound_preferences, volume_channel = use_sound["volchannel"]) + var/freq_to_use = u.voice_freq + if(u.emote_sound_mode == EMOTE_SOUND_NO_FREQ) + freq_to_use = 0 + playsound(user.loc, sound_to_play, use_sound["vol"], u.read_preference(/datum/preference/toggle/random_emote_pitch) && sound_vary, extrarange = use_sound["exr"], frequency = freq_to_use, preference = sound_preferences, volume_channel = use_sound["volchannel"]) else playsound(user.loc, sound_to_play, use_sound["vol"], sound_vary, extrarange = use_sound["exr"], frequency = null, preference = sound_preferences, volume_channel = use_sound["volchannel"])