diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index eba925a659..9e87e7626d 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -38,7 +38,7 @@ continue . += "[t_His] [parse_zone(t)] is missing!" - var/list/msg = list("") + var/list/msg = list() var/temp = getBruteLoss() if(!(user == src && src.hal_screwyhud == SCREWYHUD_HEALTHY)) //fake healthy if(temp) @@ -78,9 +78,8 @@ if(pulledby && pulledby.grab_state) msg += "[t_He] [t_is] restrained by [pulledby]'s grip.\n" - msg += "" - - . += msg.Join("") + if(msg.len) + . += "[msg.Join("")]" if(!appears_dead) if(stat == UNCONSCIOUS) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index c9e2bbb29b..04ec0454f8 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -113,7 +113,7 @@ . += "[dicc.desc]" var/cursed_stuff = attempt_vr(src,"examine_bellies",args) //vore Code - if(!isnull(cursed_stuff)) + if(cursed_stuff) . += cursed_stuff //END OF CIT CHANGES @@ -169,7 +169,7 @@ var/r_limbs_missing = 0 for(var/t in missing) if(t==BODY_ZONE_HEAD) - msg += "[t_His] [parse_zone(t)] is missing!\n" + msg += "[t_His] [parse_zone(t)] is missing!\n" continue if(t == BODY_ZONE_L_ARM || t == BODY_ZONE_L_LEG) l_limbs_missing++ @@ -272,11 +272,10 @@ msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n" if(reagents.has_reagent("astral")) - msg += "[t_He] has wild, spacey eyes" if(mind) - msg += " and they have a strange, abnormal look to them.\n" + msg += "[t_He] has wild, spacey eyes and they have a strange, abnormal look to them.\n" else - msg += " and they don't look like they're all there.\n" + msg += "[t_He] has wild, spacey eyes and they don't look like they're all there.\n" if(isliving(user)) var/mob/living/L = user @@ -287,7 +286,7 @@ msg += "[t_He] seem[p_s()] winded.\n" if (getToxLoss() >= 10) msg += "[t_He] seem[p_s()] sickly.\n" - var/datum/component/mood/mood = src.GetComponent(/datum/component/mood) + var/datum/component/mood/mood = GetComponent(/datum/component/mood) if(mood.sanity <= SANITY_DISTURBED) msg += "[t_He] seem[p_s()] distressed.\n" SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empath", /datum/mood_event/sad_empath, src) @@ -299,8 +298,6 @@ if (HAS_TRAIT(src, TRAIT_DEAF)) msg += "[t_He] appear[p_s()] to not be responding to noises.\n" - msg += "" - var/obj/item/organ/vocal_cords/Vc = user.getorganslot(ORGAN_SLOT_VOICE) if(Vc) if(istype(Vc, /obj/item/organ/vocal_cords/velvet)) @@ -360,7 +357,7 @@ if(R) . += "\[Medical evaluation\]" if(traitstring) - . += "Detected physiological traits:\n[traitstring]" + . += "Detected physiological traits:\n[traitstring]" diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index 5e40a5a7eb..10b88ae14a 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -3,18 +3,16 @@ if (stat == DEAD) . += "It appears to be powered-down." else - . += "" if (getBruteLoss()) if (getBruteLoss() < 30) - . += "It looks slightly dented." + . += "It looks slightly dented." else - . += "It looks severely dented!" + . += "It looks severely dented!" if (getFireLoss()) if (getFireLoss() < 30) - . += "It looks slightly charred." + . += "It looks slightly charred." else - . += "Its casing is melted and heat-warped!" - . += "" + . += "Its casing is melted and heat-warped!" if(deployed_shell) . += "The wireless networking light is blinking." else if (!shunted && !client)