Merge pull request #4978 from Colfer1/master

Adds new emotes + flashy emote text
ARF-SS13 · Apr 19, 2024 · 66133f3 · 66133f3
2 parents f5f5344 + 5285187
commit 66133f3
Show file tree

Hide file tree

Showing 5 changed files with 228 additions and 2 deletions.
diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm
@@ -72,6 +72,11 @@
 #define span_holoparasite(str) ("<span class='holoparasite'>" + str + "</span>")
 #define span_hypnophrase(str) ("<span class='hypnophrase'>" + str + "</span>")
 #define span_private(str) ("<span class='private'>" + str + "</span>")
+#define span_urgent(str) ("<span class='urgent'>" + str + "</span>")
+#define span_softlove(str) ("<span class='softlove'>" + str + "</span>")
+#define span_glitch(str) ("<span class='glitch'>" + str + "</span>")
+#define span_blockytext(str) ("<span class='blockytext'>" + str + "</span>")
+
 
 #define span_icon(str) ("<span class='icon'>" + str + "</span>")
 #define span_inathneq(str) ("<span class='inathneq'>" + str + "</span>")

diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
@@ -2347,16 +2347,30 @@ GLOBAL_LIST_INIT(special_phrases, list(
 	key = "rizz"
 	key_third_person = "rizzler"
 	message = "<span class='hypnophrase'>radiates powerful rizz</span>"
-	message_param = "<span class='hypnophrase'>%t.</span>" //Funny color text
+	message_param = "<span class='hypnophrase'>%t</span>" //Funny color text
 	sound = "modular_splurt/sound/voice/rizz.ogg"
 
 /datum/emote/living/threaten
 	key = "threaten"
 	key_third_person = "threaten"
 	message = "<span class='velvet'>radiates a menacing aura.</span>"
-	message_param = "<span class='velvet'>%t.</span>" //Funny red text
+	message_param = "<span class='velvet'>%t</span>" //Funny red text
 	sound = "modular_splurt/sound/voice/waterphone.ogg"
 
+/datum/emote/living/accusation
+	key = "accuse"
+	key_third_person = "accusation"
+	message = "says, <span class='blockytext'>O B J E C T I O N !!</span>"
+	message_param = "<span class='blockytext'>%t</span>" //Funny block text
+	sound = "modular_splurt/sound/voice/deathglare.ogg"
+
+/datum/emote/living/urgent
+	key = "urgent"
+	key_third_person = "urgency"
+	message = "<span class='urgent'>draws attention to themselves!</span>"
+	message_param = "<span class='urgent'>%t</span>" //Funny block text
+	sound = "modular_splurt/sound/voice/alienbeeper.ogg"
+
 //Slime start
 
 //Framework

diff --git a/modular_splurt/sound/voice/alienbeeper.ogg b/modular_splurt/sound/voice/alienbeeper.ogg
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
@@ -1191,3 +1191,106 @@ em {
 .ml-3 {
   margin-left: 3em;
 }
+
+.urgent	{
+  color: #b7b7b7;
+  font-weight: bold;
+  animation: urgentalert 3000ms;
+  animation-direction: linear;
+  text-shadow: 0 0 4px #ffe100
+}
+
+@keyframes urgentalert {
+	0% {
+    color: #ffffff;
+  }
+	5% {
+    color: #000000;
+  }
+	10% {
+    color: #ffffff;
+  }
+	15% {
+    color: #000000;
+  }
+	25% {
+    color: #222222;
+  }
+	100% {
+    color: #2e2e2e;
+  }
+
+}
+
+.softlove	{
+  color: #ff006a;
+  font-weight: bold;
+  animation: softlovin 5000ms infinite;
+  animation-direction: alternate;
+  text-shadow: 0 0 6px #ff6d6d
+}
+
+@keyframes softlovin {
+	0% {
+    color: #da005b;
+  }
+	100% {
+    color: #9500ff;
+  }
+}
+
+.glitch	{
+  color: #ff006a;
+  font-weight: bold;
+  animation: glitchy 5000ms;
+  animation-direction: both;
+}
+
+@keyframes glitchy {
+	0% {
+    color: #f2ff00;
+  }
+	2% {
+    color: #ff0000;
+  }
+	4% {
+    color: #1eff00;
+  }
+	6% {
+    color: #1100ff;
+  }
+	8% {
+    color: #ffffff;
+  }
+	100% {
+    color: #000000;
+  }
+
+}
+
+.blockytext {
+  color: #000000;
+  background-color: #ffffff;
+  display: outside;
+  animation: blockytext 15000ms infinite;
+  animation-direction: linear;
+}
+
+@keyframes blockytext {
+	0% {
+    color: #000000;
+  }
+	1% {
+    color: #ff0000;
+  }
+	2% {
+    color: #000000;
+  }
+	3% {
+    color: #ff0000;
+  }
+	4% {
+    color: #000000;
+  }
+
+}
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss
@@ -1229,3 +1229,107 @@ h1.alert, h2.alert {
 .ml-3 {
   margin-left: 3em;
 }
+
+.urgent	{
+  color: #292929;
+  font-weight: bold;
+  animation: urgentalert 3000ms;
+  animation-direction: linear;
+  text-shadow: 0 0 2px #ff0000
+}
+
+@keyframes urgentalert {
+	0% {
+    color: #000000;
+  }
+	5% {
+    color: #ffffff;
+  }
+	10% {
+    color: #000000;
+  }
+	15% {
+    color: #ffffff;
+  }
+	25% {
+    color: #222222;
+  }
+	100% {
+    color: #2e2e2e;
+  }
+
+}
+
+.softlove	{
+  color: #ff006a;
+  font-weight: bold;
+  animation: softlovin 5000ms infinite;
+  animation-direction: alternate;
+  text-shadow: 0 0 6px #ff6d6d
+}
+
+@keyframes softlovin {
+	0% {
+    color: #da005b;
+  }
+	100% {
+    color: #9500ff;
+  }
+}
+
+.glitch	{
+  color: #ff006a;
+  font-weight: bold;
+  animation: glitchy 5000ms;
+  animation-direction: both;
+}
+
+@keyframes glitchy {
+	0% {
+    color: #f2ff00;
+  }
+	2% {
+    color: #ff0000;
+  }
+	4% {
+    color: #1eff00;
+  }
+	6% {
+    color: #1100ff;
+  }
+	8% {
+    color: #ffffff;
+  }
+	100% {
+    color: #000000;
+  }
+
+}
+
+.blockytext {
+  color: #ffffff;
+  background-color: #000000;
+  font-weight: bold;
+  display: outside;
+  animation: blockytext 15000ms infinite;
+  animation-direction: linear;
+}
+
+@keyframes blockytext {
+	0% {
+    color: #ffffff;
+  }
+	1% {
+    color: #ff0000;
+  }
+	2% {
+    color: #ffffff;
+  }
+	3% {
+    color: #ff0000;
+  }
+	4% {
+    color: #ffffff;
+  }
+
+}