Replaced display_name with name, worked on severing limbs and damage propagation.

This commit is contained in:
Zuhayr
2015-03-25 13:24:28 +10:30
parent f017764e64
commit 97112c8a4c
53 changed files with 420 additions and 389 deletions

View File

@@ -237,12 +237,11 @@
var/target_zone = ran_zone(check_zone(user.zone_sel.selecting, target))
var/obj/item/organ/external/affecting = target:get_organ(target_zone)
if (!affecting)
if (!affecting || affecting.status & ORGAN_DESTROYED || istype(affecting, /obj/item/organ/external/stump))
user << "<span class='danger'>They are missing that limb!</span>"
return
if(affecting.status & ORGAN_DESTROYED)
user << "What [affecting.display_name]?"
return
var/hit_area = affecting.display_name
var/hit_area = affecting.name
var/mob/living/carbon/human/H = target
if((user != target) && H.check_shields(7, "the [src.name]"))