Lighting tweaks (#4171)

* lightning

* softness

* a little less orange

Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: EmergencyLight
-  name: "emergency light"
+  name: emergency light
   description: A small red light with an internal battery that turns on as soon as it stops receiving any power.
   parent: WallLight
   components:
@@ -8,7 +8,7 @@
     enabled: false
     radius: 10
     energy: 2.5
-    offset: "0, -0.5"
+    offset: "0, 0.8"
     color: "#FF4020"
     mask: /Textures/Effects/LightMasks/emergency_mask.png
   - type: PowerReceiver

Resources/Prototypes/Entities/Constructible/Walls/lighting.yml

@@ -1,7 +1,8 @@
 - type: entity
   id: WallLight
-  name: unpowered light
+  name: light
   description: "An unpowered light."
+  suffix: Unpowered
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -23,10 +24,10 @@
       map: ["enum.PoweredLightLayers.Base"]
     state: on
   - type: PointLight
-    radius: 8
-    energy: 1.2
+    radius: 10
+    energy: 1.4
+    softness: 1.1
     offset: "0, -0.5"
-    color: "#DCDCC6"
   - type: SignalReceiver
   - type: Damageable
     resistances: metallicResistances
@@ -52,6 +53,7 @@
   name: light
   description: "A powered wall light emitting... light."
   id: Poweredlight
+  suffix: Powered
   parent: WallLight
   components:
   - type: Sprite
@@ -70,7 +72,7 @@
 - type: entity
   id: PoweredlightEmpty
   description: "A wall light. It's empty."
-  suffix: Empty
+  suffix: Empty, Powered
   parent: Poweredlight
   components:
   - type: Sprite
@@ -79,9 +81,10 @@
     hasLampOnSpawn: False
 
 - type: entity
-  name: unpowered small light
+  name: small light
   description: "An unpowered light."
   id: SmallLight
+  suffix: Unpowered
   parent: WallLight
   components:
     - type: Sprite
@@ -89,8 +92,9 @@
       state: on
     - type: PointLight
       energy: 1.0
+      radius: 6
+      softness: 1.1
       enabled: true
-      offset: "0, -0.5"
     - type: Damageable
     - type: Destructible
       thresholds:
@@ -114,13 +118,13 @@
   name: small light
   description: "A powered wall light emitting... light."
   id: PoweredSmallLight
+  suffix: Powered
   parent: SmallLight
   components:
   - type: Sprite
     sprite: Constructible/Lighting/light_small.rsi
     state: off
   - type: PointLight
-    energy: 1.0
     enabled: false
     offset: "0, -0.5"
   - type: Physics
@@ -138,7 +142,7 @@
 
 - type: entity
   id: PoweredSmallLightEmpty
-  suffix: Empty
+  suffix: Empty, Powered
   parent: PoweredSmallLight
   components:
   - type: Sprite

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

@@ -34,26 +34,30 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
+# Lighting color values gathered from
+# https://andi-siess.de/rgb-to-color-temperature/
 - type: entity
   parent: BaseLightbulb
-  name: light bulb
+  name: incandescent light bulb
   id: LightBulb
   description: That's a light bulb.
   components:
   - type: LightBulb
     bulb: Bulb
+    color: "#FFD1A3" # 4000K color temp
   - type: Sprite
     sprite: Objects/Power/light_bulb.rsi
     state: normal
 
 - type: entity
   parent: BaseLightbulb
-  name: light tube
+  name: fluorescent light tube
   id: LightTube
   description: That's a light fixture.
   components:
   - type: LightBulb
     bulb: Tube
+    color: "#FFEBDC" # 5400K color temp
   - type: Sprite
     sprite:  Objects/Power/light_tube.rsi
     state: normal