Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

locked cabinets actually cant be opened (#11225)

Browse Source 
Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
This commit is contained in:
rolfero
2022-09-12 18:42:55 +02:00
committed by GitHub
parent 5221601e77
commit 77d562d200
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Cabinet/ItemCabinetSystem.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Storage.Components;
using Content.Shared.Audio; using Content.Shared.Audio;
using Content.Shared.Cabinet; using Content.Shared.Cabinet;
using Content.Shared.Containers.ItemSlots; using Content.Shared.Containers.ItemSlots;
@@ -67,6 +68,9 @@ namespace Content.Server.Cabinet
if (args.Hands == null || !args.CanAccess || !args.CanInteract) if (args.Hands == null || !args.CanAccess || !args.CanInteract)
return; return;
if (TryComp<LockComponent>(uid, out var lockComponent) && lockComponent.Locked)
return;
// Toggle open verb // Toggle open verb
ActivationVerb toggleVerb = new(); ActivationVerb toggleVerb = new();
toggleVerb.Act = () => ToggleItemCabinet(uid, cabinet); toggleVerb.Act = () => ToggleItemCabinet(uid, cabinet);
@@ -100,6 +104,9 @@ namespace Content.Server.Cabinet
if (!Resolve(uid, ref cabinet)) if (!Resolve(uid, ref cabinet))
return; return;
if (TryComp<LockComponent>(uid, out var lockComponent) && lockComponent.Locked)
return;
cabinet.Opened = !cabinet.Opened; cabinet.Opened = !cabinet.Opened;
SoundSystem.Play(cabinet.DoorSound.GetSound(), Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.15f)); SoundSystem.Play(cabinet.DoorSound.GetSound(), Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.15f));
_itemSlotsSystem.SetLock(uid, cabinet.CabinetSlot, !cabinet.Opened); _itemSlotsSystem.SetLock(uid, cabinet.CabinetSlot, !cabinet.Opened);