From 5173ac321178dca476989cee87b05d552258488f Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Sun, 3 Jun 2018 05:57:21 -0700 Subject: [PATCH 1/3] Fix autoprocessing cloners --- code/game/machinery/computer/cloning.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 71c62327e6..6e9e468be2 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -276,8 +276,15 @@ if(href_list["task"]) switch(href_list["task"]) if("autoprocess") +<<<<<<< HEAD autoprocess = 1 playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) +======= + if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL) + autoprocess = TRUE + START_PROCESSING(SSmachines, src) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) +>>>>>>> ce2d790... Fix autoprocessing cloners (#38264) if("stopautoprocess") autoprocess = 0 playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) From cff10c62d0d1114bb13555d980dcbb3222900e10 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 5 Jun 2018 17:24:15 -0400 Subject: [PATCH 2/3] Update cloning.dm --- code/game/machinery/computer/cloning.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 6e9e468be2..8cbe9a68ec 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -276,15 +276,10 @@ if(href_list["task"]) switch(href_list["task"]) if("autoprocess") -<<<<<<< HEAD - autoprocess = 1 - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) -======= if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL) autoprocess = TRUE START_PROCESSING(SSmachines, src) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) ->>>>>>> ce2d790... Fix autoprocessing cloners (#38264) if("stopautoprocess") autoprocess = 0 playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) From 5858b790d78615d097a0e17a75d21755732d45e4 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 9 Jun 2018 00:34:01 -0400 Subject: [PATCH 3/3] Update cloning.dm --- code/game/machinery/computer/cloning.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 8cbe9a68ec..4846610671 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -1,3 +1,5 @@ +#define AUTOCLONING_MINIMAL_LEVEL 3 + /obj/machinery/computer/cloning name = "cloning console" desc = "Used to clone people and manage DNA." @@ -79,6 +81,10 @@ src.scanner = findscanner() if(findfirstcloner && !LAZYLEN(pods)) findcloner() + if(!autoprocess) + STOP_PROCESSING(SSmachines, src) + else + START_PROCESSING(SSmachines, src) /obj/machinery/computer/cloning/proc/findscanner() var/obj/machinery/dna_scannernew/scannerf = null @@ -151,7 +157,7 @@ var/dat = "" dat += "Refresh" - if(scanner && HasEfficientPod() && scanner.scan_level > 2) + if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL) if(!autoprocess) dat += "Autoprocess" else @@ -281,7 +287,8 @@ START_PROCESSING(SSmachines, src) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) if("stopautoprocess") - autoprocess = 0 + autoprocess = FALSE + STOP_PROCESSING(SSmachines, src) playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0) else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational())