From 57dd768950810d5d17a344acbff89b9c9f33684c Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 30 Oct 2019 23:11:50 -0700 Subject: [PATCH 1/4] makes cloning have no 2-second delay --- code/game/machinery/computer/cloning.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 5cbd2d8975..c19e0be343 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -296,15 +296,13 @@ loading = 1 src.updateUsrDialog() - playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) say("Initiating scan...") - spawn(20) - src.scan_occupant(scanner.occupant) - - loading = 0 - src.updateUsrDialog() - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + src.scan_occupant(scanner.occupant) + + loading = 0 + src.updateUsrDialog() + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) //No locking an open scanner. From 848c9dce0068e285da32578cb7ff7a607bb161ed Mon Sep 17 00:00:00 2001 From: Putnam Date: Thu, 31 Oct 2019 16:39:02 -0700 Subject: [PATCH 2/4] Revert "makes cloning have no 2-second delay" This reverts commit 57dd768950810d5d17a344acbff89b9c9f33684c. --- code/game/machinery/computer/cloning.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index c19e0be343..5cbd2d8975 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -296,13 +296,15 @@ loading = 1 src.updateUsrDialog() + playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) say("Initiating scan...") - src.scan_occupant(scanner.occupant) - - loading = 0 - src.updateUsrDialog() - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + spawn(20) + src.scan_occupant(scanner.occupant) + + loading = 0 + src.updateUsrDialog() + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) //No locking an open scanner. From d81d1c6b2d4dd894ac14c87476c9ad4d5275d8a2 Mon Sep 17 00:00:00 2001 From: Putnam Date: Thu, 31 Oct 2019 16:39:54 -0700 Subject: [PATCH 3/4] actually make it lock instead --- code/game/machinery/computer/cloning.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 5cbd2d8975..03949503e1 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -298,13 +298,14 @@ src.updateUsrDialog() playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) say("Initiating scan...") - + scanner.locked = TRUE spawn(20) src.scan_occupant(scanner.occupant) loading = 0 src.updateUsrDialog() playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + scanner.locked = FALSE //No locking an open scanner. From 64b812254851b3d3f17a6350fadd3c2807fc528f Mon Sep 17 00:00:00 2001 From: Putnam Date: Thu, 31 Oct 2019 16:46:04 -0700 Subject: [PATCH 4/4] made it go back to previous locked state instead --- code/game/machinery/computer/cloning.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 03949503e1..43cfbdb33b 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -298,6 +298,7 @@ src.updateUsrDialog() playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) say("Initiating scan...") + var/prev_locked = scanner.locked scanner.locked = TRUE spawn(20) src.scan_occupant(scanner.occupant) @@ -305,7 +306,7 @@ loading = 0 src.updateUsrDialog() playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) - scanner.locked = FALSE + scanner.locked = prev_locked //No locking an open scanner.