Merge branch 'master' into upstream-merge-13038

code/modules/emotes/definitions/audible.dm

@@ -183,6 +183,7 @@
 	key = "squish"
 	emote_sound = 'sound/effects/slime_squish.ogg' //Credit to DrMinky (freesound.org) for the sound.
 	emote_message_3p = "squishes."
+	sound_vary = FALSE
 
 /decl/emote/audible/warble
 	key = "warble"
@@ -211,6 +212,7 @@
 	emote_message_1p_target = "You chirp in surprise at TARGET!"
 	emote_message_3p_target = "chirps in surprise at TARGET!"
 	emote_sound = 'sound/voice/teshsqueak.ogg' // Copyright CC BY 3.0 InspectorJ (freesound.org) for the source audio.
+	sound_vary = FALSE
 
 /decl/emote/audible/teshchirp
 	key = "tchirp"

code/modules/emotes/definitions/audible_furry_vr.dm

@@ -34,6 +34,7 @@
     key = "chirp"
     emote_message_3p = "chirps!"
     emote_sound = 'sound/misc/nymphchirp.ogg'
+    sound_vary = FALSE
 /decl/emote/audible/hoot
     key = "hoot"
     emote_message_3p = "hoots!"
@@ -109,10 +110,12 @@
     key = "snort"
     emote_message_3p = "snorts!"
     emote_sound = 'sound/voice/Snort.ogg'
+    sound_vary = FALSE
 /decl/emote/audible/meow
     key = "meow"
     emote_message_3p = "gently meows!"
     emote_sound = 'sound/voice/Meow.ogg'
+    sound_vary = FALSE
 /decl/emote/audible/moo
     key = "moo"
     emote_message_3p = "takes a breath and lets out a moo."

code/modules/emotes/definitions/synthetics.dm

@@ -1,17 +1,18 @@
 /decl/emote/audible/synth
-	key = "beep"
-	emote_message_3p = "beeps."
-	emote_sound = 'sound/machines/twobeep.ogg'
+	key = "ping"
+	emote_message_3p = "pings."
+	emote_sound = 'sound/machines/ping.ogg'
 
 /decl/emote/audible/synth/mob_can_use(var/mob/living/user)
 	if(istype(user) && user.isSynthetic())
 		return ..()
 	return FALSE
 
-/decl/emote/audible/synth/ping
-	key = "ping"
-	emote_message_3p = "pings."
-	emote_sound = 'sound/machines/ping.ogg'
+/decl/emote/audible/synth/beep
+	key = "beep"
+	emote_message_3p = "beeps."
+	emote_sound = 'sound/machines/twobeep.ogg'
+	sound_vary = FALSE
 
 /decl/emote/audible/synth/buzz
 	key = "buzz"
@@ -54,3 +55,19 @@
 	emote_message_3p_target = "chirps happily at TARGET!"
 	emote_message_3p = "chirps happily."
 	emote_sound = 'sound/machines/dwoop.ogg'
+
+/decl/emote/audible/synth/boop
+	key = "roboboop"
+	emote_message_1p_target = "You boop at TARGET!"
+	emote_message_1p = "You boop."
+	emote_message_3p_target = "boops at TARGET!"
+	emote_message_3p = "boops."
+	emote_sound = 'sound/voice/roboboop.ogg'
+
+/decl/emote/audible/synth/robochirp
+	key = "robochirp"
+	emote_message_1p_target = "You chirp at TARGET!"
+	emote_message_1p = "You chirp."
+	emote_message_3p_target = "chirps at TARGET!"
+	emote_message_3p = "chirps."
+	emote_sound = 'sound/voice/robochirp.ogg'

code/modules/emotes/emote_define.dm

@@ -44,6 +44,7 @@ var/global/list/emotes_by_key
 	var/emote_range = 0                                 // If >0, restricts emote visibility to viewers within range.
 	
 	var/sound_preferences = list(/datum/client_preference/emote_noises) // Default emote sound_preferences is just emote_noises. Belch emote overrides this list for pref-checks.
+	var/sound_vary = TRUE
 
 /decl/emote/Initialize()
 	. = ..()
@@ -186,7 +187,7 @@ var/global/list/emotes_by_key
 		if(islist(sound_to_play) && length(sound_to_play))
 			sound_to_play = pick(sound_to_play)
 	if(sound_to_play)
-		playsound(user.loc, sound_to_play, use_sound["vol"], 0, preference = sound_preferences) //VOREStation Add - Preference
+		playsound(user.loc, sound_to_play, use_sound["vol"], sound_vary, frequency = null, preference = sound_preferences) //VOREStation Add - Preference
 
 /decl/emote/proc/mob_can_use(var/mob/user)
 	return istype(user) && user.stat != DEAD && (type in user.get_available_emotes())