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

Putting additional span srt_deadchat to deadsay for chat sorting #10899

Closed
wants to merge 4 commits into from
Closed

Putting additional span srt_deadchat to deadsay for chat sorting #10899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d6b1a1
deadchat fixes
EvilDragonfiend Apr 17, 2024
900d8e7
improves proc
EvilDragonfiend Apr 17, 2024
a878e74
Revert proc change. A bit unrelated
EvilDragonfiend Apr 18, 2024
f70f088
Oopsie
EvilDragonfiend Apr 18, 2024
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
2 changes: 1 addition & 1 deletion code/__HELPERS/game.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
if(QDELETED(character) || !SSticker.IsRoundInProgress())
return
var/area/A = get_area(character)
var/message = "<span class='game deadsay'><span class='name'>\
var/message = "<span class='srt_deadchat game deadsay'><span class='name'>\
[character.real_name]</span> ([rank]) has arrived at the station at \
<span class='name'>[A.name]</span>.</span>"
deadchat_broadcast(message, follow_target = character, message_type=DEADCHAT_ARRIVALRATTLE)
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/shuttle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ SUBSYSTEM_DEF(shuttle)
log_game("[user ? key_name(user) : "An automated system"] has called the shuttle.")
if(user)
var/area/A = get_area(user)
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.real_name]</span> has called the shuttle at <span class='name'>[A.name]</span>.</span>", user)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[user.real_name]</span> has called the shuttle at <span class='name'>[A.name]</span>.</span>", user)
if(call_reason)
SSblackbox.record_feedback("text", "shuttle_reason", 1, "[call_reason]")
log_game("Shuttle call reason: [call_reason]")
Expand Down Expand Up @@ -269,7 +269,7 @@ SUBSYSTEM_DEF(shuttle)
emergency.cancel(get_area(user))
log_game("[key_name(user)] has recalled the shuttle.")
message_admins("[ADMIN_LOOKUPFLW(user)] has recalled the shuttle.")
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.real_name]</span> has recalled the shuttle from <span class='name'>[get_area_name(user, TRUE)]</span>.</span>", user)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[user.real_name]</span> has recalled the shuttle from <span class='name'>[get_area_name(user, TRUE)]</span>.</span>", user)
return 1

/datum/controller/subsystem/shuttle/proc/canRecall()
Expand Down
4 changes: 2 additions & 2 deletions code/datums/components/deadchat_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
var/result = count_democracy_votes()
if(!isnull(result))
inputs[result].Invoke()
var/message = "<span class='deadsay italics bold'>[parent] has done action [result]!<br>New vote started. It will end in [input_cooldown/10] seconds.</span>"
var/message = "<span class='srt_deadchat deadsay italics bold'>[parent] has done action [result]!<br>New vote started. It will end in [input_cooldown/10] seconds.</span>"
for(var/M in orbiters)
to_chat(M, message)
else
var/message = "<span class='deadsay italics bold'>No votes were cast this cycle.</span>"
var/message = "<span class='srt_deadchat deadsay italics bold'>No votes were cast this cycle.</span>"
for(var/M in orbiters)
to_chat(M, message)

Expand Down
12 changes: 6 additions & 6 deletions code/game/machinery/computer/communications.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
// Only notify people if an actual change happened
log_game("[key_name(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].")
message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].")
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.real_name]</span> has changed the security level to [params["newSecurityLevel"]] with [src] at <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", usr)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[usr.real_name]</span> has changed the security level to [params["newSecurityLevel"]] with [src] at <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", usr)

alert_level_tick += 1
. = TRUE
Expand Down Expand Up @@ -174,7 +174,7 @@

