From 4f72f89ad8dd415c500e7b99baada94e76de2de3 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 23 Jan 2017 08:05:55 -0500
Subject: [PATCH] podmen fix

---
 code/modules/hydroponics/grown/replicapod.dm      |  2 --
 code/modules/reagents/chemistry/reagents/water.dm |  3 ++-
 code/modules/surgery/organs/blood.dm              | 10 ++++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm
index 710d92dfe49..57102cb56da 100644
--- a/code/modules/hydroponics/grown/replicapod.dm
+++ b/code/modules/hydroponics/grown/replicapod.dm
@@ -18,7 +18,6 @@
 	var/datum/mind/mind = null
 	var/blood_gender = null
 	var/blood_type = null
-	var/list/features = null
 	var/factions = null
 	var/contains_sample = 0
 
@@ -32,7 +31,6 @@
 					realName = bloodSample.data["real_name"]
 					blood_gender = bloodSample.data["gender"]
 					blood_type = bloodSample.data["blood_type"]
-					features = bloodSample.data["features"]
 					factions = bloodSample.data["factions"]
 					W.reagents.clear_reagents()
 					to_chat(user, "<span class='notice'>You inject the contents of the syringe into the seeds.</span>")
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index f5e409a1cb4..4a8bd0f657d 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -131,7 +131,7 @@
 
 
 /datum/reagent/blood
-	data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"blood_colour"="#A10808","resistances"=null,"trace_chem"=null, "antibodies" = null)
+	data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"blood_colour"="#A10808","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Blood"
 	id = "blood"
 	reagent_state = LIQUID
@@ -158,6 +158,7 @@
 
 /datum/reagent/blood/on_merge(list/mix_data)
 	if(data && mix_data)
+		data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc
 		if(data["viruses"] || mix_data["viruses"])
 
 			var/list/mix1 = data["viruses"]
diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm
index 1bdf29dd191..d1a36f2c4a3 100644
--- a/code/modules/surgery/organs/blood.dm
+++ b/code/modules/surgery/organs/blood.dm
@@ -186,6 +186,16 @@
 		temp_chem += R.id
 		temp_chem[R.id] = R.volume
 	B.data["trace_chem"] = list2params(temp_chem)
+	if(mind)
+		B.data["mind"] = mind
+	if(ckey)
+		B.data["ckey"] = ckey
+
+	if(!suiciding)
+		B.data["cloneable"] = 1
+	B.data["gender"] = gender
+	B.data["real_name"] = real_name
+	B.data["factions"] = faction
 	return B
 
 //For humans, blood does not appear from blue, it comes from vessels.