From feaa0ecd244f3927f2fdaef90fb85c8751de7a96 Mon Sep 17 00:00:00 2001 From: Dip Date: Mon, 19 Oct 2020 19:03:12 -0300 Subject: [PATCH] double examine is a no no --- code/game/atoms.dm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 841b4816..f9ed7a31 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -294,6 +294,11 @@ if(SEND_SIGNAL(src, COMSIG_ATOM_GET_EXAMINE_NAME, user, override) & COMPONENT_EXNAME_CHANGED) should_override = TRUE + + if(blood_DNA && !istype(src, /obj/effect/decal)) + override[EXAMINE_POSITION_BEFORE] = " blood-stained " + should_override = TRUE + if(should_override) . = override.Join("") @@ -303,19 +308,7 @@ /atom/proc/examine(mob/user) . = list("[get_examine_string(user, TRUE)].") - - - //This reformat names to get a/an properly working on item descriptions when they are bloody - var/f_name = "\a [src]." - if(src.blood_DNA && !istype(src, /obj/effect/decal)) - if(gender == PLURAL) - f_name = "some " - else - f_name = "a " - f_name += "blood-stained [name]!" - - to_chat(user, "[icon2html(src, user)] That's [f_name]") - + if(desc) . += desc