cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 01:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-24-10b

Browse Source
This commit is contained in:
Waterpig
2024-10-25 23:27:13 +02:00
committed by GitHub
parent 138be45f92 2c9d438889
commit 668cfb918b
17 changed files with 68 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm
+12 -3
View File
@@ -665,10 +665,13 @@
to_chat(listener, "[FOLLOW_LINK(listener, source)] [ghost_message]")
// Log to public log
log_public_file(public_message)
// BUBBER EDIT CHANGE END
if(sender)
to_chat(sender, span_info("PDA message sent to [signal.format_target()]: \"[message]\""))
if(subtle)
to_chat(sender, span_subtlepda("Subtle PDA message sent to [signal.format_target()]: \"[message]\""))
else
to_chat(sender, span_info("PDA message sent to [signal.format_target()]: \"[message]\""))
// BUBBER EDIT CHANGE END
if (alert_able && !alert_silenced)
computer.send_sound()
@@ -688,6 +691,7 @@
var/is_fake_user = is_rigged || is_automated || isnull(signal.data["ref"])
var/fake_name = is_fake_user ? signal.data["fakename"] : null
var/fake_job = is_fake_user ? signal.data["fakejob"] : null
var/is_subtle = signal.data["subtle"] // BUBBER EDIT ADDITION - SUBTLE MESSAGES
var/sender_ref = signal.data["ref"]
@@ -739,7 +743,12 @@
var/inbound_message = "[signal.format_message()]"
var/photo_message = signal.data["photo"] ? " (<a href='byond://?src=[REF(src)];choice=[photo_href];skiprefresh=1;target=[REF(chat)]'>Photo Attached</a>)" : ""
to_chat(messaged_mob, span_infoplain("[icon2html(computer, messaged_mob)] <b>PDA message from [sender_title], </b>\"[inbound_message]\"[photo_message] [reply]"))
// BUBBER EDIT CHANGE BEGIN - SUBTLE MESSAGES
if(is_subtle)
to_chat(messaged_mob, span_subtlepda("[icon2html(computer, messaged_mob)] <b>Subtle PDA message from [sender_title], </b>\"[inbound_message]\"[photo_message] [reply]"))
else
to_chat(messaged_mob, span_infoplain("[icon2html(computer, messaged_mob)] <b>PDA message from [sender_title], </b>\"[inbound_message]\"[photo_message] [reply]"))
// BUBBER EDIT CHANGE END - SUBTLE MESSAGES
SEND_SIGNAL(computer, COMSIG_COMPUTER_RECEIVED_MESSAGE, sender_title, inbound_message, photo_message)