From dd33371a3bcaaf8c1e421dfb266f5adf332c7b63 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Tue, 1 Jun 2021 22:48:57 +0200 Subject: [PATCH 1/3] colors --- code/game/objects/items/devices/scanners.dm | 4 ++-- .../mob/living/carbon/human/examine.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 19 ++++++++++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 8b5e1edd91..7e49882979 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -381,8 +381,8 @@ GENETICS SCANNER else if (S.mutantstomach != initial(S.mutantstomach)) mutant = TRUE - msg += "\tReported Species: [H.dna.custom_species ? H.dna.custom_species : S.name]\n" - msg += "\tBase Species: [S.name]\n" + msg += "\tReported Species: [H.spec_trait_examine_font()][H.dna.custom_species ? H.dna.custom_species : S.name]\n" + msg += "\tBase Species: [H.spec_trait_examine_font()][S.name]\n" if(mutant) msg += "\tSubject has mutations present.\n" msg += "\tBody temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)\n" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index aa14fe6013..f363aecf84 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -28,7 +28,7 @@ if(skipface || get_visible_name() == "Unknown") . += "You can't make out what species they are." else - . += "[t_He] [t_is] a [dna.custom_species ? dna.custom_species : dna.species.name]!" + . += "[t_He] [t_is] a [spec_trait_examine_font()][dna.custom_species ? dna.custom_species : dna.species.name]!" //uniform if(w_uniform && !(SLOT_W_UNIFORM in obscured)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f636ae76ab..d48e915dd4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1083,6 +1083,23 @@ . = ..() set_species(race) +/** + * # `spec_trait_examine_font()` + * + * This gets a humanoid's special examine font, which is used to color their species name during examine / health analyzing. + * Returns: + * Metallic font if robotic + * Cyan if a toxinlover + * Green if none of the others apply (aka, generic organic) +*/ +/mob/living/carbon/human/proc/spec_trait_examine_font() + if(HAS_TRAIT(src, TRAIT_ROBOTIC_ORGANISM)) + return "" + if(HAS_TRAIT(src, TRAIT_TOXINLOVER)) + return "" + return "" + + /mob/living/carbon/human/get_tooltip_data() var/t_He = p_they(TRUE) var/t_is = p_are() @@ -1091,7 +1108,7 @@ if(skipface || get_visible_name() == "Unknown") . += "You can't make out what species they are." else - . += "[t_He] [t_is] a [dna.custom_species ? dna.custom_species : dna.species.name]" + . += "[t_He] [t_is] a [spec_trait_examine_font()][dna.custom_species ? dna.custom_species : dna.species.name]" SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, usr, .) /mob/living/carbon/human/species/abductor From 0f01a4a7dae25e4bc5f05afda4ce26d66d6a42e3 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Tue, 1 Jun 2021 22:52:39 +0200 Subject: [PATCH 2/3] huh --- code/modules/mob/living/carbon/human/human.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d48e915dd4..329fa1ae18 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1096,7 +1096,7 @@ if(HAS_TRAIT(src, TRAIT_ROBOTIC_ORGANISM)) return "" if(HAS_TRAIT(src, TRAIT_TOXINLOVER)) - return "" + return "" return "" From b2e2c49011cf451ced825976439c931157f3b9bd Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 2 Jun 2021 17:47:57 +0200 Subject: [PATCH 3/3] plasmamen & golems --- code/modules/mob/living/carbon/human/human.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 329fa1ae18..41ac05b8e2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1087,16 +1087,23 @@ * # `spec_trait_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 - * Green if none of the others apply (aka, generic organic) + * * 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/spec_trait_examine_font() if(HAS_TRAIT(src, TRAIT_ROBOTIC_ORGANISM)) return "" if(HAS_TRAIT(src, TRAIT_TOXINLOVER)) return "" + if(isplasmaman(src)) + return ""