From 77d562d20093a58e2ee745abbe764623c2a095de Mon Sep 17 00:00:00 2001 From: rolfero <45628623+rolfero@users.noreply.github.com> Date: Mon, 12 Sep 2022 18:42:55 +0200 Subject: [PATCH] locked cabinets actually cant be opened (#11225) Co-authored-by: CommieFlowers --- Content.Server/Cabinet/ItemCabinetSystem.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Content.Server/Cabinet/ItemCabinetSystem.cs b/Content.Server/Cabinet/ItemCabinetSystem.cs index b84b382058..a5b77ac3ed 100644 --- a/Content.Server/Cabinet/ItemCabinetSystem.cs +++ b/Content.Server/Cabinet/ItemCabinetSystem.cs @@ -1,3 +1,4 @@ +using Content.Server.Storage.Components; using Content.Shared.Audio; using Content.Shared.Cabinet; using Content.Shared.Containers.ItemSlots; @@ -67,6 +68,9 @@ namespace Content.Server.Cabinet if (args.Hands == null || !args.CanAccess || !args.CanInteract) return; + if (TryComp(uid, out var lockComponent) && lockComponent.Locked) + return; + // Toggle open verb ActivationVerb toggleVerb = new(); toggleVerb.Act = () => ToggleItemCabinet(uid, cabinet); @@ -100,6 +104,9 @@ namespace Content.Server.Cabinet if (!Resolve(uid, ref cabinet)) return; + if (TryComp(uid, out var lockComponent) && lockComponent.Locked) + return; + cabinet.Opened = !cabinet.Opened; SoundSystem.Play(cabinet.DoorSound.GetSound(), Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.15f)); _itemSlotsSystem.SetLock(uid, cabinet.CabinetSlot, !cabinet.Opened);