Merge remote-tracking branch 'origin/master' into weapon-modules

Content.Shared/Lathe/SharedLatheSystem.cs

@@ -46,7 +46,7 @@ public abstract class SharedLatheSystem : EntitySystem
             var adjustedAmount = AdjustMaterial(needed, recipe.ApplyMaterialDiscount, component.MaterialUseMultiplier);
 
             var gridUid =
-                HasComp<BluespaceSiloComponent>(uid) &&
+                HasComp<BluespaceStorageComponent>(uid) &&
                 TryComp<TransformComponent>(uid, out var transformComponent)
                     ? transformComponent.GridUid
                     : null;

Content.Shared/Materials/SharedMaterialStorageSystem.cs

@@ -296,7 +296,7 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
         var multiplier = TryComp<StackComponent>(toInsert, out var stackComponent) ? stackComponent.Count : 1;
         var totalVolume = 0;
 
-        var gridUid = HasComp<BluespaceSiloComponent>(receiver) &&
+        var gridUid = HasComp<BluespaceStorageComponent>(receiver) &&
                       TryComp<TransformComponent>(receiver, out var transformComponent)
             ? transformComponent.GridUid
             : null;
@@ -348,8 +348,10 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
     {
         if (!Resolve(uid, ref component, false))
             return;
+
         var ev = new GetMaterialWhitelistEvent(uid);
         RaiseLocalEvent(uid, ref ev);
+
         component.MaterialWhiteList = ev.Whitelist;
         Dirty(uid, component);
     }

Content.Shared/Whitelist/EntityWhitelist.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Tag;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
@@ -31,6 +32,9 @@ namespace Content.Shared.Whitelist
         [NonSerialized]
         private List<ComponentRegistration>? _registrations = null;
 
+        [DataField(customTypeSerializer:typeof(PrototypeIdListSerializer<EntityPrototype>))]
+        public List<string>? Entities;
+
         /// <summary>
         ///     Tags that are allowed in the whitelist.
         /// </summary>

Content.Shared/_White/ShitSilo/BluespaceStorageComponent.cs

@@ -3,7 +3,7 @@
 namespace Content.Shared._White.ShitSilo;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class BluespaceSiloComponent : Component
+public sealed partial class BluespaceStorageComponent : Component
 {
 
 }