From 2df19c2dcde5bd119a53df01946c36296cc3db76 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Thu, 11 Jul 2019 00:45:56 +0300 Subject: [PATCH] Fixes whitespace issues with human and cult rune examines (#45094) * cult runes * humans --- code/modules/antagonists/cult/runes.dm | 6 +++--- code/modules/mob/living/carbon/human/examine.dm | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index f1d1ea22aaf..195ffea6059 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -49,9 +49,9 @@ Runes can either be invoked by one's self or with many different cultists. Each /obj/effect/rune/examine(mob/user) . = ..() if(iscultist(user) || user.stat == DEAD) //If they're a cultist or a ghost, tell them the effects - . += {"Name: [cultist_name]\n - Effects: [capitalize(cultist_desc)]\n - Required Acolytes: [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]"} + . += "Name: [cultist_name]\n"+\ + "Effects: [capitalize(cultist_desc)]\n"+\ + "Required Acolytes: [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]" if(req_keyword && keyword) . += "Keyword: [keyword]" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 06b19802bb8..e0f90915369 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -95,7 +95,9 @@ . += "[t_He] [t_is] wearing [wear_id.get_examine_string(user)]." //Status effects - . += status_effect_examines() + var/list/status_examines = status_effect_examines() + if (length(status_examines)) + . += status_examines //Jitters switch(jitteriness) @@ -124,7 +126,7 @@ var/temp = getBruteLoss() //no need to calculate each of these twice - var/list/msg = list("") + var/list/msg = list() var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) var/list/disabled = list() @@ -343,7 +345,7 @@ "\[View comment log\]", "\[Add comment\]"), "") else if(isobserver(user) && traitstring) - . += "Traits: [traitstring]
" + . += "Traits: [traitstring]" . += "*---------*" /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!