From 95edd8be9fedccd84689346f236c12d0fd3d687a Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Tue, 19 Apr 2022 01:23:20 +1200
Subject: [PATCH] fix more lights (#7632)

---
 .../Entities/Objects/Misc/fluff_lights.yml    | 33 +++++--------------
 .../Entities/Objects/Tools/lantern.yml        |  1 +
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 6d8162c14e..bf87842e1f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -12,6 +12,15 @@
     netsync: false
   - type: Item
     sprite: Objects/Misc/Lights/lights.rsi
+  - type: PointLight
+    netsync: false
+    enabled: false
+    radius: 3
+    energy: 2
+  - type: ToggleableLightVisuals
+  - type: Appearance
+    visuals:
+    - type: FlashLightVisualizer # todo move to light visuals component.
 
 - type: entity
   name: lamp
@@ -29,13 +38,6 @@
         map: [ "light" ]
   - type: Item
     sprite: Objects/Misc/Lights/lamp.rsi
-  - type: PointLight
-    enabled: false
-    radius: 3
-    energy: 2
-  - type: Appearance
-    visuals:
-      - type: FlashLightVisualizer
 
 - type: entity
   name: banana lamp
@@ -50,13 +52,6 @@
         shader: unshaded
         visible: false
         map: [ "light" ]
-  - type: PointLight
-    enabled: false
-    radius: 3
-    energy: 2
-  - type: Appearance
-    visuals:
-      - type: FlashLightVisualizer
 
 - type: entity
   name: desk lamp
@@ -74,13 +69,6 @@
         map: [ "light" ]
   - type: Item
     sprite: Objects/Misc/Lights/lampgreen.rsi
-  - type: PointLight
-    enabled: false
-    radius: 3
-    energy: 2
-  - type: Appearance
-    visuals:
-      - type: FlashLightVisualizer
 
 - type: entity
   name: floodlight
@@ -131,9 +119,6 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Appearance
-    visuals:
-      - type: FlashLightVisualizer
 
 - type: entity
   name: broken floodlight
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index c3b2c1c457..38f5483862 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -26,6 +26,7 @@
     - type: Appearance
       visuals:
         - type: LanternVisualizer
+    - type: ToggleableLightVisuals
     - type: PowerCellSlot
       cellSlot:
         startingItem: PowerCellSmallHigh