From c2cd5c646a0c6404b17708ba96c9ec09b224a01d Mon Sep 17 00:00:00 2001
From: Cognition <glowingroseofblue@gmail.com>
Date: Sun, 17 Sep 2023 04:11:04 -0600
Subject: [PATCH] Explorer Radio & Entertainment Radio format fixes

---
 code/__DEFINES/spans.dm                              | 2 ++
 interface/stylesheet.dm                              | 2 +-
 tgui/packages/tgui-panel/chat/constants.js           | 2 +-
 tgui/packages/tgui-panel/styles/goon/chat-dark.scss  | 8 ++++++++
 tgui/packages/tgui-panel/styles/goon/chat-light.scss | 6 +++++-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/code/__DEFINES/spans.dm b/code/__DEFINES/spans.dm
index 2869fc00d953..636cc123f694 100644
--- a/code/__DEFINES/spans.dm
+++ b/code/__DEFINES/spans.dm
@@ -51,6 +51,8 @@
 #define SPAN_DRONE(str) ("<span class='drone'>[str]</span>")
 #define SPAN_ENGRADIO(str) ("<span class='engradio'>[str]</span>")
 #define SPAN_EXTREMELYBIG(str) ("<span class='extremelybig'>[str]</span>")
+#define SPAN_EXPRADIO(str) ("<span class='expradio'>[str]</span>")
+#define SPAN_ENTRADIO(str) ("<span class='entradio'>[str]</span>")
 #define SPAN_GANGRADIO(str) ("<span class='gangradio'>[str]</span>")
 #define SPAN_GHOSTALERT(str) ("<span class='ghostalert'>[str]</span>")
 #define SPAN_GREEN(str) ("<span class='green'>[str]</span>")
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 157ba215238f..4c85829a2a97 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -81,7 +81,7 @@ em						{font-style: normal;font-weight: bold;}
 .sciradio				{color: #993399;}
 .suppradio				{color: #5F4519;}
 .servradio				{color: #6eaa2c;}
-.expradio				{color: #555555;}
+.expradio				{color: #c240a1;}
 
 .redteamradio			{color: #ff0000;}
 .blueteamradio			{color: #0000ff;}
diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js
index b8854627b536..cb32ac7db484 100644
--- a/tgui/packages/tgui-panel/chat/constants.js
+++ b/tgui/packages/tgui-panel/chat/constants.js
@@ -59,7 +59,7 @@ export const MESSAGE_TYPES = [
     type: MESSAGE_TYPE_RADIO,
     name: 'Radio',
     description: 'All departments of radio messages',
-    selector: '.alert, .minorannounce, .syndradio, .aiprivradio, .entradio, .centcomradio, .aiprivradio, .comradio, .secradio, .gangradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
+    selector: '.alert, .minorannounce, .syndradio, .aiprivradio, .entradio, .centcomradio, .aiprivradio, .comradio, .secradio, .gangradio, .engradio, .expradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate',
   },
   {
     type: MESSAGE_TYPE_INFO,
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
index 4b841e61dc81..7c3213691b34 100644
--- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
@@ -433,6 +433,14 @@ em {
   color: #6ca729;
 }
 
+.expradio {
+  color: #c471af;
+}
+
+.entradio {
+  color: #52b985;
+}
+
 .syndradio {
   color: #8f4a4b;
 }
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss
index 0e8acfada0ab..8fe03b6018ea 100644
--- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss
@@ -452,7 +452,11 @@ em {
 }
 
 .expradio {
-  color: #555555;
+  color: #c240a1;
+}
+
+.entradio {
+  color: #339966;
 }
 
 .syndradio {