From d3643b021f3b50437e1990aa197a7f5f376ffcde Mon Sep 17 00:00:00 2001 From: "quartz235@gmail.com" Date: Tue, 7 Feb 2012 23:33:52 +0000 Subject: [PATCH] Fixed issue 352 - Hacking wallsafes/briefcases is now properly interruptible. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3053 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/secstorage/secstorage.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/secstorage/secstorage.dm b/code/game/objects/secstorage/secstorage.dm index c981897c27d..a9b3b976adc 100644 --- a/code/game/objects/secstorage/secstorage.dm +++ b/code/game/objects/secstorage/secstorage.dm @@ -122,7 +122,7 @@ if ((istype(W, /obj/item/device/multitool)) && (src.open == 1) && (src.locked ==1) && (!src.l_hacking)) user.show_message(text("\red Now attempting to reset internal memory, please hold."), 1) src.l_hacking = 1 - spawn(100) + if (do_after(usr, 100)) if (prob(40)) src.l_setshort = 1 src.l_set = 0 @@ -133,6 +133,7 @@ else user.show_message(text("\red Unable to reset internal memory."), 1) src.l_hacking = 0 + else src.l_hacking = 0 return if (src.contents.len >= 7) return