From b8335823311bdd17fbd735addc55e9e4de6aa39a Mon Sep 17 00:00:00 2001 From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> Date: Sun, 12 Nov 2023 16:39:06 +0100 Subject: [PATCH 1/3] tin --- code/game/objects/items/devices/scanners.dm | 2 +- .../mob/living/carbon/human/examine.dm | 2 +- .../mob/living/carbon/human/human_helpers.dm | 26 +++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index fae0e73b471..0a22e4fb668 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: [S.name][mutant ? "-derived mutant" : ""]") + 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, "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 6d8e78bf809..a034d5d3f48 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 = ", \an [dna.species.name]" + apparent_species = ", [species_examine_font()]\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/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index db0e3a97909..04b38df74cb 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -210,3 +210,29 @@ destination.undershirt = undershirt destination.socks = socks destination.jumpsuit_style = jumpsuit_style + +//NSV13 begin - special colors for species names +/** + * # `species_examine_font()` + * + * This gets a humanoid's special examine font, which is used to color their species name during examine / health analyzing. + * The first of these that applies is returned. + * Returns: + * * Metallic font if robotic + * * Cyan if a toxinlover + * * Purple if plasmaperson + * * Rock / Brownish if a golem + * * Green if none of the others apply (aka, generic organic) +*/ +/mob/living/carbon/human/proc/species_examine_font() + if((MOB_ROBOTIC in mob_biotypes)) + return "" + if(HAS_TRAIT(src, TRAIT_TOXINLOVER)) + return "" + if(isplasmaman(src)) + return "" + if(isgolem(src)) + return "" + return "" + +//NSV13 end From a7cf6e44c1180d4af69eb96b341a236693aec8c4 Mon Sep 17 00:00:00 2001 From: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> Date: Sun, 12 Nov 2023 17:42:14 +0100 Subject: [PATCH 2/3] boowomp moves movable code, ethereal color, fixes random ethereal bug I stumbled upon like I tend to do. --- .../mob/living/carbon/human/human_helpers.dm | 26 ------------------- .../carbon/human/species_types/ethereal.dm | 1 + nsv13.dme | 1 + .../living/carbon/human/nsv_human_helpers.dm | 25 ++++++++++++++++++ 4 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 nsv13/code/modules/mob/living/carbon/human/nsv_human_helpers.dm diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 04b38df74cb..db0e3a97909 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -210,29 +210,3 @@ destination.undershirt = undershirt destination.socks = socks destination.jumpsuit_style = jumpsuit_style - -//NSV13 begin - special colors for species names -/** - * # `species_examine_font()` - * - * This gets a humanoid's special examine font, which is used to color their species name during examine / health analyzing. - * The first of these that applies is returned. - * Returns: - * * Metallic font if robotic - * * Cyan if a toxinlover - * * Purple if plasmaperson - * * Rock / Brownish if a golem - * * Green if none of the others apply (aka, generic organic) -*/ -/mob/living/carbon/human/proc/species_examine_font() - if((MOB_ROBOTIC in mob_biotypes)) - return "" - if(HAS_TRAIT(src, TRAIT_TOXINLOVER)) - return "" - if(isplasmaman(src)) - return "" - if(isgolem(src)) - return "" - return "" - -//NSV13 end diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 3ff1c2a28a7..dea066c1f34 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -175,6 +175,7 @@ H.throw_alert("nutrition", /atom/movable/screen/alert/etherealcharge, 3) if(H.health > 10.5) apply_damage(0.65, TOX, null, null, H) + brutemod = 1.9 else H.throw_alert("nutrition", /atom/movable/screen/alert/etherealcharge, 4) if(H.health > 10.5) diff --git a/nsv13.dme b/nsv13.dme index d7ab5d32414..e02e6fa7047 100644 --- a/nsv13.dme +++ b/nsv13.dme @@ -3914,6 +3914,7 @@ #include "nsv13\code\modules\mob\living\carbon\carbon.dm" #include "nsv13\code\modules\mob\living\carbon\examine_tgui.dm" #include "nsv13\code\modules\mob\living\carbon\human\nsv_emotes.dm" +#include "nsv13\code\modules\mob\living\carbon\human\nsv_human_helpers.dm" #include "nsv13\code\modules\mob\living\carbon\human\species_types\catgirl.dm" #include "nsv13\code\modules\mob\living\carbon\human\species_types\nanotrasen_knpc.dm" #include "nsv13\code\modules\mob\living\carbon\human\species_types\other_knpc.dm" 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 new file mode 100644 index 00000000000..4736e35718c --- /dev/null +++ b/nsv13/code/modules/mob/living/carbon/human/nsv_human_helpers.dm @@ -0,0 +1,25 @@ +/** + * # `species_examine_font()` + * + * This gets a humanoid's special examine font, which is used to color their species name during examine / health analyzing. + * The first of these that applies is returned. + * Returns: + * * Metallic font if robotic + * * Cyan if a toxinlover + * * Yellow-ish if an Ethereal + * * Purple if plasmaperson + * * Rock / Brownish if a golem + * * Green if none of the others apply (aka, generic organic) +*/ +/mob/living/carbon/human/proc/species_examine_font() + if((MOB_ROBOTIC in mob_biotypes)) + return "" + if(HAS_TRAIT(src, TRAIT_TOXINLOVER)) + return "" + if(isethereal(src)) + return "" + if(isplasmaman(src)) + return "" + if(isgolem(src)) + return "" + return "" 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 3/3] 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