From 1e71b32ac772ed538c8d4efad5e28f57b7078004 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 25 Jan 2024 02:01:32 +0200 Subject: [PATCH] Flip --- .../Components/MaterialReclaimerMagnetPickupComponent.cs | 2 +- .../Components/MaterialStorageMagnetPickupComponent.cs | 2 +- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 4 ---- .../Entities/Structures/Machines/material_reclaimer.yml | 1 + .../Structures/Power/Generation/portable_generator.yml | 2 -- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Content.Shared/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs b/Content.Shared/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs index d24089e9ee2..e5096d00a26 100644 --- a/Content.Shared/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs +++ b/Content.Shared/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs @@ -16,5 +16,5 @@ public sealed partial class MaterialReclaimerMagnetPickupComponent : Component /// Frontier - Is the magnet currently enabled? /// [ViewVariables(VVAccess.ReadWrite), DataField("magnetEnabled")] - public bool MagnetEnabled = true; + public bool MagnetEnabled = false; } diff --git a/Content.Shared/Storage/Components/MaterialStorageMagnetPickupComponent.cs b/Content.Shared/Storage/Components/MaterialStorageMagnetPickupComponent.cs index 9dc39424aba..999c96c1945 100644 --- a/Content.Shared/Storage/Components/MaterialStorageMagnetPickupComponent.cs +++ b/Content.Shared/Storage/Components/MaterialStorageMagnetPickupComponent.cs @@ -16,5 +16,5 @@ public sealed partial class MaterialStorageMagnetPickupComponent : Component /// Frontier - Is the magnet currently enabled? /// [ViewVariables(VVAccess.ReadWrite), DataField("magnetEnabled")] - public bool MagnetEnabled = true; + public bool MagnetEnabled = false; } diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2b543fc6519..f7fde74674e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -51,7 +51,6 @@ - type: TechnologyDatabase - type: MaterialStorageMagnetPickup # Frontier range: 0.30 - magnetEnabled: false - type: entity id: Autolathe @@ -883,9 +882,6 @@ - IngotGold30 - IngotSilver30 - MaterialBananium10 - - type: MaterialStorageMagnetPickup # Frontier - range: 0.30 - magnetEnabled: true - type: entity parent: BaseLathe diff --git a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml index 3e5a6930957..7925599add9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml @@ -104,3 +104,4 @@ powerLoad: 500 # Allows us to not use the 1000 baseline - type: MaterialReclaimerMagnetPickup # Frontier range: 0.30 + magnetEnabled: true \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml index e445ff5de60..8b0f1f319f3 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml @@ -172,7 +172,6 @@ moleRatio: 0.5 - type: MaterialStorageMagnetPickup # Frontier range: 0.30 - magnetEnabled: false - type: entity name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator @@ -224,7 +223,6 @@ scaling: Exponential - type: MaterialStorageMagnetPickup # Frontier range: 0.30 - magnetEnabled: false - type: entity name: J.R.P.A.C.M.A.N.-type portable generator