From 186a4beab6acd178cc90979130258d29a5502b31 Mon Sep 17 00:00:00 2001 From: Shadow Quill Date: Tue, 26 Jan 2021 15:31:49 -0600 Subject: [PATCH 1/4] Makes wrenches only anchor lockers if they're open --- .../structures/crates_lockers/__closets.dm | 26 ++++++++++--------- .../closets/secure/secure_closets.dm | 26 ++++++++++--------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index 2706e11bd3..b5bb4c9899 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -260,7 +260,20 @@ return /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(opened) + if(W.is_wrench()) + if(opened) + if(anchored) + user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.") + else + user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") + if(do_after(user, 20 * W.toolspeed)) + if(!src) return + to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + anchored = !anchored + return + else + to_chat(user, "You can't reach the anchoring bolts when \the [src] is closed!") + else if(opened) if(istype(W, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = W MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet @@ -316,17 +329,6 @@ update_icon() for(var/mob/M in viewers(src)) M.show_message("[src] has been [sealed?"sealed":"unsealed"] by [user.name].", 3) - else if(W.is_wrench()) - if(sealed) - if(anchored) - user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.") - else - user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") - playsound(src, W.usesound, 50) - if(do_after(user, 20 * W.toolspeed)) - if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") - anchored = !anchored else attack_hand(user) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index e5fc47c64a..7448432a4d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -54,7 +54,20 @@ to_chat(user, "Access Denied") /obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(opened) + if(W.is_wrench()) + if(opened) + if(anchored) + user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.") + else + user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") + if(do_after(user, 20 * W.toolspeed)) + if(!src) return + to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + anchored = !anchored + return + else + to_chat(user, "You can't reach the anchoring bolts when \the [src] is closed!") + else if(opened) if(istype(W, /obj/item/weapon/storage/laundry_basket)) return ..(W,user) if(istype(W, /obj/item/weapon/grab)) @@ -77,17 +90,6 @@ spark_system.start() playsound(src, 'sound/weapons/blade1.ogg', 50, 1) playsound(src, "sparks", 50, 1) - else if(W.is_wrench()) - if(sealed) - if(anchored) - user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.") - else - user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") - if(do_after(user, 20 * W.toolspeed)) - if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") - anchored = !anchored - return else if(istype(W,/obj/item/weapon/packageWrap) || istype(W,/obj/item/weapon/weldingtool)) return ..(W,user) else From da42ba8ab621e787127a960a3fa6f5a711094ac0 Mon Sep 17 00:00:00 2001 From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Date: Wed, 27 Jan 2021 02:00:42 -0600 Subject: [PATCH 2/4] Fixes 1/2 of the span --- code/game/objects/structures/crates_lockers/__closets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index b5bb4c9899..d3d52456f3 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -272,7 +272,7 @@ anchored = !anchored return else - to_chat(user, "You can't reach the anchoring bolts when \the [src] is closed!") + to_chat(user, "You can't reach the anchoring bolts when \the door is closed!") else if(opened) if(istype(W, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = W From 92c923910c87595f06c812a64baf8cec36dcbcdb Mon Sep 17 00:00:00 2001 From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Date: Wed, 27 Jan 2021 02:01:47 -0600 Subject: [PATCH 3/4] Other half --- .../structures/crates_lockers/closets/secure/secure_closets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 7448432a4d..9fae830b44 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -66,7 +66,7 @@ anchored = !anchored return else - to_chat(user, "You can't reach the anchoring bolts when \the [src] is closed!") + to_chat(user, "You can't reach the anchoring bolts when the door is closed!") else if(opened) if(istype(W, /obj/item/weapon/storage/laundry_basket)) return ..(W,user) From fc6f7bf77c202d8310c15e8967a13a1dd111012f Mon Sep 17 00:00:00 2001 From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Date: Wed, 27 Jan 2021 02:02:19 -0600 Subject: [PATCH 4/4] Plus this --- code/game/objects/structures/crates_lockers/__closets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index d3d52456f3..f7e399a267 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -272,7 +272,7 @@ anchored = !anchored return else - to_chat(user, "You can't reach the anchoring bolts when \the door is closed!") + to_chat(user, "You can't reach the anchoring bolts when the door is closed!") else if(opened) if(istype(W, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = W