From b73f8918f7859b8eec968eef5fe21a83f54e30cd Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Mon, 3 Jan 2022 16:32:28 -0500 Subject: [PATCH] Fire & Air Alarm Electronics now constructable (#6015) --- .../Catalog/Research/technologies.yml | 2 ++ .../Devices/Electronics/atmos_alarms.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 4 +++- .../Prototypes/Recipes/Lathes/electronics.yml | 18 ++++++++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 6c72327791..632cdac6d0 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -227,6 +227,8 @@ - FireExtinguisher - AutolatheMachineCircuitboard - ProtolatheMachineCircuitboard + - AirAlarmElectronics + - FireAlarmElectronics - type: technology name: material sheet printing diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml index b6bd2f45af..bf1d2c72b2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml @@ -8,7 +8,7 @@ - AirAlarmElectronics - type: Sprite sprite: Objects/Misc/module.rsi - state: door_electronics + state: airalarm_electronics - type: entity id: FireAlarmElectronics diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c78b1ef3e3..0fd76d3a64 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -168,14 +168,16 @@ - ShellShotgun - CartridgeLRifle - CartridgeMagnum - - FirelockElectronics - MicroManipulatorStockPart - ScanningModuleStockPart - MicroLaserStockPart - MatterBinStockPart - CapacitorStockPart + - FirelockElectronics - DoorElectronics - APCElectronics + - AirAlarmElectronics + - FireAlarmElectronics - CloningPodMachineCircuitboard - MedicalScannerMachineCircuitboard - ChemMasterMachineCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index e55a87a71f..0f3b33964a 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -24,6 +24,24 @@ materials: Steel: 50 Glass: 50 + +- type: latheRecipe + id: AirAlarmElectronics + icon: Objects/Misc/module.rsi/airalarm_electronics.png + result: AirAlarmElectronics + completetime: 500 + materials: + Steel: 50 + Glass: 50 + +- type: latheRecipe + id: FireAlarmElectronics + icon: Objects/Misc/module.rsi/door_electronics.png + result: FireAlarmElectronics + completetime: 500 + materials: + Steel: 50 + Glass: 50 - type: latheRecipe id: CloningPodMachineCircuitboard