Remove capacitors and matter bins (#37725)

* Remove capacitors and matter bins

* fix migrations and yaml errors, remove parts fully

* Rename to "modular machine part"

* Sloth review

diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
index 06874f39edba2d4dd18fc5e4c6a90e73e6414957..491bf6b51057e1d00d2b21fde74b5cfc0b92710a 100644 (file)
--- a/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
@@ -18,7 +18,7 @@ public sealed class MachineConstruction : InteractionTest
         ClientAssertPrototype(Unfinished, Target);
         await Interact(Wrench, Cable);
         AssertPrototype(MachineFrame);
-        await Interact(ProtolatheBoard, Bin1, Bin1, Manipulator1, Manipulator1, Beaker, Beaker, Screw);
+        await Interact(ProtolatheBoard, Manipulator1, Manipulator1, Manipulator1, Manipulator1, Beaker, Beaker, Screw);
         AssertPrototype(Protolathe);
     }
 
@@ -36,8 +36,7 @@ public sealed class MachineConstruction : InteractionTest
             (Steel, 5),
             (Cable, 1),
             (Beaker, 2),
-            (Manipulator1, 2),
-            (Bin1, 2),
+            (Manipulator1, 4),
             (ProtolatheBoard, 1));
     }
 
@@ -52,7 +51,7 @@ public sealed class MachineConstruction : InteractionTest
         // Change it into an autolathe
         await InteractUsing("AutolatheMachineCircuitboard");
         AssertPrototype(MachineFrame);
-        await Interact(Bin1, Bin1, Bin1, Manipulator1, Glass, Screw);
+        await Interact(Manipulator1, Manipulator1, Manipulator1, Manipulator1, Glass, Screw);
         AssertPrototype("Autolathe");
     }
 }

diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
index aa58b30bf37f6640de6205bdc86e8ce081e099bc..5db5d91d0d433669b2145bbf14056da0b307b57a 100644 (file)
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
@@ -29,8 +29,6 @@ public abstract partial class InteractionTest
     protected const string Rod = "MetalRod";
 
     // Parts
-    protected const string Bin1 = "MatterBinStockPart";
-    protected const string Cap1 = "CapacitorStockPart";
     protected const string Manipulator1 = "MicroManipulatorStockPart";
     protected const string Battery1 = "PowerCellSmall";
     protected const string Battery4 = "PowerCellHyper";

diff --git a/Resources/Locale/en-US/recipes/tags.ftl b/Resources/Locale/en-US/recipes/tags.ftl
index fed4eb1af5463e74edbeeae5e4e23f8e4c1ebfe9..a5f564bdcc05deeb5da6aa65111333d6620bad41 100644 (file)
--- a/Resources/Locale/en-US/recipes/tags.ftl
+++ b/Resources/Locale/en-US/recipes/tags.ftl
@@ -32,7 +32,7 @@ construction-graph-tag-sun-glasses = sun glasses
 construction-graph-tag-security-helmet = security helmet
 
 # materials
-construction-graph-tag-capacitor = capacitor
+construction-graph-tag-manipulator = modular machine part
 construction-graph-tag-voice-trigger = a voice trigger
 construction-graph-tag-signal-trigger = a signal trigger
 construction-graph-tag-proximity-sensor = proximity sensor

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index 50620ec1403645b40090654ffdb05bedb9b611fc..6c604ddc1a3b935c35310a19d1e3b3d8ebd20106 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -181,7 +181,7 @@
     - id: MaterialSiloMachineCircuitboard
     - id: SheetSteel1
       amount: 5
-    - id: MatterBinStockPart
+    - id: MicroManipulatorStockPart
       amount: 4
     - id: CableApcStack1
       amount: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml
index 78b69899b9d629f913449beff5885bb2e516f931..9692fe434f2c2115229003bdc1c1503be141e270 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml
@@ -8,9 +8,7 @@
     CableApcStack: 2
     FlashlightLantern: 2
     PowerCellSmallPrinted: 3
