From fea8ac45228f18ee7ad213560044a444a2c981e8 Mon Sep 17 00:00:00 2001 From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Date: Thu, 9 Oct 2025 15:00:13 +0200 Subject: [PATCH] Change whitelist logic for parcel wrap (#40800) * init * review --- .../ParcelWrap/Systems/ParcelWrappingSystem.cs | 3 +-- .../Prototypes/Entities/Objects/Misc/parcel_wrap.yml | 11 +++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs index b19f4b845c..7ea6daeed8 100644 --- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs +++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs @@ -51,7 +51,6 @@ public sealed partial class ParcelWrappingSystem : EntitySystem wrapper.Owner != target && // Wrapper should never be empty, but may as well make sure. !_charges.IsEmpty(wrapper.Owner) && - _whitelist.IsWhitelistPass(wrapper.Comp.Whitelist, target) && - _whitelist.IsBlacklistFail(wrapper.Comp.Blacklist, target); + _whitelist.CheckBoth(target, wrapper.Comp.Blacklist, wrapper.Comp.Whitelist); } } diff --git a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml index 61d8452b93..8d7baa4339 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml @@ -28,6 +28,17 @@ - type: LimitedCharges maxCharges: 30 +- type: entity + parent: ParcelWrap + id: ParcelWrapAdmeme + name: bluespace wrap + suffix: Admeme + description: Paper used contain items for transport. This one seems to be able to store an unusual amount of space within it. + components: + - type: ParcelWrap + whitelist: null + blacklist: null + - type: entity parent: BaseItem id: WrappedParcel