cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes whitespace issues with human and cult rune examines (#45094)

Browse Source 
* cult runes

* humans
This commit is contained in:
vuonojenmustaturska
2019-07-10 17:45:56 -04:00
committed by moo
parent fd4f46cc0a
commit 2df19c2dcd
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/cult/runes.dm
+3 -3
View File
@@ -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
. += {"<b>Name:</b> [cultist_name]\n
<b>Effects:</b> [capitalize(cultist_desc)]\n
<b>Required Acolytes:</b> [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]"}
. += "<b>Name:</b> [cultist_name]\n"+\
"<b>Effects:</b> [capitalize(cultist_desc)]\n"+\
"<b>Required Acolytes:</b> [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]"
if(req_keyword && keyword)
. += "<b>Keyword:</b> [keyword]"
code/modules/mob/living/carbon/human/examine.dm
+5 -3
View File
@@ -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 @@
"<a href='?src=[REF(src)];hud=s;view_comment=1'>\[View comment log\]</a>",
"<a href='?src=[REF(src)];hud=s;add_comment=1'>\[Add comment\]</a>"), "")
else if(isobserver(user) && traitstring)
. += "<span class='info'><b>Traits:</b> [traitstring]</span><br>"
. += "<span class='info'><b>Traits:</b> [traitstring]</span>"
. += "*---------*</span>"
/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!