From 7ef2c06b00f884029303dc837647a9a076407452 Mon Sep 17 00:00:00 2001 From: Alpaccalypse Date: Thu, 26 Dec 2024 21:40:59 +0000 Subject: [PATCH 1/3] Defined sprites for Atmospheric Alerts and Monitoring computer boards. Added research unlocks and lathe recipes for them. --- .../Objects/Devices/Circuitboards/computer.yml | 6 +++++- .../Prototypes/Entities/Structures/Machines/lathe.yml | 2 ++ Resources/Prototypes/Recipes/Lathes/electronics.yml | 10 ++++++++++ Resources/Prototypes/Research/industrial.yml | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index 26f2881ae801..de7513e735b9 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -24,15 +24,19 @@ name: atmospheric alerts computer board description: A computer printed circuit board for an atmospheric alerts computer. components: + - type: Sprite + state: cpu_engineering - type: ComputerBoard prototype: ComputerAlert - + - type: entity parent: BaseComputerCircuitboard id: AtmosMonitoringComputerCircuitboard name: atmospheric network monitor board description: A computer printed circuit board for an atmospheric network monitor. components: + - type: Sprite + state: cpu_engineering - type: ComputerBoard prototype: ComputerAtmosMonitoring diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 55f754df3d1b..5cc4abacb3a0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -521,6 +521,8 @@ - ReagentGrinderIndustrialMachineCircuitboard - JukeboxCircuitBoard - SMESAdvancedMachineCircuitboard + - AlertsComputerCircuitboard + - AtmosMonitoringComputerCircuitboard - type: EmagLatheRecipes emagDynamicRecipes: - ShuttleGunDusterCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index af74e7f3c79b..5b794a22f406 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -609,3 +609,13 @@ parent: BaseCircuitboardRecipe id: CutterMachineCircuitboard result: CutterMachineCircuitboard + +- type: latheRecipe + parent: BaseCircuitboardRecipe + id: AlertsComputerCircuitboard + result: AlertsComputerCircuitboard + +- type: latheRecipe + parent: BaseCircuitboardRecipe + id: AtmosMonitoringComputerCircuitboard + result: AtmosMonitoringComputerCircuitboard diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index e05212bf68e5..eb1de99047d0 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -100,6 +100,8 @@ recipeUnlocks: - ThermomachineFreezerMachineCircuitBoard - GasRecyclerMachineCircuitboard + - AlertsComputerCircuitboard + - AtmosMonitoringComputerCircuitboard - type: technology id: RipleyAPLU From 57dc592d551d1fa082f26237f6de699a9a2adc82 Mon Sep 17 00:00:00 2001 From: Alpaccalypse Date: Fri, 27 Dec 2024 16:26:12 +0000 Subject: [PATCH 2/3] Defined default engineering sprite for atmospherics computer boards. Removed Power Monitoring Computer board from research and lathe recipes. --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 - Resources/Prototypes/Recipes/Lathes/electronics.yml | 5 ----- Resources/Prototypes/Research/industrial.yml | 1 - 3 files changed, 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5cc4abacb3a0..a699d9375a45 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -474,7 +474,6 @@ - SolarControlComputerCircuitboard - SolarTrackerElectronics - TurboItemRechargerCircuitboard - - PowerComputerCircuitboard - AutolatheHyperConvectionMachineCircuitboard - ProtolatheHyperConvectionMachineCircuitboard - CircuitImprinterHyperConvectionMachineCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 5b794a22f406..296972f26e8a 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -429,11 +429,6 @@ id: SolarTrackerElectronics result: SolarTrackerElectronics -- type: latheRecipe - parent: BaseCircuitboardRecipe - id: PowerComputerCircuitboard - result: PowerComputerCircuitboard - - type: latheRecipe parent: BaseCircuitboardRecipe id: CloningConsoleComputerCircuitboard diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index eb1de99047d0..1b300d3c5f38 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -83,7 +83,6 @@ - PortableGeneratorPacmanMachineCircuitboard - PortableGeneratorSuperPacmanMachineCircuitboard - PortableGeneratorJrPacmanMachineCircuitboard - - PowerComputerCircuitboard #the actual solar panel itself should be in here - SolarControlComputerCircuitboard - SolarTrackerElectronics - EmitterCircuitboard From 92e234a72d53cf1ea84f8dcbc32b9bc39d494b57 Mon Sep 17 00:00:00 2001 From: Alpaccalypse Date: Fri, 27 Dec 2024 16:36:40 +0000 Subject: [PATCH 3/3] Defined engineering sprite for atmos computer boards. Removed Power Monitoring Computer board from research and lathe recipes. --- .../Prototypes/Entities/Structures/Machines/lathe.yml | 2 -- Resources/Prototypes/Recipes/Lathes/electronics.yml | 10 ---------- Resources/Prototypes/Research/industrial.yml | 2 -- 3 files changed, 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index a699d9375a45..4b8622e430ce 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -520,8 +520,6 @@ - ReagentGrinderIndustrialMachineCircuitboard - JukeboxCircuitBoard - SMESAdvancedMachineCircuitboard - - AlertsComputerCircuitboard - - AtmosMonitoringComputerCircuitboard - type: EmagLatheRecipes emagDynamicRecipes: - ShuttleGunDusterCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 296972f26e8a..0a2afc6b717f 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -604,13 +604,3 @@ parent: BaseCircuitboardRecipe id: CutterMachineCircuitboard result: CutterMachineCircuitboard - -- type: latheRecipe - parent: BaseCircuitboardRecipe - id: AlertsComputerCircuitboard - result: AlertsComputerCircuitboard - -- type: latheRecipe - parent: BaseCircuitboardRecipe - id: AtmosMonitoringComputerCircuitboard - result: AtmosMonitoringComputerCircuitboard diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 1b300d3c5f38..a9cafa5fa9a4 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -99,8 +99,6 @@ recipeUnlocks: - ThermomachineFreezerMachineCircuitBoard - GasRecyclerMachineCircuitboard - - AlertsComputerCircuitboard - - AtmosMonitoringComputerCircuitboard - type: technology id: RipleyAPLU