Update submodule: light cleanup.

Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs

@@ -6,7 +6,6 @@ using Content.Shared.GameObjects;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Server.Interfaces.GameObjects;
-using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Utility;
@@ -118,7 +117,7 @@ namespace Content.Server.GameObjects.Components.Interactable
                 return;
             }
 
-            SetState(LightState.Off);
+            SetState(false);
             Activated = false;
 
             if (Owner.TryGetComponent(out SoundComponent soundComponent))
@@ -158,7 +157,7 @@ namespace Content.Server.GameObjects.Components.Interactable
             }
 
             Activated = true;
-            SetState(LightState.On);
+            SetState(true);
 
             if (Owner.TryGetComponent(out soundComponent))
             {
@@ -166,13 +165,13 @@ namespace Content.Server.GameObjects.Components.Interactable
             }
         }
 
-        private void SetState(LightState newState)
+        private void SetState(bool on)
         {
-            _spriteComponent.LayerSetVisible(1, newState == LightState.On);
+            _spriteComponent.LayerSetVisible(1, on);
-            _pointLight.State = newState;
+            _pointLight.Enabled = on;
             if (_clothingComponent != null)
             {
-                _clothingComponent.ClothingEquippedPrefix = newState.ToString();
+                _clothingComponent.ClothingEquippedPrefix = on ? "On" : "Off";
             }
         }
 

Content.Server/GameObjects/Components/Power/PoweredLightComponent.cs

@@ -5,7 +5,6 @@ using Content.Shared.GameObjects;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Shared.Audio;
-using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Timing;
@@ -68,7 +67,7 @@ namespace Content.Server.GameObjects.Components.Power
 
             bool CanBurn(int heatResistance)
             {
-                return _lightState == LightState.On && heatResistance < LightBulb.BurningTemperature;
+                return _lightState && heatResistance < LightBulb.BurningTemperature;
             }
 
             void Burn()
@@ -135,8 +134,8 @@ namespace Content.Server.GameObjects.Components.Power
             UpdateLight();
         }
 
-        private LightState _lightState => Owner.GetComponent<PointLightComponent>().State;
+        private bool _lightState => Owner.GetComponent<PointLightComponent>().Enabled;
-            
+
         /// <summary>
         ///     Updates the light's power drain, sprite and actual light state.
         /// </summary>
@@ -149,7 +148,7 @@ namespace Content.Server.GameObjects.Components.Power
             {
                 device.Load = 0;
                 sprite.LayerSetState(0, "empty");
-                light.State = LightState.Off;
+                light.Enabled = false;
                 return;
             }
 
@@ -160,7 +159,7 @@ namespace Content.Server.GameObjects.Components.Power
                     if (device.Powered)
                     {
                         sprite.LayerSetState(0, "on");
-                        light.State = LightState.On;
+                        light.Enabled = true;
                         light.Color = LightBulb.Color;
                         var time = IoCManager.Resolve<IGameTiming>().CurTime;
                         if (time > _lastThunk + _thunkDelay)
@@ -172,18 +171,18 @@ namespace Content.Server.GameObjects.Components.Power
                     else
                     {
                         sprite.LayerSetState(0, "off");
-                        light.State = LightState.Off;
+                        light.Enabled = false;
                     }
                     break;
                 case LightBulbState.Broken:
                     device.Load = 0;
                     sprite.LayerSetState(0, "broken");
-                    light.State = LightState.Off;
+                    light.Enabled = false;
                     break;
                 case LightBulbState.Burned:
                     device.Load = 0;
                     sprite.LayerSetState(0, "burned");
-                    light.State = LightState.Off;
+                    light.Enabled = false;
                     break;
             }
         }

Resources/Prototypes/Entities/buildings/lighting.yml

@@ -16,7 +16,7 @@
   - type: PointLight
     radius: 8
     energy: 1.2
-    offset: "0, -16"
+    #offset: "0, -16"
     color: "#DCDCC6"
 
   placement:
@@ -39,7 +39,7 @@
     state: off
 
   - type: PointLight
-    state: Off
+    enabled: false
 
   - type: PowerDevice
     priority: Low
@@ -64,7 +64,7 @@
 
   - type: PointLight
     energy: 1.0
-    state: Off
+    enabled: false
 
   - type: PowerDevice
     priority: Low

Resources/Prototypes/Entities/items/clothing/helmets.yml

@@ -38,7 +38,7 @@
   components:
   - type: HandheldLight
   - type: PointLight
-    state: Off
+    enabled: false
   - type: Sprite
     sprite: Clothing/helmet_engineering.rsi
     layers:
@@ -52,4 +52,4 @@
   - type: Clothing
     Slots:
     - head
-    sprite: Clothing/helmet_engineering.rsi
+    sprite: Clothing/helmet_engineering.rsi

Resources/Prototypes/Entities/items/flashlight.yml

@@ -16,5 +16,5 @@
     sprite: Objects/lantern.rsi
     state: lantern_off
   - type: PointLight
-    state: Off
+    enabled: false
   - type: Sound