-    MatterBinStockPart: 4
-    CapacitorStockPart: 4
-    MicroManipulatorStockPart: 4
+    MicroManipulatorStockPart: 12
   contrabandInventory:
     ProximitySensor: 1
     LeftArmBorg: 1

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
index ad840c306b47ebf9f46ba471945c02ab29b5d5c8..35e748f89c22235538e492ad1617cf0f5650f854 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
@@ -26,8 +26,6 @@
     - PowerCellSmall
     - PowerCellMedium
     - FlashlightLantern
-    - MatterBinStockPart
-    - CapacitorStockPart
     - MicroManipulatorStockPart
     - Beaker
     chance: 0.8
@@ -63,8 +61,6 @@
       - id: SheetGlass10
       - id: ToolboxElectricalFilled
       - id: ToolboxMechanicalFilled
-      - id: MatterBinStockPart
-      - id: CapacitorStockPart
       - id: MicroManipulatorStockPart
     # Rare Group
     - !type:GroupSelector

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
index e2ce2c8aff2fc4c4984def248dd6dd35ff00f4ee..44c662ceb48ab5bfc0a5970ebf424c51c08e3411 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
@@ -45,9 +45,7 @@
           state: icon
     - type: RandomSpawner
       rarePrototypes:
-        - CapacitorStockPart
         - MicroManipulatorStockPart
-        - MatterBinStockPart
         - CableHVStack10
         - WelderIndustrial
         - PowerCellHigh

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
index 6c6190c01a58409b577a3ce781b9b4383d0827d0..de2791fdc5daa35b1569140c401aef2a84a21b9f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
@@ -13,8 +13,7 @@
   - type: MachineBoard
     prototype: ShuttleGunSvalinnMachineGun
     stackRequirements:
-      MatterBin: 2
-      Manipulator: 4
+      Manipulator: 6
       Steel: 5
       CableHV: 5
 
@@ -31,8 +30,7 @@
   - type: MachineBoard
     prototype: ShuttleGunPerforator
     stackRequirements:
-      MatterBin: 4
-      Manipulator: 6
+      Manipulator: 10
       Steel: 10
       CableHV: 5
 
@@ -49,8 +47,7 @@
   - type: MachineBoard
     prototype: ShuttleGunFriendship
     stackRequirements:
-      MatterBin: 3
-      Manipulator: 2
+      Manipulator: 5
       Steel: 7
       CableHV: 5
 
@@ -67,8 +64,7 @@
   - type: MachineBoard
     prototype: ShuttleGunDuster
     stackRequirements:
-      MatterBin: 6
-      Manipulator: 4
+      Manipulator: 10
       Steel: 10
       CableHV: 5
       Uranium: 2
@@ -86,7 +82,6 @@
   - type: MachineBoard
     prototype: ShuttleGunKinetic
     stackRequirements:
-      MatterBin: 2
-      Manipulator: 3
+      Manipulator: 5
       Steel: 5
       CableHV: 2

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/holopad.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/holopad.yml
index 450a43c8d19eaf084af1204c2ef63170b09a25a9..fa34017e344c6ca25694b22ac944f5791c526be6 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/holopad.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/holopad.yml
@@ -7,6 +7,6 @@
     - type: MachineBoard
       prototype: Holopad
       stackRequirements:
-        Capacitor: 4
+        Manipulator: 4
         Cable: 4
-        Glass: 2
\ No newline at end of file
+        Glass: 2

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 48af55da3fa801b53ac3685300b9355fbdda510b..f6455390351fb528c3946a4d376d22106a4a3fb5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -7,8 +7,7 @@
     - type: MachineBoard
       prototype: Autolathe
       stackRequirements:
-        MatterBin: 3
-        Manipulator: 1
+        Manipulator: 4
         Glass: 1
 
 - type: entity
@@ -20,7 +19,7 @@
   - type: MachineBoard
     prototype: AutolatheHyperConvection
     stackRequirements:
-      MatterBin: 3
+      Manipulator: 3
       Glass: 1
     tagRequirements:
       Igniter:
@@ -38,8 +37,7 @@
   - type: MachineBoard
     prototype: Protolathe
     stackRequirements:
-      MatterBin: 2
-      Manipulator: 2
+      Manipulator: 4
     tagRequirements:
       GlassBeaker:
         amount: 2
@@ -56,7 +54,7 @@
   - type: MachineBoard
     prototype: ProtolatheHyperConvection
     stackRequirements:
-      MatterBin: 2
+      Manipulator: 4
     tagRequirements:
       GlassBeaker:
         amount: 2
@@ -76,7 +74,7 @@
   - type: MachineBoard
     prototype: Biofabricator
     stackRequirements:
-      MatterBin: 4
+      Manipulator: 4
       Glass: 1
 
 - type: entity
@@ -90,8 +88,7 @@
     - type: MachineBoard
       prototype: SecurityTechFab
       stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
       tagRequirements:
         GlassBeaker:
           amount: 2
@@ -108,8 +105,7 @@
     - type: MachineBoard
       prototype: AmmoTechFab
       stackRequirements:
-        MatterBin: 1
-        Manipulator: 1
+        Manipulator: 2
 
 - type: entity
   id: MedicalTechFabCircuitboard
@@ -122,8 +118,7 @@
     - type: MachineBoard
       prototype: MedicalTechFab
       stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
       tagRequirements:
         GlassBeaker:
           amount: 2
@@ -141,8 +136,7 @@
   - type: MachineBoard
     prototype: CircuitImprinter
     stackRequirements:
-      MatterBin: 1
-      Manipulator: 1
+      Manipulator: 2
     tagRequirements:
       GlassBeaker:
         amount: 2
@@ -159,7 +153,7 @@
   - type: MachineBoard
     prototype: CircuitImprinterHyperConvection
     stackRequirements:
-      MatterBin: 2
+      Manipulator: 2
     tagRequirements:
       GlassBeaker:
         amount: 2
@@ -178,8 +172,7 @@
   - type: MachineBoard
     prototype: ExosuitFabricator
     stackRequirements:
-      MatterBin: 1
-      Manipulator: 3
+      Manipulator: 4
       Glass: 5
   - type: GuideHelp
     guides:
@@ -210,7 +203,7 @@
   - type: MachineBoard
     prototype: Biogenerator
     stackRequirements:
-      MatterBin: 2
+      Manipulator: 2
     tagRequirements:
       GlassBeaker:
         amount: 1
@@ -224,8 +217,7 @@
   - type: MachineBoard
     prototype: UniformPrinter
     stackRequirements:
-      MatterBin: 1
-      Manipulator: 2
+      Manipulator: 3
 
 - type: entity
   id: VaccinatorMachineCircuitboard
@@ -237,8 +229,7 @@
   - type: MachineBoard
     prototype: Vaccinator
     stackRequirements:
-      MatterBin: 1
-      Manipulator: 1
+      Manipulator: 2
       Cable: 5
     tagRequirements:
         GlassBeaker:
@@ -276,8 +267,7 @@
     - type: MachineBoard
       prototype: MachineArtifactAnalyzer
       stackRequirements:
-        Manipulator: 3
-        Capacitor: 1
+        Manipulator: 1
         Glass: 5
 
 - type: entity
@@ -306,7 +296,7 @@
     - type: MachineBoard
       prototype: MachineAnomalyVessel
       stackRequirements:
-        Capacitor: 3
+        Manipulator: 3
         Cable: 1
         PlasmaGlass: 10
 
@@ -321,7 +311,7 @@
   - type: MachineBoard
     prototype: MachineAnomalyVesselExperimental
     stackRequirements:
-      Capacitor: 3
+      Manipulator: 3
       Cable: 5
       PlasmaGlass: 15
       MetalRod: 4
