diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 6620ec5265..ef65f2dac3 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -28,31 +28,29 @@
/obj/item/storage/secure/examine(mob/user)
..()
- to_chat(user, text("The service panel is [src.open ? "open" : "closed"]."))
+ to_chat(user, text("The service panel is currently [open ? "unscrewed" : "screwed shut"]."))
/obj/item/storage/secure/attackby(obj/item/W, mob/user, params)
if(locked)
if (istype(W, /obj/item/screwdriver))
- if (do_after(user, 20*W.toolspeed, target = src))
- src.open =! src.open
- user.show_message("You [open ? "open" : "close"] the service panel.", 1)
+ if (do_after(user, 20*W.toolspeed, target = user))
+ open =! open
+ to_chat(user, "You [open ? "open" : "close"] the service panel.")
return
- if ((istype(W, /obj/item/device/multitool)) && (src.open == 1)&& (!src.l_hacking))
- user.show_message("Now attempting to reset internal memory, please hold.", 1)
- src.l_hacking = 1
- if (do_after(usr, 100*W.toolspeed, target = src))
- if (prob(33))
- src.l_setshort = 1
+ if (istype(W, /obj/item/wirecutters) || istype(W, /obj/item/card/emag))
+ to_chat(user, "[src] is protected from this sort of tampering, yet it appears the internal memory wires can still be pulsed.")
+ if ((istype(W, /obj/item/device/multitool)) && (!l_hacking))
+ if(src.open == 1)
+ to_chat(user, "Now attempting to reset internal memory, please hold.")
+ src.l_hacking = 1
+ if (do_after(usr, 400*W.toolspeed, target = user))
+ to_chat(user, "Internal memory reset - lock has been disengaged.")
src.l_set = 0
- user.show_message("Internal memory reset. Please give it a few seconds to reinitialize.", 1)
- sleep(80)
- src.l_setshort = 0
src.l_hacking = 0
else
- user.show_message("Unable to reset internal memory.", 1)
src.l_hacking = 0
else
- src.l_hacking = 0
+ to_chat(user, "You must unscrew the service panel before you can pulse the wiring.")
return
//At this point you have exhausted all the special things to do when locked
// ... but it's still locked.