Merge pull request #13704 from Putnam3145/make-emotes-local

Makes emotes show up in the "local" filter with TGUI
This commit is contained in:
silicons
2020-12-09 21:47:06 -07:00
committed by GitHub
5 changed files with 6 additions and 11 deletions
+1 -1
View File
@@ -55,7 +55,7 @@
return
user.log_message(msg, LOG_EMOTE)
msg = "<b>[user]</b> " + msg
msg = "<span class='emote'><b>[user]</b> [msg]</span>"
for(var/mob/M in GLOB.dead_mob_list)
if(!M.client || isnewplayer(M))
+2 -2
View File
@@ -51,7 +51,7 @@ proc/get_top_level_mob(var/mob/S)
return FALSE
user.log_message(message, LOG_EMOTE)
message = "<b>[user]</b> " + "<i>[user.say_emphasis(message)]</i>"
message = "<span class='emote'><b>[user]</b> <i>[user.say_emphasis(message)]</i></span>"
for(var/mob/M in GLOB.dead_mob_list)
if(!M.client || isnewplayer(M))
@@ -107,7 +107,7 @@ proc/get_top_level_mob(var/mob/S)
return FALSE
user.log_message(message, LOG_SUBTLER)
message = "<b>[user]</b> " + "<i>[user.say_emphasis(message)]</i>"
message = "<span class='emote'><b>[user]</b> <i>[user.say_emphasis(message)]</i></span>"
user.visible_message(message = message, self_message = message, vision_distance = 1, ignored_mobs = GLOB.dead_mob_list, omni = TRUE)
@@ -255,7 +255,7 @@ a.popt {
/* ADD HERE FOR ITALIC */
.italic, .italics, .emote {
.italic, .italics {
font-style: italic;
}
@@ -273,8 +273,7 @@ a.popt {
.italic,
.italics,
.emote {
.italics {
font-style: italic;
}
@@ -443,10 +442,6 @@ h1.alert, h2.alert {
color: #000000;
}
.emote {
font-style: italic;
}
.userdanger {
color: #ff0000;
font-weight: bold;
File diff suppressed because one or more lines are too long