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

[MIRROR] refactors most spans (#9139)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-04 06:00:17 -07:00
committed by GitHub
parent 43ee646816
commit ab154b48b2
1511 changed files with 12497 additions and 12357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@ var/global/list/emotes_by_key
if(use_1p)
if(target)
use_1p = replace_target_tokens(use_1p, target)
use_1p = "<span class='emote'>[capitalize(replace_user_tokens(use_1p, user))]</span>"
use_1p = span_emote("[capitalize(replace_user_tokens(use_1p, user))]")
var/prefinal_3p
var/use_3p
var/raw_3p = get_emote_message_3p(user, target, extra_params)
@@ -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 class='emote'><b>\The [user]</b> [prefinal_3p]</span>"
use_3p = span_emote("<b>\The [user]</b> [prefinal_3p]")
var/use_radio = get_radio_message(user)
if(use_radio)
if(target)

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

@@ -21,7 +21,7 @@
if(usr == src) //client-called emote
if (client && (client.prefs.muted & MUTE_IC))
to_chat(src, "<span class='warning'>You cannot send IC messages (muted).</span>")
to_chat(src, span_warning("You cannot send IC messages (muted)."))
return
if(world.time < next_emote)
@@ -189,9 +189,9 @@
if(input)
log_emote(message,src) //Log before we add junk
if(usr && usr.client)
message = "<span class='emote'><B>[src]</B> [input]</span>"
message = span_emote("<B>[src]</B> [input]")
else
message = "<span class='npcemote'><B>[src]</B> [input]</span>"
message = span_npc_emote("<B>[src]</B> [input]")
else
return
@@ -223,9 +223,9 @@
spawn(0) // It's possible that it could be deleted in the meantime, or that it runtimes.
if(M)
if(isobserver(M))
message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
message = span_emote("<B>[src]</B> ([ghost_follow_link(src, M)]) [input]")
if(usr && usr.client && M && !(get_z(usr) == get_z(M)))
message = "<span class='multizsay'>[message]</span>"
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
if(m_type != AUDIBLE_MESSAGE && (src.Adjacent(M) || (istype(src.loc, /obj/item/holder) && src.loc.loc == M)))
M.show_message(message)