mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
Fixes #6572
This commit is contained in:
@@ -10,13 +10,16 @@
|
||||
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)
|
||||
/obj/effect/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2, offspring, is_event)
|
||||
blob_cores += src
|
||||
processing_objects.Add(src)
|
||||
poi_list |= src
|
||||
adjustcolors(color) //so it atleast appears
|
||||
if(!overmind)
|
||||
if(is_event)
|
||||
grab_overmind = 0
|
||||
if(!overmind && grab_overmind)
|
||||
create_overmind(new_overmind)
|
||||
if(overmind)
|
||||
adjustcolors(overmind.blob_reagent_datum.color)
|
||||
@@ -61,7 +64,7 @@
|
||||
return // Don't regen, we handle it in Life()
|
||||
|
||||
/obj/effect/blob/core/Life()
|
||||
if(!overmind)
|
||||
if(!overmind && grab_overmind)
|
||||
create_overmind()
|
||||
else
|
||||
if(resource_delay <= world.time)
|
||||
@@ -91,7 +94,7 @@
|
||||
|
||||
|
||||
/obj/effect/blob/core/proc/create_overmind(var/client/new_overmind, var/override_delay)
|
||||
if(overmind_get_delay > world.time && !override_delay)
|
||||
if(overmind_get_delay > world.time && !override_delay && !new_overmind)
|
||||
return
|
||||
|
||||
overmind_get_delay = world.time + 3000 // 5 minutes
|
||||
|
||||
@@ -14,11 +14,10 @@
|
||||
var/mob/C
|
||||
if(candidates.len)
|
||||
C = pick(candidates)
|
||||
Blob = new /obj/effect/blob/core(T, 200)
|
||||
Blob = new /obj/effect/blob/core(T, 200, null, 2, 0, 1)
|
||||
Blob.create_overmind(C.client, 1)
|
||||
spawn(30)
|
||||
for(var/i = 1; i < rand(3, 6), i++)
|
||||
Blob.process()
|
||||
for(var/i = 1; i < rand(3, 6), i++)
|
||||
Blob.process()
|
||||
else
|
||||
return kill()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user