Skip to content

Commit

Permalink
fix (#22833)
Browse files Browse the repository at this point in the history
  • Loading branch information
ToasterBiome authored Dec 8, 2024
1 parent cf2c8f7 commit b1b3677
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions code/__HELPERS/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages)
return FALSE

// 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)
message_history += list(list(username, message, REF(src), signal))
return TRUE
Expand Down Expand Up @@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(NTPDAMessages)
return FALSE

// 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)
message_history += list(list(username, message, REF(src), signal))
return TRUE
Expand Down

0 comments on commit b1b3677

Please sign in to comment.