Ore bag and box now use same component

Content.Shared/Storage/Components/MagnetPickupComponent.cs

@@ -11,12 +11,30 @@ public sealed partial class MagnetPickupComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("nextScan")]
     public TimeSpan NextScan = TimeSpan.Zero;
 
+    [ViewVariables(VVAccess.ReadWrite), DataField("range")]
+    public float Range = 1f;
+
     /// <summary>
-    /// What container slot the magnet needs to be in to work.
+    /// Whether the magnet is attached to a fixture (e.g. ore box) or not (e.g. ore bag)
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("isFixture")]
+    public bool IsFixture = false;
+
+    /// <summary>
+    /// What container slot the magnet needs to be in to work (if not a fixture)
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("slotFlags")]
     public SlotFlags SlotFlags = SlotFlags.BELT;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("range")]
-    public float Range = 1f;
+    /// <summary>
+    /// Is magnet active, when fixture is anchored?
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("pickupWhenAnchored")]
+    public bool PickupWhenAnchored = true;
+
+    /// <summary>
+    /// Is magnet active, when fixture is not anchored?
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("pickupWhenNotAnchored")]
+    public bool PickupWhenNotAnchored = true;
 }

Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs

@@ -56,10 +56,17 @@ public override void Update(float frameTime)
             if (storage.StorageUsed >= storage.StorageCapacityMax)
                 continue;
 
-            if (!_inventory.TryGetContainingSlot(uid, out var slotDef))
-                continue;
 
-            if ((slotDef.SlotFlags & comp.SlotFlags) == 0x0)
+            if (!comp.IsFixture)
+            {
+                if (!_inventory.TryGetContainingSlot(uid, out var slotDef))
+                    continue;
+
+                if ((slotDef.SlotFlags & comp.SlotFlags) == 0x0)
+                    continue;
+            }
+            // Magnet disabled in current fixture anchor state
+            else if (xform.Anchored && !comp.PickupWhenAnchored || !xform.Anchored && !comp.PickupWhenNotAnchored)
                 continue;
 
             var parentUid = xform.ParentUid;

Resources/Prototypes/Entities/Structures/Storage/ore_box.yml

@@ -70,7 +70,8 @@
       storagebase: !type:Container
         ents: [ ]
   - type: Dumpable              # Frontier
-  - type: ContainerMagnetPickup # Frontier
+  - type: MagnetPickup # Frontier
+    isFixture: true
     pickupWhenNotAnchored: true
     pickupWhenAnchored: false   
     range: 1.5  # Ore bag has a range of 1.0