From 82096b5338621d657edfba8cd8d430b8a164b256 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 27 Mar 2019 12:23:12 +0100 Subject: [PATCH] also supports the directly put in body thing --- code/game/machinery/computer/cloning.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 7b9f74edbd6..8c7599a3189 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -44,10 +44,14 @@ // Prevent double cloning for(var/obj/machinery/clonepod/pod in pods) if(pod.occupant) - for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here - if(hook.soulowner.ckey == lastEntry.ckey) - toClone.Remove(lastEntry) // Fucker is getting cloned. No two bodies greedy shit - break + if(pod.occupant.ckey == null) // Uses soulhooks + for(var/datum/soullink/soulhook/hook in pod.sharedSoulhooks) //Check the soul hooks to see if the to be cloned person is in here + if(hook.soulowner.ckey == lastEntry.ckey) + toClone.Remove(lastEntry) // Guy is getting cloned so remove the entry + break + else if(pod.occupant.ckey == lastEntry.ckey) // Directly put in body + toClone.Remove(lastEntry) // Guy is getting cloned so remove the entry + break for(var/obj/machinery/clonepod/pod in pods) if(!(pod.occupant || pod.mess) && (pod.efficiency > 5))