var/associates = emagged ? "the Syndicate": "CentCom"
usr.log_talk(message, LOG_SAY, tag = "message to [associates]")
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.real_name]</span> has messaged [associates], \"[message]\" at <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", usr)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[usr.real_name]</span> has messaged [associates], \"[message]\" at <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", usr)
COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN)
. = TRUE
if ("purchaseShuttle")
Expand Down Expand Up @@ -253,7 +253,7 @@
minor_announce(message, title = "Outgoing message to allied station", html_encode = FALSE)
usr.log_talk(message, LOG_SAY, tag="message to the other server")
message_admins("[ADMIN_LOOKUPFLW(usr)] has sent a message to the other server.")
deadchat_broadcast("<span class='deadsay bold'>[usr.real_name] has sent an outgoing message to the other station(s).</span>", usr)
deadchat_broadcast("<span class='srt_deadchat deadsay bold'>[usr.real_name] has sent an outgoing message to the other station(s).</span>", usr)

COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN)
. = TRUE
Expand Down Expand Up @@ -322,12 +322,12 @@
revoke_maint_all_access()
log_game("[key_name(usr)] disabled emergency maintenance access.")
message_admins("[ADMIN_LOOKUPFLW(usr)] disabled emergency maintenance access.")
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.real_name]</span> disabled emergency maintenance access at <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", usr)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[usr.real_name]</span> disabled emergency maintenance access at <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", usr)
else
make_maint_all_access()
log_game("[key_name(usr)] enabled emergency maintenance access.")
message_admins("[ADMIN_LOOKUPFLW(usr)] enabled emergency maintenance access.")
deadchat_broadcast("<span class='deadsay'><span class='name'>[usr.real_name]</span> enabled emergency maintenance access at <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", usr)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[usr.real_name]</span> enabled emergency maintenance access at <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", usr)

/obj/machinery/computer/communications/ui_data(mob/user)
var/list/data = list(
Expand Down Expand Up @@ -499,7 +499,7 @@
to_chat(user, "<span class='warning'>You cannot send an announcement that contains prohibited words.</span>")
return
SScommunications.make_announcement(user, is_ai, input)
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.real_name]</span> made a priority announcement from <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", user)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[user.real_name]</span> made a priority announcement from <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", user)

/obj/machinery/computer/communications/proc/post_status(command, data1, data2)

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/AI_modules.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ AI MODULES
log_law("[user.key]/[user.name] used [src.name] on [aikey]/([ainame]) from [AREACOORD(user)].[law2log ? " The law specified [law2log]" : ""] , [length(affected_cyborgs) ? ", impacting synced borgs [borg_txt]" : "FALSE"]")
message_admins("[ADMIN_LOOKUPFLW(user)] used [src.name] on [ADMIN_LOOKUPFLW(law_datum.owner)] from [AREACOORD(user)].[law2log ? " The law specified [law2log]" : ""] , [length(affected_cyborgs) ? ", impacting synced borgs [borg_flw]" : "FALSE"]")
if(law_datum.owner)
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.name]</span> changed <span class='name'>[ainame]</span>'s laws at <b>[get_area_name(user, TRUE)].</b></span>", "<span class='name'>[user]</span>", follow_target=user, message_type=DEADCHAT_LAWCHANGE)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[user.name]</span> changed <span class='name'>[ainame]</span>'s laws at <b>[get_area_name(user, TRUE)].</b></span>", "<span class='name'>[user]</span>", follow_target=user, message_type=DEADCHAT_LAWCHANGE)

