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
2025-05-27 13:47:49 +02:00 · 2025-05-27 13:47:49 +02:00 · 2b5570f98b
parent e0d6db2b50
commit 2b5570f98b
22 changed files with 122 additions and 205 deletions
--- 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));
    }

@ -54,7 +53,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");
    }
 }
--- 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";
--- 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
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/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
@ -606,3 +605,7 @@ SuitStorageBasic: SuitStorageEVA

 # 2025-05-18
 ClothingNeckCloakMiner: null
+
+# 2025-05-22
+MatterBinStockPart: MicroManipulatorStockPart
+CapacitorStockPart: MicroManipulatorStockPart
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
+        Glass: 2
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@ -8,8 +8,7 @@
    - type: MachineBoard
      prototype: Autolathe
      stackRequirements:
-        MatterBin: 3
-        Manipulator: 1
+        Manipulator: 4
        Glass: 1

 - type: entity
@ -22,7 +21,7 @@
  - type: MachineBoard
    prototype: AutolatheHyperConvection
    stackRequirements:
-      MatterBin: 3
+      Manipulator: 3
      Glass: 1
    tagRequirements:
      Igniter:
@ -41,8 +40,7 @@
  - type: MachineBoard
    prototype: Protolathe
    stackRequirements:
-      MatterBin: 2
-      Manipulator: 2
+      Manipulator: 4
    tagRequirements:
      GlassBeaker:
        amount: 2
@ -60,7 +58,7 @@
  - type: MachineBoard
    prototype: ProtolatheHyperConvection
    stackRequirements:
-      MatterBin: 2
+      Manipulator: 4
    tagRequirements:
      GlassBeaker:
        amount: 2
@ -80,7 +78,7 @@
  - type: MachineBoard
    prototype: Biofabricator
    stackRequirements:
-      MatterBin: 4
+      Manipulator: 4
      Glass: 1

 - type: entity
@ -94,8 +92,7 @@
    - type: MachineBoard
      prototype: SecurityTechFab
      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
      tagRequirements:
        GlassBeaker:
          amount: 2
@ -112,8 +109,7 @@
    - type: MachineBoard
      prototype: AmmoTechFab
      stackRequirements:
-        MatterBin: 1
-        Manipulator: 1
+        Manipulator: 2

 - type: entity
  id: MedicalTechFabCircuitboard
@ -126,8 +122,7 @@
    - type: MachineBoard
      prototype: MedicalTechFab
      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
      tagRequirements:
        GlassBeaker:
          amount: 2
@ -145,8 +140,7 @@
  - type: MachineBoard
    prototype: CircuitImprinter
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 1
+      Manipulator: 2
    tagRequirements:
      GlassBeaker:
        amount: 2
@ -163,7 +157,7 @@
  - type: MachineBoard
    prototype: CircuitImprinterHyperConvection
    stackRequirements:
-      MatterBin: 2
+      Manipulator: 2
    tagRequirements:
      GlassBeaker:
        amount: 2
@ -182,8 +176,7 @@
  - type: MachineBoard
    prototype: ExosuitFabricator
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 3
+      Manipulator: 4
      Glass: 5
  - type: GuideHelp
    guides:
@ -214,7 +207,7 @@
  - type: MachineBoard
    prototype: Biogenerator
    stackRequirements:
-      MatterBin: 2
+      Manipulator: 2
    tagRequirements:
      GlassBeaker:
        amount: 1
@ -228,8 +221,7 @@
  - type: MachineBoard
    prototype: UniformPrinter
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 2
+      Manipulator: 3

 - type: entity
  id: VaccinatorMachineCircuitboard
@ -241,8 +233,7 @@
  - type: MachineBoard
    prototype: Vaccinator
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 1
+      Manipulator: 2
      Cable: 5
    tagRequirements:
        GlassBeaker:
@ -280,8 +271,7 @@
    - type: MachineBoard
      prototype: MachineArtifactAnalyzer
      stackRequirements:
-        Manipulator: 3
-        Capacitor: 1
+        Manipulator: 1
        Glass: 5

 - type: entity
@ -310,7 +300,7 @@
    - type: MachineBoard
      prototype: MachineAnomalyVessel
      stackRequirements:
-        Capacitor: 3
+        Manipulator: 3
        Cable: 1
        PlasmaGlass: 10
    - type: ReverseEngineering # Nyano
