From 58c7c0291bda7a6a5854e24a0d582bdcbf310b92 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sat, 25 Jan 2020 05:22:05 +0100 Subject: [PATCH] ...? ...? --- .../mob/living/carbon/human/examine.dm | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 8edd5847de..ef8a745b89 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -385,20 +385,17 @@ else if(isobserver(user) && traitstring) . += "Traits: [traitstring]" - if(print_flavor_text()) - if(get_visible_name() == "Unknown") //Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation. - . += "...?" - else if(skipface) //Sometimes we're not unknown, but impersonating someone in a hardsuit, let's not reveal our flavor text then either. - . += "...?" - else - . += "[print_flavor_text()]" - if(print_flavor_text_2()) - if(get_visible_name() == "Unknown") //Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation. - . += "...?" - else if(skipface) //Sometimes we're not unknown, but impersonating someone in a hardsuit, let's not reveal our flavor text then either. - . += "...?" - else - . += "[print_flavor_text_2()]" + //No flavor text unless the face can be seen. Prevents certain metagaming with impersonation. + var/invisible_man = skipface || get_visible_name() == "Unknown" + if(invisible_man) + . += "...?" + else + var/flavor = print_flavor_text() + if(flavor) + . += flavor + var/temp_flavor = print_flavor_text_2() + if(temp_flavor) + . += temp_flavor . += "*---------*" /mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects!