From d814497547af1bde4ad03d8b8a580795d425bccf Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 19 Jan 2018 10:15:38 -0500 Subject: [PATCH] Merge pull request #34598 from Robustin/illusion Illusions now properly use the health argument of Copy_Parent --- code/modules/mob/living/simple_animal/hostile/illusion.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm index 25ce0fc0ec..dc31062df5 100644 --- a/code/modules/mob/living/simple_animal/hostile/illusion.dm +++ b/code/modules/mob/living/simple_animal/hostile/illusion.dm @@ -27,11 +27,12 @@ death() -/mob/living/simple_animal/hostile/illusion/proc/Copy_Parent(mob/living/original, life = 50, health = 100, damage = 0, replicate = 0 ) +/mob/living/simple_animal/hostile/illusion/proc/Copy_Parent(mob/living/original, life = 50, hp = 100, damage = 0, replicate = 0 ) appearance = original.appearance parent_mob = original setDir(original.dir) life_span = world.time+life + health = hp melee_damage_lower = damage melee_damage_upper = damage multiply_chance = replicate