From 23abc88065aea974678a660a88dde12e18aa1a5d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 15 Aug 2023 01:07:00 +0200 Subject: [PATCH] [MIRROR] Fixes the formatting for ghost PDA messages [MDB IGNORE] (#23079) * Fixes the formatting for ghost PDA messages (#77590) ## About The Pull Request It was in all bold, now it no longer is. It also was only being displayed to dedicated observers, which means that it didn't show to players that died and ghosted out. ![image](https://github.com/tgstation/tgstation/assets/58045821/8f00197e-1911-461f-a819-7debb0f622e2) ## Why It's Good For The Game It's just much nicer, and looks like it used to look before, rather than being entirely bold. ## Changelog :cl: GoldenAlpharex fix: The formatting on PDA messages displayed to observers is now back to what it used to be, rather than being all bold. fix: PDA messages are now displayed to observers from dead players, and not just dedicated observers. /:cl: --------- Co-authored-by: distributivgesetz * Fixes the formatting for ghost PDA messages --------- Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Co-authored-by: distributivgesetz --- code/__DEFINES/span.dm | 2 ++ .../file_system/programs/messenger/messenger_program.dm | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index 2e237ce94ae..22cf26e19a5 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -43,6 +43,7 @@ #define span_drone(str) ("" + str + "") #define span_engradio(str) ("" + str + "") #define span_extremelybig(str) ("" + str + "") +#define span_game_say(str) ("" + str + "") #define span_ghostalert(str) ("" + str + "") #define span_green(str) ("" + str + "") #define span_greenannounce(str) ("" + str + "") @@ -69,6 +70,7 @@ #define span_medradio(str) ("" + str + "") #define span_memo(str) ("" + str + "") #define span_memoedit(str) ("" + str + "") +#define span_message(str) ("" + str + "") #define span_mind_control(str) ("" + str + "") #define span_minorannounce(str) ("" + str + "") #define span_monkey(str) ("" + str + "") diff --git a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm index 36a5b4c0fad..f9b3b41373c 100644 --- a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm +++ b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm @@ -612,8 +612,9 @@ message = emoji_parse(message) //already sent- this just shows the sent emoji as one to the sender in the to_chat // Show it to ghosts - var/ghost_message = span_name("[sender] [rigged ? "(as [fake_name]) Rigged " : ""]PDA Message --> [span_name("[signal.format_target()]")]: \"[signal.format_message()]\"") - for(var/mob/player_mob as anything in GLOB.current_observers_list) + var/ghost_message = span_game_say("[span_name("[sender]")] [rigged ? "(as [span_name(fake_name)]) Rigged " : ""]PDA Message --> [span_name("[signal.format_target()]")]: \"[signal.format_message()]\"") + var/list/ghosts = GLOB.dead_player_list + GLOB.current_observers_list + for(var/mob/player_mob as anything in ghosts) if(player_mob.client && !player_mob.client?.prefs) stack_trace("[player_mob] ([player_mob.ckey]) had null prefs, which shouldn't be possible!") continue