@@ -337,8 +327,7 @@
     - type: MachineBoard
       prototype: MachineAnomalySynchronizer
       stackRequirements:
-        Manipulator: 2
-        Capacitor: 5
+        Manipulator: 7
         PlasmaGlass: 5
         Cable: 5
 
@@ -353,7 +342,7 @@
     - type: MachineBoard
       prototype: MachineAPE
       stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
         Cable: 1
         Glass: 1
 
@@ -368,8 +357,7 @@
   - type: MachineBoard
     prototype: GasThermoMachineFreezer
     stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
       Cable: 5
   - type: Construction
     deconstructionTarget: null
@@ -387,8 +375,7 @@
   - type: MachineBoard
     prototype: GasThermoMachineHeater
     stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
       Cable: 5
   - type: Construction
     graph: ThermomachineBoard
@@ -406,8 +393,7 @@
   - type: MachineBoard
     prototype: GasThermoMachineHellfireFreezer
     stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
       Plasma: 1
   - type: Construction
     deconstructionTarget: null
@@ -425,8 +411,7 @@
   - type: MachineBoard
     prototype: GasThermoMachineHellfireHeater
     stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
       Plasma: 1
   - type: Construction
     graph: ThermomachineBoard
@@ -444,7 +429,7 @@
   - type: MachineBoard
     prototype: BaseGasCondenser
     stackRequirements:
-      MatterBin: 1
+      Manipulator: 1
       Glass: 1
 
 - type: entity
@@ -458,8 +443,7 @@
   - type: MachineBoard
     prototype: PortableScrubber
     stackRequirements:
-      MatterBin: 1
-      Manipulator: 2
+      Manipulator: 3
       Cable: 5
       Glass: 2
 
@@ -474,8 +458,7 @@
   - type: MachineBoard
     prototype: SpaceHeater
     stackRequirements:
-      MatterBin: 1
-      Capacitor: 2
+      Manipulator: 3
       Cable: 5
 
 - type: entity
@@ -489,8 +472,7 @@
     - type: MachineBoard
       prototype: CloningPod
       stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
         Glass: 1
         Cable: 1
 
@@ -505,7 +487,7 @@
     - type: MachineBoard
       prototype: MedicalScanner
       stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
         Glass: 5
         Cable: 1
 
@@ -546,7 +528,7 @@
     - type: MachineBoard
       prototype: ChemMaster
       stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
         Glass: 1
         Cable: 1
       tagRequirements:
@@ -565,7 +547,7 @@
     - type: MachineBoard
       prototype: ChemDispenserEmpty
       stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
         Glass: 1
         Steel: 3
       tagRequirements:
@@ -584,8 +566,7 @@
   - type: MachineBoard
     prototype: BiomassReclaimer
     stackRequirements:
-      MatterBin: 2
-      Manipulator: 1
+      Manipulator: 3
       Steel: 5
     tagRequirements:
       Knife:
@@ -623,8 +604,7 @@
     - type: MachineBoard
       prototype: SeedExtractor
       stackRequirements:
-        Manipulator: 2
-        Capacitor: 1
+        Manipulator: 3
         # replacing the console screen
         Glass: 1
         Cable: 2
@@ -641,7 +621,7 @@
     - type: MachineBoard
       prototype: SMESBasicEmpty
       stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
         CableHV: 10
       componentRequirements:
         PowerCell:
@@ -660,7 +640,7 @@
   - type: MachineBoard
     prototype: SMESAdvancedEmpty
     stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
       CableHV: 20
     componentRequirements:
       PowerCell:
@@ -679,7 +659,7 @@
     - type: MachineBoard
       prototype: PowerCellRecharger
       stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
         Cable: 5
     - type: PhysicalComposition
       materialComposition:
@@ -700,7 +680,7 @@
     - type: MachineBoard
       prototype: PowerCageRecharger
       stackRequirements:
