Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ports cases fix to cb emotes #43

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Ports cases fix to cb emotes #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions code/modules/mob/mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@
//This entire if/else chain could be in two lines but isn't for readabilty's sake.
var/blind = M.is_blind()
var/msg = message
if(M == src)
msg = self_message
else if(M.see_invisible<invisibility || (T != loc && T != src) || blind)//if src is invisible to us or is inside something (and isn't a turf),
//if(M == src)
//msg = self_message
if(M.see_invisible<invisibility || (T != loc && T != src) || blind)//if src is invisible to us or is inside something (and isn't a turf),
msg = blind_message

if(visible_message_flags & EMOTE_MESSAGE && runechat_prefs_check(M, visible_message_flags)) // blind people can see emotes, sorta
Expand Down Expand Up @@ -266,9 +266,9 @@
if(pref_check && !CHECK_PREFS(M, pref_check))
continue
var/msg = message
if(M == src)
msg = self_message
else if(!M.can_hear())
//if(M == src)
//msg = self_message
if(!M.can_hear())
msg = deaf_message
if(M.client?.prefs.color_chat_log)
var/sanitizedsaycolor = M.client.sanitize_chat_color(saycolor)
Expand Down
Loading