juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Circuit imprinter now uses less glass (#27310)

Browse Source 
* moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes

* Revert "moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes"

This reverts commit 45bb8d40150cddbbe005f5d66d34532b79143f98.

* adresses merge conflict

* fixed error

* parents base computer board to base machine board

* Revert "parents base computer board to base machine board"

This reverts commit dec3a799a90b4a0cb121b6694ecf65d9a0abd6a3.

* other thing was causing errors, guess it's this now
This commit is contained in:
Boaz1111
2024-04-28 07:46:53 +02:00
committed by GitHub
parent f544c91298
commit fe8ad485f2
3 changed files with 85 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
price: 100
- type: PhysicalComposition
materialComposition:
Glass: 400
Glass: 230
chemicalComposition:
Silicon: 20

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

@@ -14,7 +14,7 @@
price: 100
- type: PhysicalComposition
materialComposition:
Glass: 400
Glass: 230
chemicalComposition:
Silicon: 20

165
Resources/Prototypes/Recipes/Lathes/electronics.yml
View File

@@ -114,7 +114,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -124,7 +124,7 @@
completetime: 4
materials:
Steel: 150
Glass: 900
Glass: 500
Gold: 50
- type: latheRecipe
@@ -134,7 +134,7 @@
completetime: 4
materials:
Steel: 150
Glass: 900
Glass: 500
Gold: 50
- type: latheRecipe
@@ -144,7 +144,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: PortableScrubberMachineCircuitBoard
@@ -153,7 +153,7 @@
completetime: 4
materials:
Steel: 150
Glass: 900
Glass: 500
Gold: 50
- type: latheRecipe
@@ -163,7 +163,7 @@
completetime: 4
materials:
Steel: 150
Glass: 900
Glass: 500
Gold: 50
- type: latheRecipe
@@ -173,7 +173,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: CryoPodMachineCircuitboard
@@ -182,7 +182,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -192,7 +192,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ChemDispenserMachineCircuitboard
@@ -201,7 +201,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -211,7 +211,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -221,7 +221,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -231,7 +231,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: AutolatheMachineCircuitboard
@@ -240,7 +240,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ProtolatheMachineCircuitboard
@@ -249,7 +249,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: AutolatheHyperConvectionMachineCircuitboard
@@ -258,7 +258,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -268,7 +268,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -278,7 +278,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ExosuitFabricatorMachineCircuitboard
@@ -287,7 +287,7 @@
completetime: 5
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: UniformPrinterMachineCircuitboard
@@ -296,7 +296,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: VaccinatorMachineCircuitboard
@@ -305,7 +305,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -315,7 +315,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -325,7 +325,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -335,7 +335,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -345,7 +345,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: AnomalyVesselExperimentalCircuitboard
@@ -354,7 +354,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -374,7 +374,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ReagentGrinderMachineCircuitboard
@@ -383,7 +383,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: HotplateMachineCircuitboard
@@ -392,7 +392,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: AnalysisComputerCircuitboard
@@ -401,7 +401,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -411,7 +411,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -421,7 +421,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -431,7 +431,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: DawInstrumentMachineCircuitboard
@@ -440,7 +440,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: StasisBedMachineCircuitboard
@@ -449,7 +449,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -459,7 +459,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: CentrifugeMachineCircuitboard
@@ -468,7 +468,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: MaterialReclaimerMachineCircuitboard
@@ -477,7 +477,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: OreProcessorMachineCircuitboard
@@ -486,7 +486,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: OreProcessorIndustrialMachineCircuitboard
@@ -495,7 +495,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -505,7 +505,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -515,7 +515,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -525,7 +525,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Bananium: 100
- type: latheRecipe
@@ -535,7 +535,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Bananium: 100
- type: latheRecipe
@@ -545,7 +545,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Bananium: 100
- type: latheRecipe
@@ -555,7 +555,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -565,7 +565,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
# Power
@@ -603,7 +603,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: PortableGeneratorPacmanMachineCircuitboard
@@ -657,7 +657,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: SolarTrackerElectronics
@@ -675,7 +675,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: CloningConsoleComputerCircuitboard
@@ -684,7 +684,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: MicrowaveMachineCircuitboard
@@ -693,7 +693,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ElectricGrillMachineCircuitboard
@@ -702,7 +702,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: FatExtractorMachineCircuitboard
@@ -711,7 +711,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: FlatpackerMachineCircuitboard
@@ -720,7 +720,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -730,7 +730,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: SurveillanceCameraRouterCircuitboard
@@ -739,7 +739,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: SurveillanceCameraWirelessRouterCircuitboard
@@ -748,7 +748,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: SurveillanceWirelessCameraAnchoredCircuitboard
@@ -757,7 +757,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: SurveillanceWirelessCameraMovableCircuitboard
@@ -766,7 +766,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: SurveillanceCameraMonitorCircuitboard
@@ -775,7 +775,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: SurveillanceWirelessCameraMonitorCircuitboard
@@ -784,7 +784,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ComputerTelevisionCircuitboard
@@ -793,7 +793,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: EmitterCircuitboard
@@ -802,7 +802,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ThrusterMachineCircuitboard
@@ -811,7 +811,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: GyroscopeMachineCircuitboard
@@ -820,7 +820,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: GasRecyclerMachineCircuitboard
@@ -829,7 +829,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: SeedExtractorMachineCircuitboard
@@ -838,7 +838,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: BoozeDispenserMachineCircuitboard
@@ -847,7 +847,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: CargoTelepadMachineCircuitboard
@@ -856,7 +856,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -866,7 +866,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: TelecomServerCircuitboard
@@ -875,7 +875,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: MassMediaCircuitboard
@@ -884,7 +884,7 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: MiniGravityGeneratorCircuitboard
@@ -893,7 +893,7 @@
completetime: 6
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -902,7 +902,7 @@
completetime: 6
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ShuttleGunSvalinnMachineGunCircuitboard
@@ -910,7 +910,8 @@
completetime: 6
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ShuttleGunPerforatorCircuitboard
@@ -918,7 +919,7 @@
completetime: 10
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -927,7 +928,7 @@
completetime: 6
materials:
Steel: 100
Glass: 900
Glass: 500
- type: latheRecipe
id: ShuttleGunFriendshipCircuitboard
@@ -935,7 +936,7 @@
completetime: 8
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 50
- type: latheRecipe
@@ -944,7 +945,7 @@
completetime: 12
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -953,7 +954,7 @@
completetime: 5
materials:
Steel: 100
Glass: 900
Glass: 500
Gold: 100
- type: latheRecipe
@@ -962,4 +963,4 @@
completetime: 4
materials:
Steel: 100
Glass: 900
Glass: 500