From 984252d3ae2c5744ca200a8ce731b6d1d83cfb98 Mon Sep 17 00:00:00 2001 From: ToasterBiome Date: Mon, 11 Apr 2022 16:40:31 -0500 Subject: [PATCH 1/5] Update cloning.dm --- code/game/machinery/computer/cloning.dm | 26 ++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index a1afc9915064..4ad3eb337f56 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -26,9 +26,9 @@ light_color = LIGHT_COLOR_BLUE -/obj/machinery/computer/cloning/Initialize() +/obj/machinery/computer/cloning/Initialize(mapload) . = ..() - updatemodules(TRUE) + updatemodules(TRUE,mapload) /obj/machinery/computer/cloning/Destroy() if(pods) @@ -89,16 +89,16 @@ records -= R -/obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner) +/obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner,mapload) scanner = findscanner() if(findfirstcloner && !LAZYLEN(pods)) - findcloner() + findcloner(extended_search = mapload) if(!autoprocess) STOP_PROCESSING(SSmachines, src) else START_PROCESSING(SSmachines, src) -/obj/machinery/computer/cloning/proc/findscanner() +/obj/machinery/computer/cloning/proc/findscanner(extended_search = FALSE) var/obj/machinery/dna_scannernew/scannerf = null // Loop through every direction @@ -114,14 +114,18 @@ // If no scanner was found, it will return null return null -/obj/machinery/computer/cloning/proc/findcloner() +/obj/machinery/computer/cloning/proc/findcloner(extended_search = FALSE) //extened_search is for things like box where the console is multiple tiles away from the actual pod var/obj/machinery/clonepod/podf = null - for(var/direction in GLOB.cardinals) - - podf = locate(/obj/machinery/clonepod, get_step(src, direction)) - if (!isnull(podf) && podf.is_operational()) - AttachCloner(podf) + if(extended_search) + for(var/obj/machinery/clonepod/podf in view(3,src)) + if(!isnull(podf) && podf.is_operational()) + attachCloner(podf) + else + for(var/direction in GLOB.cardinals) + podf = locate(/obj/machinery/clonepod, get_step(src, direction)) + if (!isnull(podf) && podf.is_operational()) + AttachCloner(podf) /obj/machinery/computer/cloning/proc/AttachCloner(obj/machinery/clonepod/pod) if(!pod.connected) From de005c5715d7ed7740f6549f5fa98ba78ad2c313 Mon Sep 17 00:00:00 2001 From: ToasterBiome Date: Mon, 11 Apr 2022 16:43:21 -0500 Subject: [PATCH 2/5] nah --- code/game/machinery/computer/cloning.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 4ad3eb337f56..f2b5333cc990 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -98,7 +98,7 @@ else START_PROCESSING(SSmachines, src) -/obj/machinery/computer/cloning/proc/findscanner(extended_search = FALSE) +/obj/machinery/computer/cloning/proc/findscanner() var/obj/machinery/dna_scannernew/scannerf = null // Loop through every direction From edffe3df8d44e5eb079da6332232411c75758740 Mon Sep 17 00:00:00 2001 From: ToasterBiome Date: Mon, 11 Apr 2022 16:46:23 -0500 Subject: [PATCH 3/5] fark --- code/game/machinery/computer/cloning.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index f2b5333cc990..e2f7371e26b2 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -120,7 +120,7 @@ if(extended_search) for(var/obj/machinery/clonepod/podf in view(3,src)) if(!isnull(podf) && podf.is_operational()) - attachCloner(podf) + AttachCloner(podf) else for(var/direction in GLOB.cardinals) podf = locate(/obj/machinery/clonepod, get_step(src, direction)) From 81390a00b49e05ad602b7169ad5dd426c31cc7a1 Mon Sep 17 00:00:00 2001 From: Byemoh Date: Mon, 11 Apr 2022 17:44:50 -0500 Subject: [PATCH 4/5] Update cloning.dm --- code/game/machinery/computer/cloning.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index e2f7371e26b2..3b29c7b23834 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -118,9 +118,9 @@ var/obj/machinery/clonepod/podf = null if(extended_search) - for(var/obj/machinery/clonepod/podf in view(3,src)) - if(!isnull(podf) && podf.is_operational()) - AttachCloner(podf) + for(var/obj/machinery/clonepod/pod in view(3,src)) + if(!isnull(pod) && pod.is_operational()) + AttachCloner(pod) else for(var/direction in GLOB.cardinals) podf = locate(/obj/machinery/clonepod, get_step(src, direction)) From c3a37e9cdbf9e33820c97c8a2b05500246c618c6 Mon Sep 17 00:00:00 2001 From: Byemoh Date: Fri, 15 Apr 2022 00:41:29 -0500 Subject: [PATCH 5/5] Update code/game/machinery/computer/cloning.dm Co-authored-by: nmajask --- code/game/machinery/computer/cloning.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 3b29c7b23834..a7ad64fb772e 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -92,7 +92,7 @@ /obj/machinery/computer/cloning/proc/updatemodules(findfirstcloner,mapload) scanner = findscanner() if(findfirstcloner && !LAZYLEN(pods)) - findcloner(extended_search = mapload) + findcloner(mapload) if(!autoprocess) STOP_PROCESSING(SSmachines, src) else