Merge pull request #1226 from Krausus/Fixes-201505300219

Various Minor Fixes
This commit is contained in:
Fox-McCloud
2015-05-30 07:00:48 -04:00
9 changed files with 47 additions and 24 deletions
@@ -68,7 +68,7 @@
if(istype(w_uniform,/obj/item/clothing/under))
var/obj/item/clothing/under/U = w_uniform
if(U.accessories.len)
tie_msg += " with [lowertext(english_list(U.accessories))]"
tie_msg += " with [english_accessory_list(U)]"
if(w_uniform.blood_DNA)
msg += "<span class='warning'>[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][tie_msg]!</span>\n"
@@ -280,7 +280,7 @@
continue
for(var/obj/item/organ/external/temp in organs)
if(temp)
if(temp && !temp.is_stump())
if(temp.status & ORGAN_ROBOT)
if(!(temp.brute_dam + temp.burn_dam))
if(!(species.flags & IS_SYNTHETIC))
+2
View File
@@ -998,6 +998,8 @@ var/list/slot_equipment_priority = list( \
else
stat(null, "processScheduler is not running.")
statpanel("Status") // Switch to the Status panel again, for the sake of the lazy Stat procs
/mob/proc/add_stings_to_statpanel(var/list/stings)
for(var/obj/effect/proc_holder/changeling/S in stings)