tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove capacitors and matter bins (#37725)

Browse Source 
* Remove capacitors and matter bins

* fix migrations and yaml errors, remove parts fully

* Rename to "modular machine part"

* Sloth review
This commit is contained in:
Simon
2025-05-27 13:47:49 +02:00
committed by GitHub
parent a371c15748
commit 2bbe66cea9
22 changed files with 102 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.IntegrationTests/Tests/Construction/Interaction/MachineConstruction.cs
View File

@@ -18,7 +18,7 @@ public sealed class MachineConstruction : InteractionTest
ClientAssertPrototype(Unfinished, Target); ClientAssertPrototype(Unfinished, Target);
await Interact(Wrench, Cable); await Interact(Wrench, Cable);
AssertPrototype(MachineFrame); AssertPrototype(MachineFrame);
await Interact(ProtolatheBoard, Bin1, Bin1, Manipulator1, Manipulator1, Beaker, Beaker, Screw); await Interact(ProtolatheBoard, Manipulator1, Manipulator1, Manipulator1, Manipulator1, Beaker, Beaker, Screw);
AssertPrototype(Protolathe); AssertPrototype(Protolathe);
} }
@@ -36,8 +36,7 @@ public sealed class MachineConstruction : InteractionTest
(Steel, 5), (Steel, 5),
(Cable, 1), (Cable, 1),
(Beaker, 2), (Beaker, 2),
(Manipulator1, 2), (Manipulator1, 4),
(Bin1, 2),
(ProtolatheBoard, 1)); (ProtolatheBoard, 1));
} }
@@ -52,7 +51,7 @@ public sealed class MachineConstruction : InteractionTest
// Change it into an autolathe // Change it into an autolathe
await InteractUsing("AutolatheMachineCircuitboard"); await InteractUsing("AutolatheMachineCircuitboard");
AssertPrototype(MachineFrame); AssertPrototype(MachineFrame);
await Interact(Bin1, Bin1, Bin1, Manipulator1, Glass, Screw); await Interact(Manipulator1, Manipulator1, Manipulator1, Manipulator1, Glass, Screw);
AssertPrototype("Autolathe"); AssertPrototype("Autolathe");
} }
} }

2
Content.IntegrationTests/Tests/Interaction/InteractionTest.Constants.cs
View File

@@ -29,8 +29,6 @@ public abstract partial class InteractionTest
protected const string Rod = "MetalRod"; protected const string Rod = "MetalRod";
// Parts // Parts
protected const string Bin1 = "MatterBinStockPart";
protected const string Cap1 = "CapacitorStockPart";
protected const string Manipulator1 = "MicroManipulatorStockPart"; protected const string Manipulator1 = "MicroManipulatorStockPart";
protected const string Battery1 = "PowerCellSmall"; protected const string Battery1 = "PowerCellSmall";
protected const string Battery4 = "PowerCellHyper"; protected const string Battery4 = "PowerCellHyper";

2
Resources/Locale/en-US/recipes/tags.ftl
View File

@@ -32,7 +32,7 @@ construction-graph-tag-sun-glasses = sun glasses
construction-graph-tag-security-helmet = security helmet construction-graph-tag-security-helmet = security helmet
# materials # materials
construction-graph-tag-capacitor = capacitor construction-graph-tag-manipulator = modular machine part
construction-graph-tag-voice-trigger = a voice trigger construction-graph-tag-voice-trigger = a voice trigger
construction-graph-tag-signal-trigger = a signal trigger construction-graph-tag-signal-trigger = a signal trigger
construction-graph-tag-proximity-sensor = proximity sensor construction-graph-tag-proximity-sensor = proximity sensor

2
Resources/Prototypes/Catalog/Fills/Crates/materials.yml
View File

@@ -181,7 +181,7 @@
- id: MaterialSiloMachineCircuitboard - id: MaterialSiloMachineCircuitboard
- id: SheetSteel1 - id: SheetSteel1
amount: 5 amount: 5
- id: MatterBinStockPart - id: MicroManipulatorStockPart
amount: 4 amount: 4
- id: CableApcStack1 - id: CableApcStack1
amount: 2 amount: 2