-        Capacitor: 4
+        Manipulator: 4
         Steel: 5
         Cable: 10
     - type: PhysicalComposition
@@ -722,7 +702,7 @@
     - type: MachineBoard
       prototype: BorgCharger
       stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
         Cable: 5
     - type: PhysicalComposition
       materialComposition:
@@ -743,7 +723,7 @@
     - type: MachineBoard
       prototype: WeaponCapacitorRecharger
       stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
         CableMV: 5
     - type: PhysicalComposition
       materialComposition:
@@ -764,7 +744,7 @@
   - type: MachineBoard
     prototype: TurboItemRecharger
     stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
       CableMV: 5
   - type: PhysicalComposition
     materialComposition:
@@ -780,7 +760,7 @@
     - type: MachineBoard
       prototype: SubstationBasicEmpty
       stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
         CableMV: 5
         CableHV: 5
       componentRequirements:
@@ -840,7 +820,7 @@
     - type: MachineBoard
       prototype: PortableGeneratorPacman
       stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
         CableHV: 5
     - type: PhysicalComposition
       materialComposition:
@@ -860,7 +840,7 @@
   - type: MachineBoard
     prototype: Thruster
     stackRequirements:
-      Capacitor: 4
+      Manipulator: 4
       Steel: 5
 
 - type: entity
@@ -873,8 +853,7 @@
   - type: MachineBoard
     prototype: Gyroscope
     stackRequirements:
-      Manipulator: 2
-      Capacitor: 1
+      Manipulator: 3
       Glass: 2
 
 - type: entity
@@ -887,7 +866,7 @@
     - type: MachineBoard
       prototype: PortableGeneratorSuperPacman
       stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
         CableHV: 10
     - type: PhysicalComposition
       materialComposition:
@@ -907,7 +886,7 @@
     - type: MachineBoard
       prototype: PortableGeneratorJrPacman
       stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
         Cable: 10
     - type: PhysicalComposition
       materialComposition:
@@ -926,8 +905,7 @@
     - type: MachineBoard
       prototype: KitchenReagentGrinder
       stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
       tagRequirements:
         GlassBeaker:
           amount: 1
@@ -944,7 +922,7 @@
   - type: MachineBoard
     prototype: ChemistryHotplate
     stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
       Glass: 1
 
 - type: entity
@@ -958,7 +936,7 @@
   - type: MachineBoard
     prototype: KitchenElectricGrill
     stackRequirements:
-      Capacitor: 4
+      Manipulator: 4
       Glass: 2
       Cable: 5
 
@@ -972,8 +950,7 @@
     - type: MachineBoard
       prototype: StasisBed
       stackRequirements:
-        Capacitor: 1
-        Manipulator: 1
+        Manipulator: 2
         Cable: 3
         Steel: 2
 
@@ -988,7 +965,7 @@
   - type: MachineBoard
     prototype: MachineElectrolysisUnit
     stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
       Cable: 1
 
 - type: entity
@@ -1015,7 +992,7 @@
   - type: MachineBoard
     prototype: MachineMaterialSilo
     stackRequirements:
-      MatterBin: 4
+      Manipulator: 4
       Cable: 1
 
 - type: entity
@@ -1028,8 +1005,7 @@
     - type: MachineBoard
       prototype: OreProcessor
       stackRequirements:
-        MatterBin: 1
-        Manipulator: 3
+        Manipulator: 4
         Glass: 1
 
 - type: entity
@@ -1042,8 +1018,7 @@
   - type: MachineBoard
     prototype: OreProcessorIndustrial
     stackRequirements:
-      MatterBin: 1
-      Manipulator: 3
+      Manipulator: 4
       Glass: 1
 
 - type: entity
@@ -1054,8 +1029,7 @@
   - type: MachineBoard
     prototype: Sheetifier
     stackRequirements:
-      MatterBin: 1
-      Manipulator: 1
+      Manipulator: 2
 
 - type: entity
   id: MicrowaveMachineCircuitboard
