Lathe-able LED light tubes and LED bulbs (#25616)

let there be (led) light

diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 0c7e4cb8b24924df37eafbb0a5b0af040a21f755..a5cf712d099c3c05b36ef3968308c111b95bd925 100644 (file)
--- 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 a6340a8e91b40fd9b5bb827cff115403a3a61b15..b4b198eb774ea2c9dec6e02c65b8a33695a90c89 100644 (file)
--- 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 50601d8be898639d833ff84a09ed638ab41fbbc3..260ae5153bd40a3df99e7226642d65ea79b424e0 100644 (file)
--- 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 15b20d8b9043eaa3c25a62aa7e0d3603a27cdefc..8b4b5332835c6df5ca7b3322de22a355af4bea50 100644 (file)
--- 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