@ -329,7 +319,7 @@
  - type: MachineBoard
    prototype: MachineAnomalyVesselExperimental
    stackRequirements:
-      Capacitor: 3
+      Manipulator: 3
      Cable: 5
      PlasmaGlass: 15
      MetalRod: 4
@ -345,8 +335,7 @@
    - type: MachineBoard
      prototype: MachineAnomalySynchronizer
      stackRequirements:
-        Manipulator: 2
-        Capacitor: 5
+        Manipulator: 7
        PlasmaGlass: 5
        Cable: 5

@ -361,7 +350,7 @@
    - type: MachineBoard
      prototype: MachineAPE
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        Cable: 1
        Glass: 1
    - type: ReverseEngineering # DeltaV
@ -380,8 +369,7 @@
  - type: MachineBoard
    prototype: GasThermoMachineFreezer
    stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
      Cable: 5
  - type: Construction
    deconstructionTarget: null
@ -403,8 +391,7 @@
  - type: MachineBoard
    prototype: GasThermoMachineHeater
    stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
      Cable: 5
  - type: Construction
    graph: ThermomachineBoard
@ -422,8 +409,7 @@
  - type: MachineBoard
    prototype: GasThermoMachineHellfireFreezer
    stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
      Plasma: 1
  - type: Construction
    deconstructionTarget: null
@ -441,8 +427,7 @@
  - type: MachineBoard
    prototype: GasThermoMachineHellfireHeater
    stackRequirements:
-      MatterBin: 2
-      Capacitor: 2
+      Manipulator: 4
      Plasma: 1
  - type: Construction
    graph: ThermomachineBoard
@ -460,7 +445,7 @@
  - type: MachineBoard
    prototype: BaseGasCondenser
    stackRequirements:
-      MatterBin: 1
+      Manipulator: 1
      Glass: 1

 - type: entity
@ -474,8 +459,7 @@
  - type: MachineBoard
    prototype: PortableScrubber
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 2
+      Manipulator: 3
      Cable: 5
      Glass: 2
  - type: ReverseEngineering # Nayno
@ -494,8 +478,7 @@
  - type: MachineBoard
    prototype: SpaceHeater
    stackRequirements:
-      MatterBin: 1
-      Capacitor: 2
+      Manipulator: 3
      Cable: 5

 - type: entity
@ -509,8 +492,7 @@
    - type: MachineBoard
      prototype: CloningPod
      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
        Glass: 1
        Cable: 1
    - type: ReverseEngineering # Nyano
@ -529,7 +511,7 @@
    - type: MachineBoard
      prototype: MedicalScanner
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 5
        Cable: 1

@ -570,7 +552,7 @@
    - type: MachineBoard
      prototype: ChemMaster
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 1
        Cable: 1
      tagRequirements:
@ -589,7 +571,7 @@
    - type: MachineBoard
      prototype: ChemDispenserEmpty
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 1
        Steel: 3
      tagRequirements:
@ -608,8 +590,7 @@
  - type: MachineBoard
    prototype: BiomassReclaimer
    stackRequirements:
-      MatterBin: 2
-      Manipulator: 1
+      Manipulator: 3
      Steel: 5
    tagRequirements:
      Knife:
@ -647,8 +628,7 @@
    - type: MachineBoard
      prototype: SeedExtractor
      stackRequirements:
-        Manipulator: 2
-        Capacitor: 1
+        Manipulator: 3
        # replacing the console screen
        Glass: 1
        Cable: 2
@ -665,7 +645,7 @@
    - type: MachineBoard
      prototype: SMESBasicEmpty
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        CableHV: 10
      componentRequirements:
        PowerCell:
@ -684,7 +664,7 @@
  - type: MachineBoard
    prototype: SMESAdvancedEmpty
    stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
      CableHV: 20
    componentRequirements:
      PowerCell:
@ -703,7 +683,7 @@
    - type: MachineBoard
      prototype: PowerCellRecharger
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        Cable: 5
    - type: PhysicalComposition
      materialComposition:
@ -726,7 +706,7 @@
    - type: MachineBoard
      prototype: PowerCageRecharger
      stackRequirements:
-        Capacitor: 4
+        Manipulator: 4
        Steel: 5
        Cable: 10
    - type: PhysicalComposition