@@ -1067,7 +1041,7 @@
     - type: MachineBoard
       prototype: KitchenMicrowave
       stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
         Glass: 2
         Cable: 2
     - type: Tag
@@ -1084,7 +1058,7 @@
     - type: MachineBoard
       prototype: SyndicateMicrowave
       stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
         Glass: 2
         Cable: 2
 
@@ -1113,8 +1087,7 @@
   - type: MachineBoard
     prototype: MachineFlatpacker
     stackRequirements:
-      Manipulator: 2
-      MatterBin: 1
+      Manipulator: 3
       Steel: 1
 
 - type: entity
@@ -1127,7 +1100,7 @@
     - type: MachineBoard
       prototype: Emitter
       stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
         CableHV: 5
         Glass: 2
 
@@ -1197,8 +1170,7 @@
   - type: MachineBoard
     prototype: GasRecycler
     stackRequirements:
-      Capacitor: 1
-      Manipulator: 1
+      Manipulator: 2
       Steel: 10
       Plasma: 5
 
@@ -1230,7 +1202,7 @@
     - type: MachineBoard
       prototype: CargoTelepad
       stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
         Steel: 5
 
 - type: entity
@@ -1244,7 +1216,7 @@
   - type: MachineBoard
     prototype: CargoMailTeleporter
     stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
       Steel: 5
 
 - type: entity
@@ -1289,7 +1261,7 @@
   - type: MachineBoard
     prototype: SalvageMagnet
     stackRequirements:
-      Capacitor: 4
+      Manipulator: 4
       Steel: 5
       CableHV: 5
       Cable: 2
@@ -1305,8 +1277,7 @@
   - type: MachineBoard
     prototype: GravityGeneratorMini
     stackRequirements:
-      Capacitor: 4
-      MatterBin: 3
+      Manipulator: 7
       Steel: 5
       CableHV: 5
       Uranium: 2
@@ -1320,8 +1291,7 @@
   - type: MachineBoard
     prototype: StationAnchor
     stackRequirements:
-      Capacitor: 4
-      MatterBin: 3
+      Manipulator: 7
       Steel: 10
       Glass: 5
       CableHV: 8
@@ -1335,8 +1305,7 @@
   - type: MachineBoard
     prototype: ReagentGrinderIndustrial
     stackRequirements:
-      MatterBin: 1
-      Manipulator: 3
+      Manipulator: 4
       Glass: 1
 
 - type: entity
@@ -1364,6 +1333,5 @@
     prototype: CutterMachine
     stackRequirements:
       Steel: 2
-      Capacitor: 1
-      Manipulator: 1
+      Manipulator: 2
       Cable: 1

diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 2f257db39651ba238a5f385025dd8fecda5dfd09..7d944602c5667700b2e4db3fa9e11c019bef48ff 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -12,41 +12,14 @@
     - type: Stack
       count: 1
 
-- type: entity
-  id: CapacitorStockPart
-  name: capacitor
-  parent: BaseStockPart
-  description: A basic capacitor used in the construction of a variety of devices.
-  suffix: Rating 1
-  components:
-    - type: Sprite
-      state: capacitor
-    - type: Tag
-      tags:
-        - CapacitorStockPart
-    - type: Stack
-      stackType: Capacitor
-
 - type: entity
   id: MicroManipulatorStockPart
-  name: manipulator
+  name: modular machine part
   parent: BaseStockPart
-  description: A basic manipulator used in the construction of a variety of devices.
+  description: A basic machine part used in the construction of a variety of devices.
   suffix: Rating 1
   components:
     - type: Sprite
       state: micro_mani
     - type: Stack
       stackType: Manipulator
-
-- type: entity
-  id: MatterBinStockPart
-  name: matter bin
-  parent: BaseStockPart
-  description: A basic matter bin used in the construction of a variety of devices.
-  suffix: Rating 1
-  components:
-    - type: Sprite
-      state: matter_bin
-    - type: Stack
-      stackType: MatterBin

diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 8e10e008065f14a110feec1c8c8100cb9f428659..db1127021524a6afd70d37418510180bed7e7650 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -247,12 +247,12 @@
   - type: ContainerFill
     containers:
       board: [ WallmountSubstationElectronics ]
-      capacitor: [ CapacitorStockPart ]
+      manipulator: [ MicroManipulatorStockPart ]
       powercell: [ PowerCellSmall ]
   - type: ContainerContainer
     containers:
       board: !type:Container
-      capacitor: !type:Container
+      manipulator: !type:Container
       powercell: !type:Container
 
       # Construction Frame

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
index 9b4435c6f0d1bd53c012f519e7531b6ddc0fe371..ef4fbc49b1094bf4200fc735635f55f322a9d954 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
@@ -27,7 +27,7 @@
                 sprite: Objects/Devices/communication.rsi
                 state: walkietalkie
               doAfter: 5
-            - material: Capacitor
+            - material: Manipulator
               amount: 2
               doAfter: 5
     - node: medsecHud

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
index 01225fa63ec9834b5516947f420adae8e842fe1d..7c08eba094646093f33499e948fec9ade68361d0 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
@@ -46,12 +46,12 @@
         doAfter: 1
     - to: memory_cell
       steps:
-      - tag: CapacitorStockPart
+      - tag: MicroManipulatorStockPart
         icon:
           sprite: Objects/Misc/stock_parts.rsi
-          state: capacitor
-        name: construction-graph-tag-capacitor
-      - material: Capacitor
+          state: micro_mani
+        name: construction-graph-tag-manipulator
+      - material: Manipulator
         amount: 1
       - material: Cable
         amount: 2
@@ -103,7 +103,7 @@
         doAfter: 2
       completed:
       - !type:SpawnPrototype
-        prototype: CapacitorStockPart
+        prototype: MicroManipulatorStockPart
       - !type:SpawnPrototype
         prototype: CableApcStack1
         amount: 2

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
index 6fdb516fe90556ba7e279aad4a22261ff34db33f..731222e28bd5301e104647bde52712f0dc173618 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
@@ -57,7 +57,7 @@
             sprite: "Objects/Power/power_cells.rsi"
             state: "medium"
           doAfter: 0.5
-        - material: Capacitor
+        - material: Manipulator
           amount: 1
           doAfter: 0.5
       - to: frame

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index c1c61a9036c6f261690ef863d77f47350f07d098..68162ed647ac2695d5a26b34f5d959df8977597a 100644 (file)
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -326,7 +326,7 @@
   group: Savory
   solids:
     FoodBreadBun: 1
-    CapacitorStockPart: 2
+    MicroManipulatorStockPart: 2
     # i would add steel to this recipe but the microwave explodes
 
 - type: microwaveMealRecipe

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
index c7ba3c131107bb58fb5982718e35ac2a2845aa92..37ee62bc50b9664851e8c85b4bd13abd842ff613 100644 (file)
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
@@ -60,7 +60,7 @@
             - material: Cable
               amount: 2
               doAfter: 1
-            - material: Capacitor
+            - material: Manipulator
               amount: 2
     - node: potatoaichip
       entity: PotatoAIChip

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
index 07bdc5f2ea7e0400df8dfbeb5f1d8d103a240a78..7a6dc325191b4641781b8e3b71422642ac195a21 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
@@ -11,8 +11,6 @@
   - Igniter
   - ModularReceiver
   - MicroManipulatorStockPart
-  - MatterBinStockPart
-  - CapacitorStockPart
   - ConveyorBeltAssembly
 
 - type: latheRecipePack

