Merge pull request #640 from Citadel-Station-13/upstream-merge-26527

[MIRROR] Zombie/limb refactors/fixes
This commit is contained in:
LetterJay
2017-05-13 01:24:55 -04:00
committed by GitHub
10 changed files with 94 additions and 38 deletions
@@ -262,6 +262,8 @@
if(held_index > C.hand_bodyparts.len)
C.hand_bodyparts.len = held_index
C.hand_bodyparts[held_index] = src
if(C.dna.species.mutanthands && !is_pseudopart)
C.put_in_hand(new C.dna.species.mutanthands(), held_index)
if(C.hud_used)
var/obj/screen/inventory/hand/hand = C.hud_used.hand_slots["[held_index]"]
if(hand)
@@ -277,6 +279,9 @@
qdel(S)
break
for(var/obj/item/organ/O in contents)
O.Insert(C)
update_bodypart_damage_state()
C.updatehealth()
@@ -72,9 +72,9 @@
user.visible_message("[user] successfully replaces [target]'s [parse_zone(target_zone)]!", "<span class='notice'>You succeed in replacing [target]'s [parse_zone(target_zone)].</span>")
return 1
else
target.regenerate_limb(target_zone)
var/obj/item/bodypart/L = target.get_bodypart(target_zone)
var/obj/item/bodypart/L = target.newBodyPart(target_zone, FALSE, FALSE)
L.is_pseudopart = TRUE
L.attach_limb(target)
user.visible_message("[user] finishes attaching [tool]!", "<span class='notice'>You attach [tool].</span>")
qdel(tool)
if(istype(tool, /obj/item/weapon/twohanded/required/chainsaw))