Change whitelist logic for parcel wrap (#40800)

* init

* review

diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs
index b19f4b845c172ff78f775fb3d3acc3eb2789236e..7ea6daeed8fb312f931906bd61343adac3da9073 100644 (file)
--- 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 61d8452b93b38894afc95548b4884a0012ba2e3d..8d7baa4339539f73b6ac819dec41f41c4e5f1e04 100644 (file)
--- 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