@ -748,7 +728,7 @@
    - type: MachineBoard
      prototype: BorgCharger
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        Cable: 5
    - type: PhysicalComposition
      materialComposition:
@ -771,7 +751,7 @@
    - type: MachineBoard
      prototype: WeaponCapacitorRecharger
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        CableMV: 5
    - type: PhysicalComposition
      materialComposition:
@ -792,7 +772,7 @@
  - type: MachineBoard
    prototype: TurboItemRecharger
    stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
      CableMV: 5
  - type: PhysicalComposition
    materialComposition:
@ -808,7 +788,7 @@
    - type: MachineBoard
      prototype: SubstationBasicEmpty
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        CableMV: 5
        CableHV: 5
      componentRequirements:
@ -868,7 +848,7 @@
    - type: MachineBoard
      prototype: PortableGeneratorPacman
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        CableHV: 5
    - type: PhysicalComposition
      materialComposition:
@ -888,7 +868,7 @@
  - type: MachineBoard
    prototype: Thruster
    stackRequirements:
-      Capacitor: 4
+      Manipulator: 4
      Steel: 5

 - type: entity
@ -901,8 +881,7 @@
  - type: MachineBoard
    prototype: Gyroscope
    stackRequirements:
-      Manipulator: 2
-      Capacitor: 1
+      Manipulator: 3
      Glass: 2

 - type: entity
@ -915,7 +894,7 @@
    - type: MachineBoard
      prototype: PortableGeneratorSuperPacman
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        CableHV: 10
    - type: PhysicalComposition
      materialComposition:
@ -935,7 +914,7 @@
    - type: MachineBoard
      prototype: PortableGeneratorJrPacman
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Cable: 10
    - type: PhysicalComposition
      materialComposition:
@ -954,8 +933,7 @@
    - type: MachineBoard
      prototype: KitchenReagentGrinder
      stackRequirements:
-        MatterBin: 2
-        Manipulator: 2
+        Manipulator: 4
      tagRequirements:
        GlassBeaker:
          amount: 1
@ -972,7 +950,7 @@
  - type: MachineBoard
    prototype: ChemistryHotplate
    stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
      Glass: 1

 - type: entity
@ -986,7 +964,7 @@
  - type: MachineBoard
    prototype: KitchenElectricGrill
    stackRequirements:
-      Capacitor: 4
+      Manipulator: 4
      Glass: 2
      Cable: 5

@ -1000,8 +978,7 @@
    - type: MachineBoard
      prototype: StasisBed
      stackRequirements:
-        Capacitor: 1
-        Manipulator: 1
+        Manipulator: 2
        Cable: 3
        Steel: 2
    - type: ReverseEngineering # Nyano
@ -1020,7 +997,7 @@
  - type: MachineBoard
    prototype: MachineElectrolysisUnit
    stackRequirements:
-      Capacitor: 2
+      Manipulator: 2
      Cable: 1

 - type: entity
@ -1047,7 +1024,7 @@
  - type: MachineBoard
    prototype: MachineMaterialSilo
    stackRequirements:
-      MatterBin: 4
+      Manipulator: 4
      Cable: 1

 - type: entity
@ -1060,8 +1037,7 @@
    - type: MachineBoard
      prototype: OreProcessor
      stackRequirements:
-        MatterBin: 1
-        Manipulator: 3
+        Manipulator: 4
        Glass: 1

 - type: entity
@ -1074,8 +1050,7 @@
  - type: MachineBoard
    prototype: OreProcessorIndustrial
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 3
+      Manipulator: 4
      Glass: 1
  - type: ReverseEngineering # delta
    difficulty: 2
@ -1090,8 +1065,7 @@
  - type: MachineBoard
    prototype: Sheetifier
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 1
+      Manipulator: 2
  - type: ReverseEngineering # delta
    difficulty: 2
    recipes:
@ -1107,7 +1081,7 @@
    - type: MachineBoard
      prototype: KitchenMicrowave
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 2
        Cable: 2
    - type: Tag
@ -1124,7 +1098,7 @@
    - type: MachineBoard
      prototype: SyndicateMicrowave
      stackRequirements:
-        Capacitor: 1
+        Manipulator: 1
        Glass: 2
        Cable: 2

@ -1157,8 +1131,7 @@
  - type: MachineBoard
    prototype: MachineFlatpacker
    stackRequirements:
