From e90465bc7c6e52462929f9af7236dd285a530957 Mon Sep 17 00:00:00 2001 From: Wildkins Date: Thu, 3 Dec 2020 08:19:29 -0500 Subject: [PATCH] Fix paper-taping on lockers (#10713) --- code/game/objects/structures/crates_lockers/closets.dm | 2 ++ .../crates_lockers/closets/secure/secure_closets.dm | 3 ++- html/changelogs/johnwildkins-tape.yml | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/johnwildkins-tape.yml diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 3d42d37aa4b..710b0a534b5 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -314,6 +314,8 @@ user.drop_item() else if(istype(W, /obj/item/stack/packageWrap)) return + else if(istype(W, /obj/item/ducttape)) + return else if(W.iswelder()) var/obj/item/weldingtool/WT = W if(WT.isOn()) 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 d44317fac55..5cc7921d8c5 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 @@ -199,6 +199,8 @@ ) else togglelock(user) + else if(istype(W, /obj/item/ducttape)) + return else togglelock(user)//Attempt to lock locker if closed @@ -280,4 +282,3 @@ var/obj/structure/bigDelivery/BD = loc BD.unwrap() open() - diff --git a/html/changelogs/johnwildkins-tape.yml b/html/changelogs/johnwildkins-tape.yml new file mode 100644 index 00000000000..045c42fe705 --- /dev/null +++ b/html/changelogs/johnwildkins-tape.yml @@ -0,0 +1,6 @@ +author: JohnWildkins + +delete-after: True + +changes: + - bugfix: "Taping papers to lockers should no longer attempt to unlock/lock them."