Merge branch 'master' into upstream-merge-13339

code/modules/emotes/emote_mob.dm

@@ -191,16 +191,21 @@
 	if(message)
 		message = encode_html_emphasis(message)
 
+		var/ourfreq = null
+		if(isliving(src))
+			var/mob/living/L = src
+			if(L.voice_freq > 0 )
+				ourfreq = L.voice_freq
+
+
 		// Hearing gasp and such every five seconds is not good emotes were not global for a reason.
 		// Maybe some people are okay with that.
 		var/turf/T = get_turf(src)
+
 		if(!T) return
-<<<<<<< HEAD
-=======
+
 		if(client)
 			playsound(T, pick(emote_sound), 25, TRUE, falloff = 1 , is_global = TRUE, frequency = ourfreq, ignore_walls = FALSE, preference = /datum/client_preference/emote_sounds)
-
->>>>>>> 26ae8528a9... Merge pull request #13339 from Very-Soft/saysound
 		var/list/in_range = get_mobs_and_objs_in_view_fast(T,range,2,remote_ghosts = client ? TRUE : FALSE)
 		var/list/m_viewers = in_range["mobs"]
 		var/list/o_viewers = in_range["objs"]