From 18e67fbd2dea819823ba1eda0724bcc8fc0c4543 Mon Sep 17 00:00:00 2001 From: Meowykins Date: Mon, 16 Feb 2015 18:24:46 -0600 Subject: [PATCH] Initial Fix - Need More In regard to armbands. Need further progress. --- code/modules/mob/living/carbon/human/examine.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 290b7445..cb74f095 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -65,17 +65,22 @@ if(w_uniform && !skipjumpsuit) //Ties var/tie_msg + var/aband_msg if(istype(w_uniform,/obj/item/clothing/under)) var/obj/item/clothing/under/U = w_uniform if(U.hastie) tie_msg += " with \icon[U.hastie] \a [U.hastie]" + else if(U.hastie && U.aband) + tie_msg += " with \icon[U.hastie] \a [U.hastie] and \icon[U.aband] \a [U.aband]" + if(U.aband) + aband_msg+= " with \icon[U.aband] \a [U.aband]" if(w_uniform.blood_DNA) - msg += "[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][tie_msg]!\n" + msg += "[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][tie_msg][aband_msg]!\n" else if(w_uniform.wasbloody == 2) - msg += "[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] luminol-covered [w_uniform.name][tie_msg]!\n" + msg += "[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] luminol-covered [w_uniform.name][tie_msg][aband_msg]!\n" else - msg += "[t_He] [t_is] wearing \icon[w_uniform] \a [w_uniform][tie_msg].\n" + msg += "[t_He] [t_is] wearing \icon[w_uniform] \a [w_uniform][tie_msg][aband_msg].\n" //head if(head)