diff --git a/Resources/Prototypes/Recipes/Lathes/Parts.yml b/Resources/Prototypes/Recipes/Lathes/Parts.yml
index b870683a4474fd4dce328bdbd06b36653aca78fb..4d630c7bacc34fa38b3f9806f924cb5241e9bcdc 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/Parts.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Parts.yml
@@ -19,16 +19,6 @@
     Steel: 50
     Plastic: 50
 
-- type: latheRecipe
-  parent: BaseStockPartRecipe
-  id: CapacitorStockPart
-  result: CapacitorStockPart
-
-- type: latheRecipe
-  parent: BaseStockPartRecipe
-  id: MatterBinStockPart
-  result: MatterBinStockPart
-
 - type: latheRecipe
   parent: BaseStockPartRecipe
   id: MicroManipulatorStockPart

diff --git a/Resources/Prototypes/Stacks/science_stacks.yml b/Resources/Prototypes/Stacks/science_stacks.yml
index 3c9d95df11ced81fde1219c346d19dfb79cce744..caa24aba2a172df01a1e8097e99426b4d83db0f3 100644 (file)
--- a/Resources/Prototypes/Stacks/science_stacks.yml
+++ b/Resources/Prototypes/Stacks/science_stacks.yml
@@ -4,21 +4,9 @@
   spawn: ArtifactFragment1
   maxCount: 30
 
-- type: stack
-  id: Capacitor
-  name: stack-capacitor
-  icon: { sprite: /Textures/Objects/Misc/stock_parts.rsi, state: capacitor }
-  spawn: CapacitorStockPart
-  maxCount: 10
 
 - type: stack
   id: Manipulator
   name: stack-micro-manipulator
   spawn: MicroManipulatorStockPart
   maxCount: 10
-
-- type: stack
-  id: MatterBin
-  name: stack-matter-bin
-  spawn: MatterBinStockPart
-  maxCount: 10

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 50220afe6bf4a22108de1b7747aeca82e1aa0b87..47feb6824815077a89cd6af53b4ce395e22e7232 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -219,8 +219,6 @@
 - type: Tag
   id: CanPilot
 
-- type: Tag
-  id: CapacitorStockPart
 
 - type: Tag
   id: CaptainSabre

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 02076fa757b825494a22c1a6b2aa7fb5bfd5ee28..72a7961cf2fa4adbe7ba81f911a50b4b6d756e41 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -136,15 +136,14 @@ SalvagePartsT4Spawner: SalvageLootSpawner
 SalvagePartsT3Spawner: SalvageLootSpawner
 SalvagePartsT3T4Spawner: SalvageLootSpawner
 SalvagePartsT2Spawner: SalvageLootSpawner
-AdvancedCapacitorStockPart: CapacitorStockPart
-SuperCapacitorStockPart: CapacitorStockPart
-QuadraticCapacitorStockPart: CapacitorStockPart
-NanoManipulatorStockPart: MicroManipulatorStockPart
+#SuperCapacitorStockPart: CapacitorStockPart
+#QuadraticCapacitorStockPart: CapacitorStockPart
+#NanoManipulatorStockPart: MicroManipulatorStockPart
 PicoManipulatorStockPart: MicroManipulatorStockPart
 FemtoManipulatorStockPart: MicroManipulatorStockPart
-AdvancedMatterBinStockPart: MatterBinStockPart
-SuperMatterBinStockPart: MatterBinStockPart
-BluespaceMatterBinStockPart: MatterBinStockPart
+#AdvancedMatterBinStockPart: MatterBinStockPart
+#SuperMatterBinStockPart: MatterBinStockPart
+#BluespaceMatterBinStockPart: MatterBinStockPart
 AnsibleSubspaceStockPart: null
 FilterSubspaceStockPart: null
 AmplifierSubspaceStockPart: null
@@ -638,3 +637,7 @@ SuitStorageBasic: SuitStorageEVA
 
 # 2025-05-18
 ClothingNeckCloakMiner: null
+
+# 2025-05-22
+MatterBinStockPart: MicroManipulatorStockPart
+CapacitorStockPart: MicroManipulatorStockPart