diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.cs b/Content.Server/Storage/EntitySystems/StorageSystem.cs index 0b013babfc..90d1c40815 100644 --- a/Content.Server/Storage/EntitySystems/StorageSystem.cs +++ b/Content.Server/Storage/EntitySystems/StorageSystem.cs @@ -191,6 +191,9 @@ namespace Content.Server.Storage.EntitySystems if (!storageComp.ClickInsert) return; + if (TryComp(uid, out LockComponent? lockComponent) && lockComponent.Locked) + return; + Logger.DebugS(storageComp.LoggerName, $"Storage (UID {uid}) attacked by user (UID {args.User}) with entity (UID {args.Used})."); if (HasComp(uid)) @@ -209,6 +212,9 @@ namespace Content.Server.Storage.EntitySystems if (!TryComp(args.User, out var actor)) return; + if (TryComp(uid, out LockComponent? lockComponent) && lockComponent.Locked) + return; + OpenStorageUI(uid, args.User, storageComp); }