From 0570ec92c76c66001089b53fa3143a48bb526ea7 Mon Sep 17 00:00:00 2001 From: Orange Borg Date: Fri, 10 Apr 2015 21:42:57 +1200 Subject: [PATCH] Fix electronics check in airlock code Because needhand defaults to 1 (on) it was always returning false as the item was dropped before the do_after check --- code/game/objects/structures/door_assembly.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 71ad52a0388..3cb0bdbff92 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -525,21 +525,19 @@ obj/structure/door_assembly/New() playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) user.visible_message("[user] installs the electronics into the airlock assembly.", \ "You start to install electronics into the airlock assembly.") - user.drop_item() - W.loc = src + if(do_after(user, 40)) if( src.state != 1 ) - W.loc = src.loc return + + user.drop_item() + W.loc = src user << " You've installed the airlock electronics." src.state = 2 src.name = "near finished airlock assembly" src.electronics = W - else - W.loc = src.loc - //qdel(W) else if(istype(W, /obj/item/weapon/crowbar) && state == 2 ) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)