cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

We check emotes for clients

Browse Source
This commit is contained in:
Casey
2022-07-16 17:33:54 -04:00
committed by CHOMPStation2
parent 494be6adef
commit 2cbdeaa2aa
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/emotes/emote_mob.dm
View File

@@ -195,6 +195,12 @@
// Maybe some people are okay with that. // Maybe some people are okay with that.
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if(!T) return 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/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/m_viewers = in_range["mobs"]
var/list/o_viewers = in_range["objs"] var/list/o_viewers = in_range["objs"]