yeah that makes sense

BeeStation · Nov 21, 2023 · d89a267 · d89a267
1 parent a7cf6e4
commit d89a267
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
@@ -359,7 +359,7 @@ GENE SCANNER
 		else if(S.mutantstomach != initial(S.mutantstomach))
 			mutant = TRUE
 
-		to_chat(user, "<span class='info'>Species: [H.species_examine_font()][S.name][mutant ? "-derived mutant" : ""]</font></span>") //NSV13 - species name is colored depending on special conditions.
+		to_chat(user, "<span class='info'>Species: <span class='[H.species_examine_font()]'>[S.name][mutant ? "-derived mutant" : ""]</span></span>") //NSV13 - species name is colored depending on special conditions.
 	to_chat(user, "<span class='info'>Body temperature: [round(M.bodytemperature-T0C,0.1)] &deg;C ([round(M.bodytemperature*1.8-459.67,0.1)] &deg;F)</span>")
 
 	// Time of death

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
@@ -24,7 +24,7 @@
 		display_name += "[compose_rank(src)]"
 	display_name += name
 	if(dna?.species && !skipface)
-		apparent_species = ", [species_examine_font()]\an [dna.species.name]</font>" //NSV13 - species name is colored depending on special conditions.
+		apparent_species = ", <span class='[species_examine_font()]'>\an [dna.species.name]</span>" //NSV13 - species name is colored depending on special conditions.
 	. = list("<span class='info'>*---------*\nThis is <EM>[!obscure_name ? display_name : "Unknown"][apparent_species]</EM>!")
 
 	//uniform

diff --git a/nsv13/code/modules/mob/living/carbon/human/nsv_human_helpers.dm b/nsv13/code/modules/mob/living/carbon/human/nsv_human_helpers.dm
@@ -13,13 +13,13 @@
 */
 /mob/living/carbon/human/proc/species_examine_font()
 	if((MOB_ROBOTIC in mob_biotypes))
-		return "<font color='#aaa9ad'>"
+		return "sc_robotic"
 	if(HAS_TRAIT(src, TRAIT_TOXINLOVER))
-		return "<font color='#00ffff'>"
+		return "sc_toxlover"
 	if(isethereal(src))
-		return "<font color='#e0d31d'>"
+		return "sc_ethereal"
 	if(isplasmaman(src))
-		return "<font color='#800080'>"
+		return "sc_plasmaman"
 	if(isgolem(src))
-		return "<font color='#8b4513'>"
-	return "<font color='#18d855'>"
+		return "sc_golem"
+	return "sc_normal"
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss
@@ -582,3 +582,12 @@ em						{font-style: normal;	font-weight: bold;}
 .stat_infomation				{color: #e6a648;}
 
 .stat_br				        {color: #2ace53;}
+
+//NSV13 - species examine colors
+.sc_robotic {color: #aaa9ad;}
+.sc_toxlover {color: #00ffff;}
+.sc_ethereal {color: #e0d31d;}
+.sc_plasmaman {color: #c400c4}
+.sc_golem {color: #b34a00}
+.sc_normal {color: #18d855}
+//NSV13 end
diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss
@@ -581,3 +581,12 @@ h1.alert, h2.alert		{color: #000000;}
 .stat_infomation				{color: #be8530;}
 
 .stat_br				        {color: #2ace53;}
+
+//NSV13 - species examine colors
+.sc_robotic {color: #8a898d;}
+.sc_toxlover {color: #1e89d1;}
+.sc_ethereal {color: #dda91a;}
+.sc_plasmaman {color: #aa03aa}
+.sc_golem {color: #8f3e05}
+.sc_normal {color: #029731}
+//NSV13 end