From 9bb360806354d3dedcc739fa2d74b421da415918 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:31:36 +0100
Subject: [PATCH] filter improvements and oldchat colours

---
 code/modules/vore/chat_healthbars.dm     | 15 +++++++++------
 code/modules/vore/eating/vorepanel_vr.dm |  4 ++--
 interface/stylesheet.dm                  | 10 +++++-----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/code/modules/vore/chat_healthbars.dm b/code/modules/vore/chat_healthbars.dm
index 95d32afa05b..b6d9a4f543e 100644
--- a/code/modules/vore/chat_healthbars.dm
+++ b/code/modules/vore/chat_healthbars.dm
@@ -1,6 +1,6 @@
 //Health bars in the game window would be pretty challenging and I don't know how to do that, so I thought this would be a good alternative
 
-/mob/living/proc/chat_healthbar(var/mob/living/reciever, override = FALSE)
+/mob/living/proc/chat_healthbar(var/mob/living/reciever, onExamine = FALSE, override = FALSE)
 	if(!reciever)	//No one to send it to, don't bother
 		return
 	if(!reciever.client)	//No one is home, don't bother
@@ -87,9 +87,12 @@
 	else if(ourpercent > 0)
 		ourbar = span_red("[ourbar] - [ourbelly.digest_mode]ing")
 	else
-		ourbar = "<span class='vdanger'>[ourbar] - [ourbelly.digest_mode]ing</span>"
+		ourbar = span_red("<b>[ourbar] - [ourbelly.digest_mode]ing</b>")
 
-	to_chat(reciever,"<span class='vnotice'>[ourbar]</span>")
+	if(onExamine)
+		to_chat(reciever,"<span class='notice'>[ourbar]</span>")
+	else
+		to_chat(reciever,"<span class='vnotice'>[ourbar]</span>")
 
 /mob/living/verb/print_healthbars()
 	set name = "Print Prey Healthbars"
@@ -104,10 +107,10 @@
 			if(!isliving(thing))
 				continue
 			if(!belly_announce)
-				to_chat(src, "<span class='vnotice'>[b.digest_mode] - Within [b.name]:</span>")	//We only want to announce the belly if we found something
+				to_chat(src, "<span class='notice'>[b.digest_mode] - Within [b.name]:</span>")	//We only want to announce the belly if we found something
 				belly_announce = TRUE
 			var/mob/living/ourmob = thing
-			ourmob.chat_healthbar(src, TRUE)
+			ourmob.chat_healthbar(src, TRUE, TRUE)
 			nuffin = FALSE
 	if(nuffin)
-		to_chat(src, "<span class='vwarning'>There are no mobs within any of your bellies to print health bars for.</span>")
+		to_chat(src, "<span class='warning'>There are no mobs within any of your bellies to print health bars for.</span>")
diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm
index a165060a8e1..7a7878ee454 100644
--- a/code/modules/vore/eating/vorepanel_vr.dm
+++ b/code/modules/vore/eating/vorepanel_vr.dm
@@ -631,7 +631,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 			to_chat(user, jointext(results, "<br>"))
 			if(isliving(target))
 				var/mob/living/ourtarget = target
-				ourtarget.chat_healthbar(user)
+				ourtarget.chat_healthbar(user, TRUE)
 			return TRUE
 
 		if("Use Hand")
@@ -744,7 +744,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono",
 			to_chat(user, jointext(results, "<br>"))
 			if(isliving(target))
 				var/mob/living/ourtarget = target
-				ourtarget.chat_healthbar(user)
+				ourtarget.chat_healthbar(user, TRUE)
 			return TRUE
 
 		if("Eject")
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index fbe3451b8a0..16345d844a9 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -78,7 +78,7 @@ em						{font-style: normal;font-weight: bold;}
 /* Miscellaneous */
 .name					{font-weight: bold;}
 .say					{}
-.alert					{color: #ff0000;}
+.alert, .valert			{color: #ff0000;}
 h1.alert, h2.alert		{color: #000000;}
 .ghostalert				{color: #5c00e6;	font-style: italic; font-weight: bold;}
 
@@ -96,11 +96,11 @@ h1.alert, h2.alert		{color: #000000;}
 .passive				{color: #660000;}
 
 .critical				{color: #ff0000; font-weight: bold; font-size: 150%;}
-.danger					{color: #ff0000; font-weight: bold;}
-.warning				{color: #ff0000; font-style: italic;}
+.danger, .vdanger		{color: #ff0000; font-weight: bold;}
+.warning, .vwarning		{color: #ff0000; font-style: italic;}
 .rose					{color: #ff5050;}
 .info					{color: #0000CC;}
-.notice					{color: #000099;}
+.notice, .vnotice		{color: #000099;}
 .alium					{color: #00ff00;}
 .cult					{color: #800080; font-weight: bold; font-style: italic;}
 
@@ -116,7 +116,7 @@ h1.alert, h2.alert		{color: #000000;}
 .skrellfar				{color: #70FCFF;}
 .soghun					{color: #50BA6C;}
 .solcom					{color: #22228B;}
-.changeling				{color: #800080;font-style: italic;}
+.changeling, .psay, .pemote		{color: #800080;font-style: italic;}
 .sergal					{color: #0077FF;}
 .birdsongc				{color: #CC9900;}
 .vulpkanin				{color: #B97A57;}