This commit is contained in:
Kyep
2017-02-23 23:39:08 -08:00
parent 2a028974ac
commit 88cf2db34b
2 changed files with 5 additions and 9 deletions
+4 -7
View File
@@ -10,16 +10,13 @@
var/point_rate = 2
var/is_offspring = null
var/selecting = 0
var/grab_overmind = 1
/obj/effect/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2, offspring, is_event)
/obj/effect/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2, offspring)
blob_cores += src
processing_objects.Add(src)
poi_list |= src
adjustcolors(color) //so it atleast appears
if(is_event)
grab_overmind = 0
if(!overmind && grab_overmind)
if(!overmind)
create_overmind(new_overmind)
if(overmind)
adjustcolors(overmind.blob_reagent_datum.color)
@@ -64,7 +61,7 @@
return // Don't regen, we handle it in Life()
/obj/effect/blob/core/Life()
if(!overmind && grab_overmind)
if(!overmind)
create_overmind()
else
if(resource_delay <= world.time)
@@ -94,7 +91,7 @@
/obj/effect/blob/core/proc/create_overmind(var/client/new_overmind, var/override_delay)
if(overmind_get_delay > world.time && !override_delay && !new_overmind)
if(overmind_get_delay > world.time && !override_delay)
return
overmind_get_delay = world.time + 3000 // 5 minutes
+1 -2
View File
@@ -14,8 +14,7 @@
var/mob/C
if(candidates.len)
C = pick(candidates)
Blob = new /obj/effect/blob/core(T, 200, null, 2, 0, 1)
Blob.create_overmind(C.client, 1)
Blob = new /obj/effect/blob/core(T, 200, C.client, 2, 0)
for(var/i = 1; i < rand(3, 6), i++)
Blob.process()
else