cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix (#22833)

Browse Source
This commit is contained in:
Byemoh
2024-12-07 23:18:29 -06:00
committed by GitHub
parent cf2c8f781e
commit b1b3677f08
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__DEFINES/misc.dm
View File

@@ -226,6 +226,7 @@ GLOBAL_LIST_INIT(donor_pdas, list(PDA_COLOR_NORMAL, PDA_COLOR_TRANSPARENT, PDA_C
#define DEADCHAT_DEATHRATTLE "deathrattle" #define DEADCHAT_DEATHRATTLE "deathrattle"
#define DEADCHAT_REGULAR "regular-deadchat" #define DEADCHAT_REGULAR "regular-deadchat"
#define DEADCHAT_ANNOUNCEMENT "announcement" #define DEADCHAT_ANNOUNCEMENT "announcement"
#define DEADCHAT_PDA "pdamessage"
// Bluespace shelter deploy checks // Bluespace shelter deploy checks
#define SHELTER_DEPLOY_ALLOWED "allowed" #define SHELTER_DEPLOY_ALLOWED "allowed"

3
code/__HELPERS/mobs.dm
View File

@@ -449,6 +449,9 @@ GLOBAL_LIST_EMPTY(species_list)
if(DEADCHAT_ARRIVALRATTLE) if(DEADCHAT_ARRIVALRATTLE)
if(prefs.toggles & DISABLE_ARRIVALRATTLE) if(prefs.toggles & DISABLE_ARRIVALRATTLE)
continue continue
if(DEADCHAT_PDA)
if(prefs.chat_toggles & CHAT_GHOSTPDA)
continue
if(isobserver(M)) if(isobserver(M))
var/rendered_message = message var/rendered_message = message

4
code/modules/modular_computers/file_system/programs/ntpda_msg.dm
View File

@@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages)
return FALSE return FALSE
// Show ghosts (and admins) // Show ghosts (and admins)
deadchat_broadcast(" sent an <b>NTPDA Message</b> ([username] --> [recipient.username]): [span_message(message)]", user, user, speaker_key = user.ckey) deadchat_broadcast(" sent an <b>NTPDA Message</b> ([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) computer.visible_message(span_notice("Message sent!"), null, null, 1)
message_history += list(list(username, message, REF(src), signal)) message_history += list(list(username, message, REF(src), signal))
return TRUE return TRUE
@@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages)
return FALSE return FALSE
// Show ghosts (and admins) // Show ghosts (and admins)
deadchat_broadcast(" sent an <b>NTPDA Message</b> ([username] --> <b>Everyone</b>): [span_message(message)]", user, user, speaker_key = user.ckey) deadchat_broadcast(" sent an <b>NTPDA Message</b> ([username] --> <b>Everyone</b>): [span_message(message)]", user, user, speaker_key = user.ckey, message_type = DEADCHAT_PDA)
computer.visible_message(span_notice("Message sent!"), null, null, 1) computer.visible_message(span_notice("Message sent!"), null, null, 1)
message_history += list(list(username, message, REF(src), signal)) message_history += list(list(username, message, REF(src), signal))
return TRUE return TRUE