From 88cf2db34b4b44cdc1c385f5c3cb01005b47d147 Mon Sep 17 00:00:00 2001
From: Kyep <github-aweb@sneakemail.com>
Date: Thu, 23 Feb 2017 23:39:08 -0800
Subject: [PATCH] Krausus

---
 code/game/gamemodes/blob/blobs/core.dm | 11 ++++-------
 code/modules/events/blob.dm            |  3 +--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm
index d8957465125..0142d198cc3 100644
--- a/code/game/gamemodes/blob/blobs/core.dm
+++ b/code/game/gamemodes/blob/blobs/core.dm
@@ -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
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index cdeabc725c4..188722d8e92 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -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