From 2cbdeaa2aa80a311d7771e05ba9d55f3d842a4c5 Mon Sep 17 00:00:00 2001
From: Casey <a.roaming.shadow@gmail.com>
Date: Sat, 16 Jul 2022 17:33:54 -0400
Subject: [PATCH] We check emotes for clients

---
 code/modules/emotes/emote_mob.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index 03e30b0189..2d8ada5caf 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -195,6 +195,12 @@
 		// 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"]