From 89c822638057e2c7071ae6cb4380b114da5a4961 Mon Sep 17 00:00:00 2001 From: MACMAN2003 Date: Mon, 26 Feb 2024 14:58:01 -0800 Subject: [PATCH] Lathe-able LED light tubes and LED bulbs (#25616) let there be (led) light --- .../Entities/Objects/Power/lights.yml | 15 +++++++++++++ .../Structures/Lighting/base_lighting.yml | 21 ++++++++++++++++++- .../Entities/Structures/Machines/lathe.yml | 2 ++ Resources/Prototypes/Recipes/Lathes/misc.yml | 18 ++++++++++++++++ 4 files changed, 55 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 0c7e4cb8b2..a5cf712d09 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -127,6 +127,21 @@ lightRadius: 6 lightSoftness: 1.1 +- type: entity + parent: BaseLightbulb + name: led light bulb + id: LedLightBulb + description: A power efficient light bulb. + components: + - type: LightBulb + bulb: Bulb + color: "#EEEEFF" + lightEnergy: 1 + lightRadius: 8 + lightSoftness: 1 + BurningTemperature: 350 #LEDs are colder than incandescent bulbs + PowerUse: 6 #LEDs are more power efficient than incandescent bulbs + - type: entity parent: LightBulb name: old incandescent light bulb diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index a6340a8e91..b4b198eb77 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -147,7 +147,7 @@ hasLampOnSpawn: LedLightTube damage: types: - Heat: 5 + Heat: 2.5 - type: PointLight radius: 15 energy: 1 @@ -309,6 +309,25 @@ - Off - Toggle +- type: entity + id: PoweredLEDSmallLight + suffix: LED + parent: PoweredSmallLightEmpty + components: + - type: Sprite + state: base + - type: PointLight + enabled: true + radius: 8 + energy: 1 + softness: 1 + color: "#EEEEFF" + - type: PoweredLight + hasLampOnSpawn: LedLightBulb + damage: + types: + Heat: 2.5 + - type: entity id: PoweredSmallLight suffix: "" diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 50601d8be8..260ae5153b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -113,9 +113,11 @@ - Syringe - HandLabeler - LightTube + - LedLightTube - SodiumLightTube - ExteriorLightTube - LightBulb + - LedLightBulb - Bucket - DrinkMug - DrinkMugMetal diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 15b20d8b90..8b4b533283 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -7,6 +7,15 @@ Steel: 50 Glass: 50 +- type: latheRecipe + id: LedLightTube + result: LedLightTube + category: Lights + completetime: 2 + materials: + Steel: 50 + Glass: 50 + - type: latheRecipe id: SodiumLightTube result: SodiumLightTube @@ -34,6 +43,15 @@ Steel: 50 Glass: 50 +- type: latheRecipe + id: LedLightBulb + result: LedLightBulb + category: Lights + completetime: 2 + materials: + Steel: 50 + Glass: 50 + - type: latheRecipe id: GlowstickRed result: GlowstickRed -- 2.52.0