Merge pull request #14905 from Razharas/Assembly

Some assembly requaired
This commit is contained in:
duncathan salt
2016-01-27 08:03:00 -06:00
20 changed files with 178 additions and 56 deletions
+8 -1
View File
@@ -318,6 +318,9 @@
spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
Grow()
/obj/structure/alien/egg/Destroy()
remove_from_proximity_list(src, 1)
..()
/obj/structure/alien/egg/attack_paw(mob/living/user)
return attack_hand(user)
@@ -348,10 +351,11 @@
/obj/structure/alien/egg/proc/Grow()
icon_state = "egg"
status = GROWN
add_to_proximity_list(src, 1)
/obj/structure/alien/egg/proc/Burst(kill = 1) //drops and kills the hugger if any is remaining
if(status == GROWN || status == GROWING)
remove_from_proximity_list(src, 1)
icon_state = "egg_hatched"
flick("egg_opening", src)
status = BURSTING
@@ -368,6 +372,9 @@
child.Attach(M)
break
/obj/structure/alien/egg/Move()
remove_from_proximity_list(src, 1)
..()
/obj/structure/alien/egg/bullet_act(obj/item/projectile/Proj)
health -= Proj.damage