4
Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml
View File

@@ -8,9 +8,7 @@
CableApcStack: 2 CableApcStack: 2
FlashlightLantern: 2 FlashlightLantern: 2
PowerCellSmallPrinted: 3 PowerCellSmallPrinted: 3
MatterBinStockPart: 4 MicroManipulatorStockPart: 12
CapacitorStockPart: 4
MicroManipulatorStockPart: 4
contrabandInventory: contrabandInventory:
ProximitySensor: 1 ProximitySensor: 1
LeftArmBorg: 1 LeftArmBorg: 1

4
Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
View File

@@ -26,8 +26,6 @@
- PowerCellSmall - PowerCellSmall
- PowerCellMedium - PowerCellMedium
- FlashlightLantern - FlashlightLantern
- MatterBinStockPart
- CapacitorStockPart
- MicroManipulatorStockPart - MicroManipulatorStockPart
- Beaker - Beaker
chance: 0.8 chance: 0.8
@@ -63,8 +61,6 @@
- id: SheetGlass10 - id: SheetGlass10
- id: ToolboxElectricalFilled - id: ToolboxElectricalFilled
- id: ToolboxMechanicalFilled - id: ToolboxMechanicalFilled
- id: MatterBinStockPart
- id: CapacitorStockPart
- id: MicroManipulatorStockPart - id: MicroManipulatorStockPart
# Rare Group # Rare Group
- !type:GroupSelector - !type:GroupSelector

2
Resources/Prototypes/Entities/Markers/Spawners/Random/industrial.yml
View File

@@ -45,9 +45,7 @@
state: icon state: icon
- type: RandomSpawner - type: RandomSpawner
rarePrototypes: rarePrototypes:
- CapacitorStockPart
- MicroManipulatorStockPart - MicroManipulatorStockPart
- MatterBinStockPart
- CableHVStack10 - CableHVStack10
- WelderIndustrial - WelderIndustrial
- PowerCellHigh - PowerCellHigh

15
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
View File

@@ -13,8 +13,7 @@
- type: MachineBoard - type: MachineBoard
prototype: ShuttleGunSvalinnMachineGun prototype: ShuttleGunSvalinnMachineGun
stackRequirements: stackRequirements:
MatterBin: 2 Manipulator: 6
Manipulator: 4
Steel: 5 Steel: 5
CableHV: 5 CableHV: 5
@@ -31,8 +30,7 @@
- type: MachineBoard - type: MachineBoard
prototype: ShuttleGunPerforator prototype: ShuttleGunPerforator
stackRequirements: stackRequirements:
MatterBin: 4 Manipulator: 10
Manipulator: 6
Steel: 10 Steel: 10
CableHV: 5 CableHV: 5
@@ -49,8 +47,7 @@
- type: MachineBoard - type: MachineBoard
prototype: ShuttleGunFriendship prototype: ShuttleGunFriendship
stackRequirements: stackRequirements:
MatterBin: 3 Manipulator: 5
Manipulator: 2
Steel: 7 Steel: 7
CableHV: 5 CableHV: 5
@@ -67,8 +64,7 @@
- type: MachineBoard - type: MachineBoard
prototype: ShuttleGunDuster prototype: ShuttleGunDuster
stackRequirements: stackRequirements:
MatterBin: 6 Manipulator: 10
Manipulator: 4
Steel: 10 Steel: 10
CableHV: 5 CableHV: 5
Uranium: 2 Uranium: 2
@@ -86,7 +82,6 @@
- type: MachineBoard - type: MachineBoard
prototype: ShuttleGunKinetic prototype: ShuttleGunKinetic
stackRequirements: stackRequirements:
MatterBin: 2 Manipulator: 5
Manipulator: 3
Steel: 5 Steel: 5
CableHV: 2 CableHV: 2

2
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/holopad.yml
View File