-      Manipulator: 2
-      MatterBin: 1
+      Manipulator: 3
      Steel: 1
  - type: ReverseEngineering # delta
    difficulty: 2
@ -1175,7 +1148,7 @@
    - type: MachineBoard
      prototype: Emitter
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        CableHV: 5
        Glass: 2

@ -1261,8 +1234,7 @@
  - type: MachineBoard
    prototype: GasRecycler
    stackRequirements:
-      Capacitor: 1
-      Manipulator: 1
+      Manipulator: 2
      Steel: 10
      Plasma: 5
  - type: ReverseEngineering # Nyano
@ -1298,13 +1270,27 @@
    - type: MachineBoard
      prototype: CargoTelepad
      stackRequirements:
-        Capacitor: 2
+        Manipulator: 2
        Steel: 5
-        Bluespace: 2  # DeltaV Bluespace Exists
-    - type: ReverseEngineering # delta
-      difficulty: 4
-      recipes:
-        - CargoTelepadMachineCircuitboard
+
+- type: entity
+  id: MailTeleporterMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: mail teleporter machine board
+  description: A machine printed circuit board for a mail teleporter.
+  components:
+  - type: Sprite
+    state: supply
+  - type: MachineBoard
+    prototype: CargoMailTeleporter
+    stackRequirements:
+      Manipulator: 2
+      Steel: 5
+      Bluespace: 2  # DeltaV Bluespace Exists
+  - type: ReverseEngineering # delta
+    difficulty: 4
+    recipes:
+    - CargoTelepadMachineCircuitboard

 - type: entity
  id: SodaDispenserMachineCircuitboard
@ -1351,7 +1337,7 @@
  - type: MachineBoard
    prototype: SalvageMagnet
    stackRequirements:
-      Capacitor: 4
+      Manipulator: 4
      Steel: 5
      CableHV: 5
      Cable: 2
@ -1367,8 +1353,7 @@
  - type: MachineBoard
    prototype: GravityGeneratorMini
    stackRequirements:
-      Capacitor: 4
-      MatterBin: 3
+      Manipulator: 7
      Steel: 5
      CableHV: 5
      Uranium: 2
@ -1386,8 +1371,7 @@
  - type: MachineBoard
    prototype: StationAnchor
    stackRequirements:
-      Capacitor: 4
-      MatterBin: 3
+      Manipulator: 7
      Steel: 10
      Glass: 5
      CableHV: 8
@ -1401,8 +1385,7 @@
  - type: MachineBoard
    prototype: ReagentGrinderIndustrial
    stackRequirements:
-      MatterBin: 1
-      Manipulator: 3
+      Manipulator: 4
      Glass: 1
  - type: ReverseEngineering # delta
    difficulty: 2
@ -1434,8 +1417,7 @@
    prototype: CutterMachine
    stackRequirements:
      Steel: 2
-      Capacitor: 1
-      Manipulator: 1
+      Manipulator: 2
      Cable: 1

 # Shitmed Change Start
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@ -12,27 +12,11 @@
    - 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
-        - BorgStockPart # DeltaV - engiborgs can hold stock parts
-    - 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
@ -42,18 +26,3 @@
      - BorgStockPart
    - 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: Tag # DeltaV - engiborgs can hold stock parts
-      tags:
-      - BorgStockPart
-    - type: Stack
-      stackType: MatterBin
--- 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
--- 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
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
@ -46,7 +46,12 @@
        doAfter: 1
    - to: memory_cell
      steps:
-      - material: Capacitor
+      - tag: MicroManipulatorStockPart
+        icon:
+          sprite: Objects/Misc/stock_parts.rsi
+          state: micro_mani
+        name: construction-graph-tag-manipulator
+      - material: Manipulator
        amount: 1
      - material: Cable
        amount: 2
@ -98,7 +103,7 @@
        doAfter: 2
      completed:
      - !type:SpawnPrototype
-        prototype: CapacitorStockPart
+        prototype: MicroManipulatorStockPart
      - !type:SpawnPrototype
        prototype: CableApcStack1
        amount: 2
--- 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
--- 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
--- 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
--- a/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
@ -13,8 +13,6 @@
  - Igniter
  - ModularReceiver
  - MicroManipulatorStockPart
-  - MatterBinStockPart
-  - CapacitorStockPart
  - ConveyorBeltAssembly

 - type: latheRecipePack
--- 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
--- 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
--- 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