Merge pull request #18729 from coiax/remove-spawn-3

Remove spawn III
This commit is contained in:
oranges
2016-06-21 20:11:08 +12:00
committed by GitHub
39 changed files with 64 additions and 127 deletions
+3 -6
View File
@@ -186,9 +186,7 @@
if(istype(loc, /turf/open/space))
qdel(src)
return
spawn(rand(150, 200))
if(src)
Life()
addtimer(src, "Life", rand(150, 200))
/obj/structure/alien/weeds/Destroy()
linked_node = null
@@ -264,8 +262,7 @@
/obj/structure/alien/egg/New()
new /obj/item/clothing/mask/facehugger(src)
..()
spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
Grow()
addtimer(src, "Grow", rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
/obj/structure/alien/egg/Destroy()
remove_from_proximity_list(src, 1)
@@ -353,4 +350,4 @@
#undef GROWING
#undef GROWN
#undef MIN_GROWTH_TIME
#undef MAX_GROWTH_TIME
#undef MAX_GROWTH_TIME
+2 -3
View File
@@ -15,8 +15,7 @@
smoke.start()
visible_message("<span class='boldannounce'>The [src] warps in!</span>")
playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
spawn(rand(10,600))
warpbots()
addtimer(src, "warpbots", rand(10, 600))
/obj/structure/hivebot_beacon/proc/warpbots()
icon_state = "def_radar"
@@ -34,4 +33,4 @@
visible_message("<span class='boldannounce'>The [src] warps out!</span>")
playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
qdel(src)
return
return