From e5296ffa7de53c9effe423208afc12a3e542d4ae Mon Sep 17 00:00:00 2001
From: Razharas <kostmartin@gmail.com>
Date: Wed, 23 Sep 2015 03:21:00 +0300
Subject: [PATCH] AnturKs fixes without mutation fix

AnturKs fixes without mutation fix
---
 code/game/machinery/camera/camera.dm  |  7 +++++++
 code/game/machinery/camera/presets.dm | 12 ++++++------
 code/modules/mob/transform_procs.dm   | 10 +++-------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 4eb6a9df0fa..a59a94fe318 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -1,3 +1,7 @@
+#define CAMERA_UPGRADE_XRAY 1 
+#define CAMERA_UPGRADE_EMP_PROOF 2
+#define CAMERA_UPGRADE_MOTION 4
+
 /obj/machinery/camera
 	name = "security camera"
 	desc = "It's used to monitor rooms."
@@ -29,6 +33,9 @@
 	var/busy = 0
 	var/emped = 0  //Number of consecutive EMP's on this camera
 
+	// Upgrades bitflag
+	var/upgrades = 0
+
 /obj/machinery/camera/New()
 	assembly = new(src)
 	assembly.state = 4
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index cc1139e511d..94049ba063d 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -61,25 +61,25 @@
 // CHECKS
 
 /obj/machinery/camera/proc/isEmpProof()
-	var/O = locate(/obj/item/stack/sheet/mineral/plasma) in assembly.upgrades
-	return O
+	return upgrades & CAMERA_UPGRADE_EMP_PROOF
 
 /obj/machinery/camera/proc/isXRay()
-	var/O = locate(/obj/item/device/analyzer) in assembly.upgrades
-	return O
+	return upgrades & CAMERA_UPGRADE_XRAY
 
 /obj/machinery/camera/proc/isMotion()
-	var/O = locate(/obj/item/device/assembly/prox_sensor) in assembly.upgrades
-	return O
+	return upgrades & CAMERA_UPGRADE_MOTION
 
 // UPGRADE PROCS
 
 /obj/machinery/camera/proc/upgradeEmpProof()
 	assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/plasma(assembly))
+	upgrades |= CAMERA_UPGRADE_EMP_PROOF
 
 /obj/machinery/camera/proc/upgradeXRay()
 	assembly.upgrades.Add(new /obj/item/device/analyzer(assembly))
+	upgrades |= CAMERA_UPGRADE_XRAY
 
 // If you are upgrading Motion, and it isn't in the camera's New(), add it to the machines list.
 /obj/machinery/camera/proc/upgradeMotion()
 	assembly.upgrades.Add(new /obj/item/device/assembly/prox_sensor(assembly))
+	upgrades |= CAMERA_UPGRADE_MOTION
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 674b88eacb6..46219998c18 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -430,14 +430,10 @@
 /mob/living/carbon/human/proc/Blobize()
 	if (notransform)
 		return
-	var/obj/effect/blob/core/new_blob = new /obj/effect/blob/core (loc)
-	if(!client)
-		for(var/mob/dead/observer/G in player_list)
-			if(ckey == "@[G.ckey]")
-				new_blob.create_overmind(G.client , 1)
-				break
+	if(!client) //TOO BAD
+		new /obj/effect/blob/core (loc)
 	else
-		new_blob.create_overmind(src.client , 1)
+		new /obj/effect/blob/core (loc,new_overmind = src.client)
 	gib(src)