From a52b371e22e2069116af77df7db432995386e216 Mon Sep 17 00:00:00 2001 From: Markolie Date: Fri, 18 Sep 2015 18:16:20 +0200 Subject: [PATCH] Flavor text examine fix --- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 3 ++- code/modules/mob/mob.dm | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index b16e94e2abb..b117490f92c 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -115,7 +115,7 @@ Works together with spawning an observer, noted above. if(antagHUD) var/list/target_list = list() for(var/mob/living/target in oview(src, 14)) - if(target.mind&&(target.mind.special_role||issilicon(target)||target.mind.nation) ) + if(target.mind && (target.mind.special_role || issilicon(target) || target.mind.nation)) target_list += target if(target_list.len) assess_targets(target_list, src) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index db44d66133e..f588805a0d7 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1784,4 +1784,5 @@ /mob/living/carbon/human/proc/get_full_print() if(!dna || !dna.uni_identity) return - return md5(dna.uni_identity) \ No newline at end of file + return md5(dna.uni_identity) + \ No newline at end of file diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 098f2f10914..34fd44e9ae6 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -611,13 +611,13 @@ var/list/slot_equipment_priority = list( \ src << "

OOC Warning:

" src << "Your flavor text is likely out of date! Change" -/mob/proc/print_flavor_text() +/mob/proc/print_flavor_text(var/shrink = 1) if (flavor_text && flavor_text != "") var/msg = replacetext(flavor_text, "\n", " ") - if(lentext(msg) <= 40) - return "\blue [msg]" + if(lentext(msg) <= 40 || !shrink) + return "[msg]" else - return "\blue [copytext_preserve_html(msg, 1, 37)]... More..." + return "[copytext_preserve_html(msg, 1, 37)]... More..." /mob/proc/is_dead() return stat == DEAD