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

Merge remote-tracking branch 'upstream/master' into ed-04-06-2024-upstream

Browse Source 
# Conflicts:
#	Resources/Prototypes/Accents/word_replacements.yml
This commit is contained in:
Ed
2024-06-04 18:09:38 +03:00
parent 95b726c0ff d5019cee96
commit b891542ca9
418 changed files with 3648 additions and 3761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Inventory/InventorySystem.Equip.cs
View File

@@ -11,6 +11,7 @@ using Content.Shared.Item;
using Content.Shared.Movement.Systems;
using Content.Shared.Popups;
using Content.Shared.Strip.Components;
using Content.Shared.Whitelist;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.Timing;
@@ -30,6 +31,7 @@ public abstract partial class InventorySystem
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
[ValidatePrototypeId<ItemSizePrototype>]
private const string PocketableItemSize = "Small";
@@ -267,13 +269,8 @@ public abstract partial class InventorySystem
return false;
}
if (slotDefinition.Whitelist != null && !slotDefinition.Whitelist.IsValid(itemUid))
{
reason = "inventory-component-can-equip-does-not-fit";
return false;
}
if (slotDefinition.Blacklist != null && slotDefinition.Blacklist.IsValid(itemUid))
if (_whitelistSystem.IsWhitelistFail(slotDefinition.Whitelist, itemUid) ||
_whitelistSystem.IsBlacklistPass(slotDefinition.Blacklist, itemUid))
{
reason = "inventory-component-can-equip-does-not-fit";
return false;