From 3151b7f3bd9a4265022e1370131cf995ab2f3029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Sat, 23 Apr 2016 12:21:14 +0200 Subject: [PATCH 1/3] A human's species will now be visible on examine. --- code/modules/mob/living/carbon/human/examine.dm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 0b15e284eef..f24c3962897 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -33,7 +33,7 @@ var/msg = "*---------*\nThis is " - if( skipjumpsuit && skipface ) //big suits/masks/helmets make it hard to tell their gender + if(skipjumpsuit && skipface) //big suits/masks/helmets make it hard to tell their gender t_He = "They" t_his = "their" t_him = "them" @@ -52,7 +52,16 @@ t_his = "her" t_him = "her" - msg += "[src.name]!\n" + msg += "[src.name]" + + var/list/nospecies = list("Abductor", "Shadowling", "Neara", "Monkey", "Stok", "Farwa", "Wolpin") //species that won't show their race no matter what + + if (skipjumpsuit && skipface || (src.species.name in nospecies)) //either obscured or on the nospecies list + msg += "!\n" //omit the species when examining + else if (src.species.name == "Slime People") //snowflakey because Slime People are defined as a plural + msg += ", a Slime Person!\n" + else + msg += ", a [src.species]!\n" //uniform if(w_uniform && !skipjumpsuit) From 038ca241c6f15e94e7635bec5d9a9760a0895e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Sat, 23 Apr 2016 20:26:54 +0200 Subject: [PATCH 2/3] Fixes the fixes --- code/modules/mob/living/carbon/human/examine.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index f24c3962897..ae42526e6b0 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -52,16 +52,16 @@ t_his = "her" t_him = "her" - msg += "[src.name]" + msg += "[name]" var/list/nospecies = list("Abductor", "Shadowling", "Neara", "Monkey", "Stok", "Farwa", "Wolpin") //species that won't show their race no matter what - if (skipjumpsuit && skipface || (src.species.name in nospecies)) //either obscured or on the nospecies list + if (skipjumpsuit && skipface || (species.name in nospecies)) //either obscured or on the nospecies list msg += "!\n" //omit the species when examining - else if (src.species.name == "Slime People") //snowflakey because Slime People are defined as a plural + else if (species.name == "Slime People") //snowflakey because Slime People are defined as a plural msg += ", a Slime Person!\n" else - msg += ", a [src.species]!\n" + msg += ", \a [lowertext(species.name)]!\n" //uniform if(w_uniform && !skipjumpsuit) From 399fe7cdc2425749aa343d38c1bcfbc6e23392eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Mon, 25 Apr 2016 12:50:45 +0200 Subject: [PATCH 3/3] slime people whoopsie --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ae42526e6b0..b956b4854d6 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -59,7 +59,7 @@ if (skipjumpsuit && skipface || (species.name in nospecies)) //either obscured or on the nospecies list msg += "!\n" //omit the species when examining else if (species.name == "Slime People") //snowflakey because Slime People are defined as a plural - msg += ", a Slime Person!\n" + msg += ", a slime person!\n" else msg += ", \a [lowertext(species.name)]!\n"