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

[MIRROR] Zombie/limb refactors/fixes
2017-05-13 01:24:55 -04:00
parent 084781a4c4 bba7b9246d
commit 485bca003f
10 changed files with 94 additions and 38 deletions
@@ -1533,7 +1533,9 @@

 /datum/reagent/romerol/on_mob_life(mob/living/carbon/human/H)
 	// Silently add the zombie infection organ to be activated upon death
-	new /obj/item/organ/zombie_infection(H)
+	if(!H.getorganslot("zombie_infection"))
+		var/obj/item/organ/zombie_infection/ZI = new()
+		ZI.Insert(H)
 	..()

 /datum/reagent/growthserum