Cherry-Picked New Lights

Resources/Prototypes/Catalog/Fills/Boxes/general.yml

@@ -60,6 +60,16 @@
       components:
       - LightBulb
 
+- type: entity
+  name: lightbulb box warm
+  parent: BoxLightbulb
+  id: BoxWarmLightbulb
+  components:
+  - type: StorageFill
+    contents:
+      - id: WarmLightBulb
+        amount: 12
+
 - type: entity
   name: lighttube box
   parent: BoxCardboard

Resources/Prototypes/Entities/Objects/Power/lights.yml

@@ -142,6 +142,32 @@
     BurningTemperature: 350 #LEDs are colder than incandescent bulbs
     PowerUse: 6 #LEDs are more power efficient than incandescent bulbs
 
+- type: entity
+  parent: BaseLightbulb
+  name: dim light bulb
+  id: DimLightBulb
+  description: A dim light bulb for populating the darkness of maintenance.
+  components:
+  - type: LightBulb
+    bulb: Bulb
+    color: "#ba473f"
+    lightEnergy: 0.5
+    lightRadius: 5
+    lightSoftness: 3
+
+- type: entity
+  parent: BaseLightbulb
+  name: warm light bulb
+  id: WarmLightBulb
+  description: A warm light bulb for a more cozy atmosphere.
+  components:
+  - type: LightBulb
+    bulb: Bulb
+    color: "#ff9833" # 2200k color temp
+    lightEnergy: 1
+    lightRadius: 6
+    lightSoftness: 3
+
 - type: entity
   parent: LightBulb
   name: old incandescent light bulb
@@ -260,17 +286,25 @@
 
 - type: entity
   parent: BaseLightTube
-  name: cyan crystal light tube
+  name: crystal light tube
   description: A high power high energy bulb which has a small colored crystal inside.
-  id: LightTubeCrystalCyan
+  id: BaseLightTubeCrystal
+  abstract: true
   components:
   - type: LightBulb
-    color: "#47f8ff"
     lightEnergy: 3
     lightRadius: 8
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 60
+
+- type: entity
+  parent: BaseLightTubeCrystal
+  name: cyan crystal light tube
+  id: LightTubeCrystalCyan
+  components:
+  - type: LightBulb
+    color: "#47f8ff"
   - type: Construction
     graph: CyanLight
     node: icon
@@ -280,17 +314,12 @@
     - id: ShardCrystalCyan
 
 - type: entity
-  parent: LightTubeCrystalCyan
+  parent: BaseLightTubeCrystal
   name: blue crystal light tube
   id: LightTubeCrystalBlue
   components:
   - type: LightBulb
     color: "#39a1ff"
-    lightEnergy: 3
-    lightRadius: 8
-    lightSoftness: 0.5
-    BurningTemperature: 350
-    PowerUse: 60
   - type: Construction
     graph: BlueLight
     node: icon
@@ -300,17 +329,12 @@
     - id: ShardCrystalBlue
 
 - type: entity
-  parent: LightTubeCrystalCyan
+  parent: BaseLightTubeCrystal
   name: pink crystal light tube
   id: LightTubeCrystalPink
   components:
   - type: LightBulb
     color: "#ff66cc"
-    lightEnergy: 3
-    lightRadius: 8
-    lightSoftness: 0.5
-    BurningTemperature: 350
-    PowerUse: 60
   - type: Construction
     graph: PinkLight
     node: icon
@@ -320,17 +344,12 @@
     - id: ShardCrystalPink
 
 - type: entity
-  parent: LightTubeCrystalCyan
+  parent: BaseLightTubeCrystal
   name: orange crystal light tube
   id: LightTubeCrystalOrange
   components:
   - type: LightBulb
     color: "#ff8227"
-    lightEnergy: 3
-    lightRadius: 8
-    lightSoftness: 0.5
-    BurningTemperature: 350
-    PowerUse: 60
   - type: Construction
     graph: OrangeLight
     node: icon
@@ -340,17 +359,12 @@
     - id: ShardCrystalOrange
 
 - type: entity
-  parent: LightTubeCrystalCyan
+  parent: BaseLightTubeCrystal
   name: red crystal light tube
   id: LightTubeCrystalRed
   components:
   - type: LightBulb
     color: "#fb4747"