//The proc that actually changes the silicon's laws.
/obj/item/aiModule/proc/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow = FALSE)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/crab17.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
crab_account.bank_card_talk("You have stolen [total_credits_stolen] credits, and the machine is located at [get_area(src)].")
for(var/M in GLOB.dead_mob_list)
var/link = FOLLOW_LINK(M, src)
to_chat(M, "<span class='deadsay'>[link] [name] [total_credits_stolen ? "siphons total [total_credits_stolen] credits from [victim_count] bank accounts." : "tried to siphon bank accounts, but there're no victims."] location: [get_area(src)]</span>")
to_chat(M, "<span class='srt_deadchat deadsay'>[link] [name] [total_credits_stolen ? "siphons total [total_credits_stolen] credits from [victim_count] bank accounts." : "tried to siphon bank accounts, but there're no victims."] location: [get_area(src)]</span>")

if(obj_integrity>25)
next_health_to_teleport -= round(max_integrity/60)
Expand Down Expand Up @@ -264,7 +264,7 @@
bogdanoff = user
addtimer(CALLBACK(src, PROC_REF(startLaunch)), 100)
sound_to_playing_players('sound/items/dump_it.ogg', 20)
deadchat_broadcast("<span class='deadsay'>Protocol CRAB-17 has been activated. A space-coin market has been launched at the station!</span>", turf_target = get_turf(src))
deadchat_broadcast("<span class='srt_deadchat deadsay'>Protocol CRAB-17 has been activated. A space-coin market has been launched at the station!</span>", turf_target = get_turf(src))

/obj/effect/dumpeetTarget/proc/startLaunch()
DF = new /obj/effect/dumpeetFall(drop_location())
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/ai_core.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
if(brain.force_replace_ai_name)
A.fully_replace_character_name(A.name, brain.replacement_ai_name())
SSblackbox.record_feedback("amount", "ais_created", 1)
deadchat_broadcast("<span class='deadsay'><span class='name'>[A]</span> has been brought online at <b>[get_area_name(A, TRUE)]</b></span>.", "<span class='name'>[A]</span>", follow_target=A)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[A]</span> has been brought online at <b>[get_area_name(A, TRUE)]</b></span>.", "<span class='name'>[A]</span>", follow_target=A)
qdel(src)
else
state = AI_READY_CORE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/deadsay.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
if(holder.fakekey)
rank_name = pick(strings(DSAY_NICKNAME_FILE, "ranks", CONFIG_DIRECTORY))
admin_name = pick(strings(DSAY_NICKNAME_FILE, "names", CONFIG_DIRECTORY))
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[rank_name]([admin_name])</span> says, <span class='message'>\"[emoji_parse(msg)]\"</span></span>"
var/rendered = "<span class='srt_deadchat game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[rank_name]([admin_name])</span> says, <span class='message'>\"[emoji_parse(msg)]\"</span></span>"
send_chat_to_discord(CHAT_TYPE_DEADCHAT, "[rank_name]([admin_name])", msg)

for (var/mob/M in GLOB.player_list)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/abductor/equipment/abduction_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@
for(var/mob/dead/observer/ghost in GLOB.dead_mob_list)
var/sender = FOLLOW_LINK(ghost, user)
var/receiver = FOLLOW_LINK(ghost, L)
to_chat(ghost, "<span class='deadsay'>[sender] <span class='name'>[user]</span> <span class='abductor'>Abductor Mental Telepathy</span> -> [receiver] <span class='name'>[L]</span>: <span class='bold message'>[message]</span></span>")
to_chat(ghost, "<span class='srt_deadchat deadsay'>[sender] <span class='name'>[user]</span> <span class='abductor'>Abductor Mental Telepathy</span> -> [receiver] <span class='name'>[L]</span>: <span class='bold message'>[message]</span></span>")
log_directed_talk(user, L, message, LOG_SAY, "abductor whisper")


Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/abductor/equipment/gland.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
to_chat(owner, "<span class='mind_control'>[command]</span>")
active_mind_control = TRUE
log_admin("[key_name(user)] sent an abductor mind control message to [key_name(owner)]: [command]")
deadchat_broadcast("<span class='deadsay'><span class='name'>[user]</span> sent an abductor mind control message to <span class='name'>[owner]</span>: <span class='bold message'>[command]</span></span>", follow_target = owner, turf_target = get_turf(owner), message_type = DEADCHAT_REGULAR)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[user]</span> sent an abductor mind control message to <span class='name'>[owner]</span>: <span class='bold message'>[command]</span></span>", follow_target = owner, turf_target = get_turf(owner), message_type = DEADCHAT_REGULAR)
update_gland_hud()
var/atom/movable/screen/alert/mind_control/mind_alert = owner.throw_alert("mind_control", /atom/movable/screen/alert/mind_control)
mind_alert.command = command
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/brainwashing/brainwashing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
victim_mind.add_antag_datum(brainwash)

var/source_message = source ? " by [source]" : ""
var/begin_message = "<span class='deadsay'><b>[victim]</b> has been brainwashed with the following objective[length(directives) > 1 ? "s" : ""][source_message]: "
var/begin_message = "<span class='srt_deadchat deadsay'><b>[victim]</b> has been brainwashed with the following objective[length(directives) > 1 ? "s" : ""][source_message]: "
var/obj_message = english_list(directives)
var/end_message = "</b>.</span>"
var/rendered = begin_message + obj_message + end_message
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/devil/true_devil/_true_devil.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

//Damaged
if(stat == DEAD)
. += "<span class='deadsay'>The hellfire seems to have been extinguished, for now at least.</span>"
. += "<span class='srt_deadchat deadsay'>The hellfire seems to have been extinguished, for now at least.</span>"
else if(health < (maxHealth/10))
. += "<span class='warning'>You can see hellfire inside its gaping wounds.</span>"
else if(health < (maxHealth/2))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/hypnotization/hypnotized.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
B.objectives += objective
log_objective(M, objective.explanation_text)
M.add_antag_datum(B)
var/rendered = "<span class='deadsay'><b>[victim]</b> has been hypnotized with the following phrase: <b>[hypnotic_phrase]</b>.</span>"
var/rendered = "<span class='srt_deadchat deadsay'><b>[victim]</b> has been hypnotized with the following phrase: <b>[hypnotic_phrase]</b>.</span>"
deadchat_broadcast(rendered, follow_target = victim, turf_target = get_turf(victim), message_type=DEADCHAT_REGULAR)
victim.log_message(rendered, LOG_ATTACK, color="red")

Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/revenant/revenant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@

/mob/living/simple_animal/revenant/Login()
..()
to_chat(src, "<span class='deadsay'><span class='big bold'>You are a revenant.</span></span>")
to_chat(src, "<span class='revenboldnotice'><span class='big bold'>You are a revenant.</span></span>")
to_chat(src, "<b>Your formerly mundane spirit has been infused with alien energies and empowered into a revenant.</b>")
to_chat(src, "<b>You are not dead, not alive, but somewhere in between. You are capable of limited interaction with both worlds.</b>")
to_chat(src, "<b>You are invincible and invisible to everyone but other ghosts. Most abilities will reveal you, rendering you vulnerable.</b>")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/awaymissions/super_secret_room.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@

/obj/structure/speaking_tile/proc/SpeakPeace(list/statements)
for(var/i in 1 to statements.len)
say("<span class='deadsay'>[statements[i]]</span>")
say("<span class='srt_deadchat deadsay'>[statements[i]]</span>")
if(i != statements.len)
sleep(30)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/centcom_podlauncher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@
else
return //if target is null and we don't have a specific target, cancel
if (effectAnnounce)
deadchat_broadcast("<span class='deadsay'>A special package is being launched at the station!</span>", turf_target = target_turf)
deadchat_broadcast("<span class='srt_deadchat deadsay'>A special package is being launched at the station!</span>", turf_target = target_turf)

if (!effectBurst) //If we're not using burst mode, just launch normally.
launch(target_turf)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/_event.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
if(random)
log_game("Random Event triggering: [name] ([typepath])")
if (alert_observers)
deadchat_broadcast("<span class='deadsay'><b>[name]</b> has just been triggered!</span>") //STOP ASSUMING IT'S BADMINS!
deadchat_broadcast("<span class='srt_deadchat deadsay'><b>[name]</b> has just been triggered!</span>") //STOP ASSUMING IT'S BADMINS!
return E

//Special admins setup
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/special_antag_event.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
if(random)
log_game("Random Event triggering: [name] ([typepath])")
if (alert_observers)
deadchat_broadcast("<span class='deadsay'><b>[name]</b> has just been triggered!</span>")
deadchat_broadcast("<span class='srt_deadchat deadsay'><b>[name]</b> has just been triggered!</span>")
return E

////////////////////////////////
Expand Down
2 changes: 2 additions & 0 deletions code/modules/flufftext/Hallucination.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,6 +1166,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.set_screwyhud(SCREWYHUD_DEAD)
target.Paralyze(300)
target.silent += 10
// not real deadchat. don't use span class: srt_deadchat
to_chat(target, "<span class='deadsay'><b>[target.real_name]</b> has died at <b>[get_area_name(target)]</b>.</span>")
if(prob(50))
var/mob/fakemob
Expand All @@ -1178,6 +1179,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
fakemob = target //ever been so lonely you had to haunt yourself?
if(fakemob)
sleep(rand(20, 50))
// not real deadchat. don't use span class: srt_deadchat
to_chat(target, "<span class='deadsay'><b>DEAD: [fakemob.name]</b> says, \"[pick("rip","why did i just drop dead?","hey [target.first_name()]","git gud","you too?","is the AI rogue?",\
"i[prob(50)?" fucking":""] hate [pick("blood cult", "clock cult", "revenants", "this round","this","myself","admins","you")]")]\"</span>")
sleep(rand(70,90))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food_and_drinks/pizzabox.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
/obj/item/pizzabox/infinite/examine(mob/user)
. = ..()
if(isobserver(user))
. += "<span class='deadsay'>This pizza box is anomalous, and will produce infinite pizza.</span>"
. += "<span class='srt_deadchat deadsay'>This pizza box is anomalous, and will produce infinite pizza.</span>"

/obj/item/pizzabox/infinite/attack_self(mob/living/user)
QDEL_NULL(pizza)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/dead/observer/observer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/pointed(atom/A as mob|obj|turf in view())
if(!..())
return 0
usr.visible_message("<span class='deadsay'><b>[src]</b> points to [A].</span>")
usr.visible_message("<span class='srt_deadchat deadsay'><b>[src]</b> points to [A].</span>")
return 1

/mob/dead/observer/verb/view_manifest()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/death.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
I.on_mob_death(src, gibbed)
if(mind)
if(mind.name && mind.active && !istype(T.loc, /area/ctf))
var/rendered = "<span class='deadsay'><b>[mind.name]</b> has died at <b>[get_area_name(T)]</b>.</span>"
var/rendered = "<span class='srt_deadchat deadsay'><b>[mind.name]</b> has died at <b>[get_area_name(T)]</b>.</span>"
deadchat_broadcast(rendered, follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE)
mind.store_memory("Time of death: [tod]", 0)
remove_from_alive_mob_list()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/laws.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/mob/living/silicon/proc/deadchat_lawchange()
var/list/the_laws = laws.get_law_list(include_zeroth = TRUE)
var/lawtext = the_laws.Join("<br/>")
deadchat_broadcast("<span class='deadsay'><span class='name'>[src]</span>'s laws were changed.</span> <a href='?src=[REF(src)]&printlawtext=[rustg_url_encode(lawtext)]'>View</a>", "<span class='name'>[src]</span>", follow_target=src, message_type=DEADCHAT_LAWCHANGE)
deadchat_broadcast("<span class='srt_deadchat deadsay'><span class='name'>[src]</span>'s laws were changed.</span> <a href='?src=[REF(src)]&printlawtext=[rustg_url_encode(lawtext)]'>View</a>", "<span class='name'>[src]</span>", follow_target=src, message_type=DEADCHAT_LAWCHANGE)

/mob/living/silicon/proc/post_lawchange(announce = TRUE)
throw_alert("newlaw", /atom/movable/screen/alert/newlaw)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/say.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
to_chat(usr, "<span class='warning'>Your message contains forbidden words.</span>")
return
var/spanned = say_quote(say_emphasis(message))
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] <span class='message'>[emoji_parse(spanned)]</span></span>"
var/rendered = "<span class='srt_deadchat game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] <span class='message'>[emoji_parse(spanned)]</span></span>"
send_chat_to_discord(CHAT_TYPE_DEADCHAT, name, spanned)
log_talk(message, LOG_SAY, tag="DEAD")
if(SEND_SIGNAL(src, COMSIG_MOB_DEADSAY, message) & MOB_DEADSAY_SIGNAL_INTERCEPT)
Expand Down
Loading
Loading