From ea16fda5948890faa74f81015da9c7b9299534d9 Mon Sep 17 00:00:00 2001
From: LT3 <83487515+lessthnthree@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:09:30 -0700
Subject: [PATCH] Subtle PDA indicator (#2243)

## About The Pull Request

Adds a span so that you can tell normal PDA messages from subtle ones.

## Why It's Good For The Game

You can tell between the two messages types.

## Proof Of Testing

<details>
<summary>Screenshots/Videos</summary>


![image](https://github.com/user-attachments/assets/ff4cb897-d982-48b9-ba3d-fb5986c610ea)


![image](https://github.com/user-attachments/assets/a6d1521f-a8cb-4a50-916f-c8023c5831df)

</details>

## Changelog

:cl: LT3
qol: Received subtle PDA messages are labelled subtle in the text log
/:cl:
---
 code/__DEFINES/~~bubber_defines/span.dm           |  1 +
 .../programs/messenger/messenger_program.dm       | 15 ++++++++++++---
 tgstation.dme                                     |  1 +
 .../tgui-panel/styles/tgchat/chat-dark.scss       |  4 ++++
 .../tgui-panel/styles/tgchat/chat-light.scss      |  4 ++++
 5 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 code/__DEFINES/~~bubber_defines/span.dm

diff --git a/code/__DEFINES/~~bubber_defines/span.dm b/code/__DEFINES/~~bubber_defines/span.dm
new file mode 100644
index 00000000000..7ab28a8a935
--- /dev/null
+++ b/code/__DEFINES/~~bubber_defines/span.dm
@@ -0,0 +1 @@
+#define span_subtlepda(str) ("<span class='subtlepda'>" + str + "</span>")
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 3bb361eb53f..8968abccd75 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
@@ -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)
 
diff --git a/tgstation.dme b/tgstation.dme
index d7b92e8b863..ef155df1f95 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -503,6 +503,7 @@
 #include "code\__DEFINES\~~bubber_defines\research_categories.dm"
 #include "code\__DEFINES\~~bubber_defines\say.dm"
 #include "code\__DEFINES\~~bubber_defines\signals.dm"
+#include "code\__DEFINES\~~bubber_defines\span.dm"
 #include "code\__DEFINES\~~bubber_defines\species.dm"
 #include "code\__DEFINES\~~bubber_defines\status_indicator_defines.dm"
 #include "code\__DEFINES\~~bubber_defines\storyteller_defines.dm"
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index 715bfbb1216..bfa34346654 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -1332,4 +1332,8 @@ $border-width-px: $border-width * 1px;
   font-weight: bold;
   font-style: italic;
 }
+
+.subtlepda {
+  color: #eb6bff;
+}
 // SKYRAT EDIT ADDITION END
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index 20b32a1dba5..25f9a812af4 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -1285,4 +1285,8 @@ $border-width-px: $border-width * 1px;
     color: #9b6000;
   }
 }
+
+.subtlepda {
+  color: #9e008c;
+}
 // SKYRAT EDIT ADDITION END