From d89a2677a4de7c6e0961474dc943cf269b166e11 Mon Sep 17 00:00:00 2001 From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> Date: Tue, 21 Nov 2023 18:50:00 +0100 Subject: [PATCH] yeah that makes sense --- code/game/objects/items/devices/scanners.dm | 2 +- code/modules/mob/living/carbon/human/examine.dm | 2 +- .../mob/living/carbon/human/nsv_human_helpers.dm | 12 ++++++------ tgui/packages/tgui-panel/styles/goon/chat-dark.scss | 9 +++++++++ tgui/packages/tgui-panel/styles/goon/chat-light.scss | 9 +++++++++ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 0a22e4fb668..6dddb203bc4 100644 --- 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, "Species: [H.species_examine_font()][S.name][mutant ? "-derived mutant" : ""]") //NSV13 - species name is colored depending on special conditions. + to_chat(user, "Species: [S.name][mutant ? "-derived mutant" : ""]") //NSV13 - species name is colored depending on special conditions. to_chat(user, "Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)") // Time of death diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index a034d5d3f48..061b5bf68d5 100644 --- 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]" //NSV13 - species name is colored depending on special conditions. + apparent_species = ", \an [dna.species.name]" //NSV13 - species name is colored depending on special conditions. . = list("*---------*\nThis is [!obscure_name ? display_name : "Unknown"][apparent_species]!") //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 index 4736e35718c..c54880f6993 100644 --- 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 "" + return "sc_robotic" if(HAS_TRAIT(src, TRAIT_TOXINLOVER)) - return "" + return "sc_toxlover" if(isethereal(src)) - return "" + return "sc_ethereal" if(isplasmaman(src)) - return "" + return "sc_plasmaman" if(isgolem(src)) - return "" - return "" + 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 index 41b2b9aad83..7c3ff319713 100644 --- 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 index e543f40fb2d..e324d49ad74 100644 --- 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