@@ -7,6 +7,6 @@
- type: MachineBoard - type: MachineBoard
prototype: Holopad prototype: Holopad
stackRequirements: stackRequirements:
Capacitor: 4 Manipulator: 4
Cable: 4 Cable: 4
Glass: 2 Glass: 2

164
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
View File

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

31
Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
View File

@@ -12,41 +12,14 @@
- type: Stack - type: Stack
count: 1 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 - type: entity
id: MicroManipulatorStockPart id: MicroManipulatorStockPart
name: manipulator name: modular machine part
parent: BaseStockPart 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 suffix: Rating 1
components: components:
- type: Sprite - type: Sprite
state: micro_mani state: micro_mani
- type: Stack - type: Stack
stackType: Manipulator 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

4
Resources/Prototypes/Entities/Structures/Power/substation.yml
View File

@@ -247,12 +247,12 @@
- type: ContainerFill - type: ContainerFill
containers: containers:
board: [ WallmountSubstationElectronics ] board: [ WallmountSubstationElectronics ]
capacitor: [ CapacitorStockPart ] manipulator: [ MicroManipulatorStockPart ]
powercell: [ PowerCellSmall ] powercell: [ PowerCellSmall ]
- type: ContainerContainer - type: ContainerContainer
containers: containers:
board: !type:Container board: !type:Container
capacitor: !type:Container manipulator: !type:Container
powercell: !type:Container powercell: !type:Container
# Construction Frame # Construction Frame

2
Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
View File

@@ -27,7 +27,7 @@
sprite: Objects/Devices/communication.rsi sprite: Objects/Devices/communication.rsi
state: walkietalkie state: walkietalkie
doAfter: 5 doAfter: 5
- material: Capacitor - material: Manipulator
amount: 2 amount: 2
doAfter: 5 doAfter: 5
- node: medsecHud - node: medsecHud

10
Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
View File

@@ -46,12 +46,12 @@
doAfter: 1 doAfter: 1
- to: memory_cell - to: memory_cell
steps: steps:
- tag: CapacitorStockPart - tag: MicroManipulatorStockPart
icon: icon:
sprite: Objects/Misc/stock_parts.rsi sprite: Objects/Misc/stock_parts.rsi
state: capacitor state: micro_mani
name: construction-graph-tag-capacitor name: construction-graph-tag-manipulator
- material: Capacitor - material: Manipulator
amount: 1 amount: 1
- material: Cable - material: Cable
amount: 2 amount: 2
@@ -103,7 +103,7 @@
doAfter: 2 doAfter: 2
completed: completed:
- !type:SpawnPrototype - !type:SpawnPrototype
prototype: CapacitorStockPart prototype: MicroManipulatorStockPart
- !type:SpawnPrototype - !type:SpawnPrototype
prototype: CableApcStack1 prototype: CableApcStack1
amount: 2 amount: 2

2
Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
View File

@@ -57,7 +57,7 @@
sprite: "Objects/Power/power_cells.rsi" sprite: "Objects/Power/power_cells.rsi"
state: "medium" state: "medium"
doAfter: 0.5 doAfter: 0.5
- material: Capacitor - material: Manipulator
amount: 1 amount: 1
doAfter: 0.5 doAfter: 0.5
- to: frame - to: frame

2
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
View File

@@ -326,7 +326,7 @@
group: Savory group: Savory
solids: solids:
FoodBreadBun: 1 FoodBreadBun: 1
CapacitorStockPart: 2 MicroManipulatorStockPart: 2
# i would add steel to this recipe but the microwave explodes # i would add steel to this recipe but the microwave explodes
- type: microwaveMealRecipe - type: microwaveMealRecipe

2
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
View File

@@ -60,7 +60,7 @@
- material: Cable - material: Cable
amount: 2 amount: 2
doAfter: 1 doAfter: 1
- material: Capacitor - material: Manipulator
amount: 2 amount: 2
- node: potatoaichip - node: potatoaichip
entity: PotatoAIChip entity: PotatoAIChip

2
Resources/Prototypes/Recipes/Lathes/Packs/shared.yml
View File

