From 029a3f3abd75f9d2f1a466df03ce8e0b522f1a42 Mon Sep 17 00:00:00 2001 From: Graham Lloyd Date: Mon, 4 Aug 2014 14:52:51 -0400 Subject: [PATCH 1/2] fixes wall rechargers showing up as normal rechargers. --- code/game/machinery/recharger.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 5b4366259e..eec36aaf57 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -123,6 +123,7 @@ obj/machinery/recharger/update_icon() //we have an update_icon() in addition to // Atlantis: No need for that copy-pasta code, just use var to store icon_states instead. obj/machinery/recharger/wallcharger name = "wall recharger" + icon_state = "wrecharger0" icon_state_charged = "wrecharger2" icon_state_charging = "wrecharger1" icon_state_idle = "wrecharger0" From 2c30af61243a92a110c2d0a02501cf01688977bf Mon Sep 17 00:00:00 2001 From: Graham Lloyd Date: Mon, 4 Aug 2014 14:53:33 -0400 Subject: [PATCH 2/2] Fireaxe cabinet hacking now fails if player moves away --- .../structures/crates_lockers/closets/fireaxe.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 2090d76af5..87eb2cb811 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -25,10 +25,10 @@ if(istype(O, /obj/item/device/multitool)) user << "\red Resetting circuitry..." playsound(user, 'sound/machines/lockreset.ogg', 50, 1) - sleep(50) // Sleeping time~ - src.locked = 0 - user << "\blue You disable the locking modules." - update_icon() + if(do_after(user, 20)) + src.locked = 0 + user << " You disable the locking modules." + update_icon() return else if(istype(O, /obj/item/weapon)) var/obj/item/weapon/W = O @@ -87,6 +87,9 @@ src.locked = 1 user << "\blue You re-enable the locking modules." playsound(user, 'sound/machines/lockenable.ogg', 50, 1) + if(do_after(user,20)) + src.locked = 1 + user << " You re-enable the locking modules." return else localopened = !localopened