From cff10c62d0d1114bb13555d980dcbb3222900e10 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 5 Jun 2018 17:24:15 -0400 Subject: [PATCH] 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)