shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4946 from Citadel-Station-13/upstream-merge-34598

Browse Source 
[MIRROR] Illusions now properly use the health argument of Copy_Parent
This commit is contained in:
deathride58
2018-01-19 19:39:26 +00:00
committed by GitHub
parent 29099c3608 edf698e690
commit ede18e6fec
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/illusion.dm
+2 -1
View File
@@ -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