-    lightEnergy: 3
-    lightRadius: 8
-    lightSoftness: 0.5
-    BurningTemperature: 350
-    PowerUse: 60
   - type: Construction
     graph: RedLight
     node: icon
@@ -366,13 +380,115 @@
   components:
   - type: LightBulb
     color: "#52ff39"
-    lightEnergy: 3
-    lightRadius: 8
+  - type: Construction
+    graph: GreenLight
+    node: icon
+  - type: WelderRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalGreen
+
+
+- type: entity
+  parent: BaseLightbulb
+  name: crystal light bulb
+  description: A high power high energy bulb which has a small colored crystal inside.
+  id: BaseLightbulbCrystal
+  abstract: true
+  components:
+  - type: LightBulb
+    color: "#47f8ff"
+    lightEnergy: 1
+    lightRadius: 6
     lightSoftness: 0.5
     BurningTemperature: 350
     PowerUse: 60
+    bulb: Bulb
+
+- type: entity
+  parent: BaseLightbulbCrystal
+  name: cyan crystal light bulb
+  id: LightBulbCrystalCyan
+  components:
+  - type: LightBulb
+    color: "#47f8ff"
   - type: Construction
-    graph: GreenLight
+    graph: CyanLightBulb
+    node: icon
+  - type: WelderRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalCyan
+
+- type: entity
+  parent: BaseLightbulbCrystal
+  name: blue crystal light bulb
+  id: LightBulbCrystalBlue
+  components:
+  - type: LightBulb
+    color: "#39a1ff"
+  - type: Construction
+    graph: BlueLightBulb
+    node: icon
+  - type: WelderRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalBlue
+
+- type: entity
+  parent: BaseLightbulbCrystal
+  name: pink crystal light bulb
+  id: LightBulbCrystalPink
+  components:
+  - type: LightBulb
+    color: "#ff66cc"
+  - type: Construction
+    graph: PinkLightBulb
+    node: icon
+  - type: WelderRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalPink
+
+- type: entity
+  parent: BaseLightbulbCrystal
+  name: orange crystal light bulb
+  id: LightBulbCrystalOrange
+  components:
+  - type: LightBulb
+    color: "#ff8227"
+  - type: Construction
+    graph: OrangeLightBulb
+    node: icon
+  - type: WelderRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalOrange
+
+- type: entity
+  parent: BaseLightbulbCrystal
+  name: red crystal light bulb
+  id: LightBulbCrystalRed
+  components:
+  - type: LightBulb
+    color: "#fb4747"
+  - type: Construction
+    graph: RedLightBulb
+    node: icon
+  - type: WelderRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalRed
+
+- type: entity
+  parent: BaseLightbulbCrystal
+  name: green crystal light bulb
+  id: LightBulbCrystalGreen
+  components:
+  - type: LightBulb
+    color: "#52ff39"
+  - type: Construction
+    graph: GreenLightBulb
     node: icon
   - type: WelderRefinable
     refineResult:

Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml

@@ -333,6 +333,44 @@
       types:
         Heat: 1
 
+- type: entity
+  id: PoweredDimSmallLight
+  suffix: Dim
+  parent: PoweredSmallLightEmpty
+  components:
+  - type: Sprite
+    state: base
+  - type: PointLight
+    enabled: true
+    radius: 5
+    energy: 0.5
+    softness: 3
+    color: "#ba473f"
+  - type: PoweredLight
+    hasLampOnSpawn: DimLightBulb
+    damage:
+      types:
+        Heat: 1
+
+- type: entity
+  id: PoweredWarmSmallLight
+  suffix: Warm
+  parent: PoweredSmallLightEmpty
+  components:
+  - type: Sprite
+    state: base
+  - type: PointLight
+    enabled: true
+    radius: 6
+    energy: 1
+    softness: 3
+    color: "#FF8A0C"
+  - type: PoweredLight
+    hasLampOnSpawn: WarmLightBulb
+    damage:
+      types:
+        Heat: 2
+
 - type: entity
   id: PoweredSmallLight
   suffix: ""

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -150,6 +150,8 @@
       - ExteriorLightTube
       - LightBulb
       - LedLightBulb
+      - DimLightBulb
+      - WarmLightBulb
       - Bucket
       - DrinkMug
       - DrinkMugMetal