juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream

Browse Source
This commit is contained in:
Ed
2024-06-02 11:01:34 +03:00
parent b032c38917 ba04f94e48
commit 6a5fae3403
518 changed files with 20010 additions and 13172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
View File

@@ -59,6 +59,7 @@ public abstract class SharedStorageSystem : EntitySystem
[Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
[Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
[Dependency] protected readonly UseDelaySystem UseDelay = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
private EntityQuery<ItemComponent> _itemQuery;
private EntityQuery<StackComponent> _stackQuery;
@@ -373,7 +374,7 @@ public abstract class SharedStorageSystem : EntitySystem
/// </summary>
private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInWorldEvent args)
{
if (args.Handled || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert))
if (args.Handled || !args.Complex || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert))
return;
// Toggle
@@ -869,13 +870,8 @@ public abstract class SharedStorageSystem : EntitySystem
return false;
}
if (storageComp.Whitelist?.IsValid(insertEnt, EntityManager) == false)
{
reason = "comp-storage-invalid-container";
return false;
}
if (storageComp.Blacklist?.IsValid(insertEnt, EntityManager) == true)
if (_whitelistSystem.IsWhitelistFail(storageComp.Whitelist, insertEnt) ||
_whitelistSystem.IsBlacklistPass(storageComp.Blacklist, insertEnt))
{
reason = "comp-storage-invalid-container";
return false;