From 79ab624eeadd76908cab730bf5a3056871a5e9f5 Mon Sep 17 00:00:00 2001 From: Byemoh Date: Wed, 4 Dec 2024 15:47:13 -0600 Subject: [PATCH] fix --- code/__DEFINES/misc.dm | 1 + code/__HELPERS/mobs.dm | 3 +++ .../modular_computers/file_system/programs/ntpda_msg.dm | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 03b586f933a8..795472e44f63 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -226,6 +226,7 @@ GLOBAL_LIST_INIT(donor_pdas, list(PDA_COLOR_NORMAL, PDA_COLOR_TRANSPARENT, PDA_C #define DEADCHAT_DEATHRATTLE "deathrattle" #define DEADCHAT_REGULAR "regular-deadchat" #define DEADCHAT_ANNOUNCEMENT "announcement" +#define DEADCHAT_PDA "pdamessage" // Bluespace shelter deploy checks #define SHELTER_DEPLOY_ALLOWED "allowed" diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index fe064a3bb285..76c14542b312 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -475,6 +475,9 @@ GLOBAL_LIST_EMPTY(species_list) if(DEADCHAT_ARRIVALRATTLE) if(prefs.toggles & DISABLE_ARRIVALRATTLE) continue + if(DEADCHAT_PDA) + if(prefs.chat_toggles & CHAT_GHOSTPDA) + continue if(isobserver(M)) var/rendered_message = message diff --git a/code/modules/modular_computers/file_system/programs/ntpda_msg.dm b/code/modules/modular_computers/file_system/programs/ntpda_msg.dm index 5dd70dea1827..42141c846bd0 100644 --- a/code/modules/modular_computers/file_system/programs/ntpda_msg.dm +++ b/code/modules/modular_computers/file_system/programs/ntpda_msg.dm @@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages) return FALSE // Show ghosts (and admins) - deadchat_broadcast(" sent an NTPDA Message ([username] --> [recipient.username]): [span_message(message)]", user, user, speaker_key = user.ckey) + deadchat_broadcast(" sent an NTPDA Message ([username] --> [recipient.username]): [span_message(message)]", user, user, speaker_key = user.ckey, message_type = DEADCHAT_PDA) computer.visible_message(span_notice("Message sent!"), null, null, 1) message_history += list(list(username, message, REF(src), signal)) return TRUE @@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages) return FALSE // Show ghosts (and admins) - deadchat_broadcast(" sent an NTPDA Message ([username] --> Everyone): [span_message(message)]", user, user, speaker_key = user.ckey) + deadchat_broadcast(" sent an NTPDA Message ([username] --> Everyone): [span_message(message)]", user, user, speaker_key = user.ckey, message_type = DEADCHAT_PDA) computer.visible_message(span_notice("Message sent!"), null, null, 1) message_history += list(list(username, message, REF(src), signal)) return TRUE