diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index b4dbfb8d6af..d772dde64c5 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -177,6 +177,13 @@ if(istype(I, /obj/item/storage) && length(I.contents) && user.a_intent != I_HURT) var/obj/item/storage/S = I + + if(istype(S, /obj/item/storage/secure)) + var/obj/item/storage/secure/secured_storage = S + if(secured_storage.locked) + to_chat(user, SPAN_WARNING("You can't empty \the [secured_storage] into \the [src]. It is locked.")) + return TRUE + user.visible_message("[user] empties \the [S] into \the [src].", SPAN_NOTICE("You empty \the [S] into \the [src]."), range = 3) for(var/obj/item/O in S.contents) S.remove_from_storage(O, src) diff --git a/html/changelogs/harryob-disposalbriefcase.yml b/html/changelogs/harryob-disposalbriefcase.yml new file mode 100644 index 00000000000..bfbf47c19d7 --- /dev/null +++ b/html/changelogs/harryob-disposalbriefcase.yml @@ -0,0 +1,6 @@ +author: harryob + +delete-after: True + +changes: + - bugfix: "Disposal units no longer bypass high tech locking devices."