From 421d7d8286239122861465982491e5797eac4bea Mon Sep 17 00:00:00 2001 From: Spaghetti-bit Date: Sun, 7 Jul 2024 06:06:24 -0700 Subject: [PATCH] Emotes now vary in frequency when they are not age based. (#26171) --- code/datums/emote.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/emote.dm b/code/datums/emote.dm index a25d7469b29..dee076571a8 100644 --- a/code/datums/emote.dm +++ b/code/datums/emote.dm @@ -275,12 +275,12 @@ // Vary needs to be true as otherwise frequency changes get ignored deep within playsound_local :( playsound(user.loc, sound_path, sound_volume, TRUE, frequency = H.get_age_pitch(H.dna.species.max_age) * alter_emote_pitch(user)) else - playsound(user.loc, sound_path, sound_volume, TRUE, frequency = alter_emote_pitch(user)) + playsound(user.loc, sound_path, sound_volume, TRUE, frequency = alter_emote_pitch(user, FALSE)) -/datum/emote/proc/alter_emote_pitch(mob/user) +/datum/emote/proc/alter_emote_pitch(mob/user, multiplicative = TRUE) if(HAS_TRAIT(user, TRAIT_I_WANT_BRAINS)) return 0.7 - return 1 + return multiplicative /** * Send an emote to runechat for all (listening) users in the vicinity.