From 107ccfda1034a823f25be81e3c8e5630a82b2fcd Mon Sep 17 00:00:00 2001 From: SailorDave <6238888+SailorDave@users.noreply.github.com> Date: Fri, 6 Apr 2018 02:54:29 -0400 Subject: [PATCH] Tweaks mixed blood samples to preserve cloneable if the samples are the same (#36961) --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index e704b11375..7f3067cdf2 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -41,7 +41,8 @@ /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["blood_DNA"] != mix_data["blood_DNA"]) + data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning if the DNA sample doesn't match. if(data["viruses"] || mix_data["viruses"]) var/list/mix1 = data["viruses"]