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

[MIRROR] fix observer tracking (#10460)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-19 05:54:55 -07:00
committed by GitHub
parent 7441b23621
commit 55123ab3d3
7 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/emotes/custom_emote.dm
View File

@@ -71,17 +71,21 @@
for(var/mob/M as anything in m_viewers)
if(M)
var/final_message = message
if(isobserver(M))
message = span_emote(span_bold("[src]") + " ([ghost_follow_link(src, M)]) [input]")
final_message = span_emote(span_bold("[src]") + " ([ghost_follow_link(src, M)]) [input]")
if(src.client && M && !(get_z(src) == get_z(M)))
message = span_multizsay("[message]")
final_message = span_multizsay("[final_message]")
// If you are in the same tile, right next to, or being held by a person doing an emote, you should be able to see it while blind
if(m_type != AUDIBLE_MESSAGE && (src.Adjacent(M) || (istype(src.loc, /obj/item/holder) && src.loc.loc == M)))
M.show_message(message)
M.show_message(final_message)
else
M.show_message(message, m_type)
M.show_message(final_message, m_type)
M.create_chat_message(src, "[runemessage]", FALSE, list("emote"), (m_type == AUDIBLE_MESSAGE))
for(var/obj/O as anything in o_viewers)
if(O)
O.see_emote(src, message, m_type)
var/final_message = message
if(src.client && O && !(get_z(src) == get_z(O)))
final_message = span_multizsay("[final_message]")
O.see_emote(src, final_message, m_type)