Fixes examining those with limb stumps/accessories

Limb stumps would show as "He has a limb stump on his limb stump", and
accessories would be lowercased and worded poorly.
This commit is contained in:
Krausus
2015-05-30 05:35:18 -04:00
parent 9f1f0a9cfa
commit 755467ac20
2 changed files with 22 additions and 3 deletions
@@ -325,4 +325,23 @@
/obj/item/clothing/accessory/petcollar/attack_self(mob/user as mob)
tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN)
name = "[initial(name)] - [tagname]"
name = "[initial(name)] - [tagname]"
/proc/english_accessory_list(obj/item/clothing/under/U)
if(!istype(U) || !U.accessories.len)
return
var/list/A = U.accessories
var/total = A.len
if (total == 1)
return "\a [A[1]]"
else if (total == 2)
return "\a [A[1]] and \a [A[2]]"
else
var/output = ""
var/index = 1
var/comma_text = ", "
while (index < total)
output += "\a [A[index]][comma_text]"
index++
return "[output]and \a [A[index]]"
@@ -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))