@@ -11,8 +11,6 @@
- Igniter - Igniter
- ModularReceiver - ModularReceiver
- MicroManipulatorStockPart - MicroManipulatorStockPart
- MatterBinStockPart
- CapacitorStockPart
- ConveyorBeltAssembly - ConveyorBeltAssembly
- type: latheRecipePack - type: latheRecipePack

10
Resources/Prototypes/Recipes/Lathes/Parts.yml
View File

@@ -19,16 +19,6 @@
Steel: 50 Steel: 50
Plastic: 50 Plastic: 50
- type: latheRecipe
parent: BaseStockPartRecipe
id: CapacitorStockPart
result: CapacitorStockPart
- type: latheRecipe
parent: BaseStockPartRecipe
id: MatterBinStockPart
result: MatterBinStockPart
- type: latheRecipe - type: latheRecipe
parent: BaseStockPartRecipe parent: BaseStockPartRecipe
id: MicroManipulatorStockPart id: MicroManipulatorStockPart

12
Resources/Prototypes/Stacks/science_stacks.yml
View File

@@ -4,21 +4,9 @@
spawn: ArtifactFragment1 spawn: ArtifactFragment1
maxCount: 30 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 - type: stack
id: Manipulator id: Manipulator
name: stack-micro-manipulator name: stack-micro-manipulator
spawn: MicroManipulatorStockPart spawn: MicroManipulatorStockPart
maxCount: 10 maxCount: 10
- type: stack
id: MatterBin
name: stack-matter-bin
spawn: MatterBinStockPart
maxCount: 10

2
Resources/Prototypes/tags.yml
View File

@@ -219,8 +219,6 @@
- type: Tag - type: Tag
id: CanPilot id: CanPilot
- type: Tag
id: CapacitorStockPart
- type: Tag - type: Tag
id: CaptainSabre id: CaptainSabre

17
Resources/migration.yml
View File

@@ -136,15 +136,14 @@ SalvagePartsT4Spawner: SalvageLootSpawner
SalvagePartsT3Spawner: SalvageLootSpawner SalvagePartsT3Spawner: SalvageLootSpawner
SalvagePartsT3T4Spawner: SalvageLootSpawner SalvagePartsT3T4Spawner: SalvageLootSpawner
SalvagePartsT2Spawner: SalvageLootSpawner SalvagePartsT2Spawner: SalvageLootSpawner
AdvancedCapacitorStockPart: CapacitorStockPart #SuperCapacitorStockPart: CapacitorStockPart
SuperCapacitorStockPart: CapacitorStockPart #QuadraticCapacitorStockPart: CapacitorStockPart
QuadraticCapacitorStockPart: CapacitorStockPart #NanoManipulatorStockPart: MicroManipulatorStockPart
NanoManipulatorStockPart: MicroManipulatorStockPart
PicoManipulatorStockPart: MicroManipulatorStockPart PicoManipulatorStockPart: MicroManipulatorStockPart
FemtoManipulatorStockPart: MicroManipulatorStockPart FemtoManipulatorStockPart: MicroManipulatorStockPart
AdvancedMatterBinStockPart: MatterBinStockPart #AdvancedMatterBinStockPart: MatterBinStockPart
SuperMatterBinStockPart: MatterBinStockPart #SuperMatterBinStockPart: MatterBinStockPart
BluespaceMatterBinStockPart: MatterBinStockPart #BluespaceMatterBinStockPart: MatterBinStockPart
AnsibleSubspaceStockPart: null AnsibleSubspaceStockPart: null
FilterSubspaceStockPart: null FilterSubspaceStockPart: null
AmplifierSubspaceStockPart: null AmplifierSubspaceStockPart: null
@@ -638,3 +637,7 @@ SuitStorageBasic: SuitStorageEVA
# 2025-05-18 # 2025-05-18
ClothingNeckCloakMiner: null ClothingNeckCloakMiner: null
# 2025-05-22
MatterBinStockPart: MicroManipulatorStockPart
CapacitorStockPart: MicroManipulatorStockPart