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

[MIRROR] next set of spans (#9247)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-17 16:33:07 -07:00
committed by GitHub
parent bc6662ef9e
commit 7416cbea22
599 changed files with 2619 additions and 2564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ var/global/list/emotes_by_key
if(target)
raw_3p = replace_target_tokens(raw_3p, target)
prefinal_3p = replace_user_tokens(raw_3p, user)
use_3p = span_emote("<b>\The [user]</b> [prefinal_3p]")
use_3p = span_emote(span_bold("\The [user]") + " [prefinal_3p]")
var/use_radio = get_radio_message(user)
if(use_radio)
if(target)
@@ -155,7 +155,7 @@ var/global/list/emotes_by_key
. = replacetext(., "TARGET_THEM", target_gender.him)
. = replacetext(., "TARGET_THEIR", target_gender.his)
. = replacetext(., "TARGET_SELF", target_gender.himself)
. = replacetext(., "TARGET", "<b>\the [target]</b>")
. = replacetext(., "TARGET", span_bold("\the [target]"))
/decl/emote/proc/replace_user_tokens(var/msg, var/atom/user)
. = msg
@@ -164,7 +164,7 @@ var/global/list/emotes_by_key
. = replacetext(., "USER_THEM", user_gender.him)
. = replacetext(., "USER_THEIR", user_gender.his)
. = replacetext(., "USER_SELF", user_gender.himself)
. = replacetext(., "USER", "<b>\the [user]</b>")
. = replacetext(., "USER", span_bold("\the [user]"))
/decl/emote/proc/get_radio_message(var/atom/user)
if(emote_message_radio_synthetic && check_synthetic(user))

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

@@ -45,7 +45,7 @@
if(emote_datum.mob_can_use(src))
usable_emotes[emote_datum.key] = emote_datum
last_emote_summary = english_list(sortAssoc(usable_emotes))
to_chat(src,"<b>Usable emotes:</b> [last_emote_summary].")
to_chat(src,span_bold("Usable emotes:") + " [last_emote_summary].")
return
if(!can_emote(m_type))
@@ -95,7 +95,7 @@
if(use_emote.message_type == AUDIBLE_MESSAGE && is_muzzled())
var/muffle_message = use_emote.emote_message_muffled || "makes a muffled sound."
audible_message("<b>\The [src]</b> [muffle_message]", runemessage = "[muffle_message]")
audible_message(span_bold("\The [src]") + " [muffle_message]", runemessage = "[muffle_message]")
return
next_emote = world.time + use_emote.emote_delay
@@ -158,7 +158,7 @@
nametext = html_encode(nametext)
subtext = html_encode(subtext)
// Store the player's name in a nice bold, naturalement
nametext = "<B>[emoter]</B>"
nametext = span_bold("[emoter]")
return list("pretext" = pretext, "nametext" = nametext, "subtext" = subtext)
/mob/proc/custom_emote(var/m_type = VISIBLE_MESSAGE, var/message, var/range = world.view)
@@ -189,9 +189,9 @@
if(input)
log_emote(message,src) //Log before we add junk
if(usr && usr.client)
message = span_emote("<B>[src]</B> [input]")
message = span_emote(span_bold("[src]") + " [input]")
else
message = span_npc_emote("<B>[src]</B> [input]")
message = span_npc_emote(span_bold("[src]") + " [input]")
else
return
@@ -223,7 +223,7 @@
spawn(0) // It's possible that it could be deleted in the meantime, or that it runtimes.
if(M)
if(isobserver(M))
message = span_emote("<B>[src]</B> ([ghost_follow_link(src, M)]) [input]")
message = span_emote(span_bold("[src]") + " ([ghost_follow_link(src, M)]) [input]")
if(usr && usr.client && M && !(get_z(usr) == get_z(M)))
message = span_multizsay("[message]")
//CHOMPEdit Start - 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