Merge pull request #4379 from Citadel-Station-13/upstream-merge-33298

[MIRROR] Fixes zombie head removal
This commit is contained in:
deathride58
2017-12-14 22:20:45 +00:00
committed by GitHub

View File

@@ -236,6 +236,11 @@
if(pill)
pill.forceMove(src)
//Make sure de-zombification happens before organ removal instead of during it
var/obj/item/organ/zombie_infection/ooze = owner.getorganslot(ORGAN_SLOT_ZOMBIE)
if(istype(ooze))
ooze.transfer_to_limb(src, owner)
name = "[owner.real_name]'s head"
..()