Make flashlights, atmos hardsuit, and RGB use the new layer features (#6253)

* Make flashlights, atmos hardsuit, and RGB use the new layer features

* avoid self-conflict

* fix rgb not updating on add

* cleanup

* Update Content.Client/Light/RgbLightControllerSystem.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* cleanup diff

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml

@@ -58,20 +58,26 @@
   name: base hardsuit helmet with light
   components:
   - type: Sprite
-    netsync: true
+    netsync: false
     layers:
     - state: icon
     - state: icon-flash
       visible: false
+      map: [ "light" ]
   - type: Clothing
     HeldPrefix: off
   - type: PointLight
+    netsync: false
     enabled: false
-    radius: 3
+    radius: 6
+    energy: 2
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
   - type: Appearance
     visuals:
     - type: FlashLightVisualizer
   - type: HandheldLight
+    addPrefix: true
     toggleAction:
       name: action-name-toggle-light
       description: action-description-toggle-light

Resources/Prototypes/Entities/Clothing/Head/hardhats.yml

@@ -10,6 +10,7 @@
     - state: light-icon
       shader: unshaded
       visible: false
+      map: [ "light" ]
   - type: Clothing
     HeldPrefix: off
   - type: PointLight
@@ -19,6 +20,7 @@
     visuals:
       - type: FlashLightVisualizer
   - type: HandheldLight
+    addPrefix: true
     toggleAction:
       name: action-name-toggle-light
       description: action-description-toggle-light

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -5,9 +5,44 @@
   description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
   components:
   - type: Sprite
+    netsync: false
     sprite: Clothing/Head/Hardsuits/atmospherics.rsi
+    layers:
+    - state: icon
+    - state: icon-unshaded
+      shader: unshaded
+    - state: light-overlay
+      visible: false
+      shader: unshaded
+      map: [ "light" ]
+  - type: HandheldLight
+    addPrefix: false
+    inhandVisuals:
+      left:
+      - state: inhand-left-light
+        shader: unshaded
+      right:
+      - state: inhand-right-light
+        shader: unshaded
+    clothingVisuals:
+      head:
+      - state: equipped-head-light
+        shader: unshaded
   - type: Clothing
-    sprite: Clothing/Head/Hardsuits/atmospherics.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head
+      - state: equipped-head-unshaded
+        shader: unshaded
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: inhand-left-unshaded
+        shader: unshaded
+      right:
+      - state: inhand-right
+      - state: inhand-right-unshaded
+        shader: unshaded
 
 - type: entity
   parent: ClothingHeadHardsuitBase

Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml

@@ -5,6 +5,7 @@
   abstract: true
   components:
   - type: HandheldLight
+    addPrefix: true
     toggleAction:
       name: action-name-toggle-light
       description: action-description-toggle-light
@@ -31,6 +32,7 @@
       - state: lamp-on
         shader: unshaded
         visible: false
+        map: [ "light" ]
   - type: Item
     sprite: Objects/Misc/Lights/lamp.rsi
   - type: PointLight
@@ -53,6 +55,7 @@
       - state: bananalamp_on
         shader: unshaded
         visible: false
+        map: [ "light" ]
   - type: PointLight
     enabled: false
     radius: 3
@@ -74,6 +77,7 @@
       - state: lampgreen-on
         shader: unshaded
         visible: false
+        map: [ "light" ]
   - type: Item
     sprite: Objects/Misc/Lights/lampgreen.rsi
   - type: PointLight
@@ -96,6 +100,7 @@
       - state: floodlight_on
         shader: unshaded
         visible: false
+        map: [ "light" ]
   - type: Physics
   - type: Fixtures
     fixtures:

Resources/Prototypes/Entities/Objects/Tools/flashlights.yml

@@ -9,6 +9,14 @@
     - Flashlight
     - DroneUsable
   - type: HandheldLight
+    addPrefix: false
+    inhandVisuals:
+      left:
+      - state: inhand-left-light
+        shader: unshaded
+      right:
+      - state: inhand-right-light
+        shader: unshaded
     toggleAction:
       name: action-name-toggle-light
       description: action-description-toggle-light
@@ -26,10 +34,11 @@
       - state: flashlight-overlay
         shader: unshaded
         visible: false
+        map: [ "light" ]
   - type: Item
     sprite: Objects/Tools/flashlight.rsi
-    HeldPrefix: off
   - type: PointLight
+    netsync: false
     enabled: false
     mask: /Textures/Effects/LightMasks/cone.png
     autoRot: true
@@ -47,6 +56,15 @@
   - type: PowerCellSlot
     cellSlot:
       startingItem: PowerCellSmallSuper
+  - type: HandheldLight
+    addPrefix: false
+    inhandVisuals:
+      left:
+      - state: inhand-left-light
+        shader: unshaded
+      right:
+      - state: inhand-right-light
+        shader: unshaded
   - type: Sprite
     sprite: Objects/Tools/seclite.rsi
     layers:
@@ -54,6 +72,7 @@
       - state: seclite-overlay
         shader: unshaded
         visible: false
+        map: [ "light" ]
   - type: Item
     sprite: Objects/Tools/seclite.rsi
   - type: PointLight

Resources/Prototypes/Entities/Objects/Tools/lantern.yml

@@ -5,6 +5,7 @@
   description: The holy light guides the way.
   components:
     - type: HandheldLight
+      addPrefix: true
       toggleAction:
         name: action-name-toggle-light
         description: action-description-toggle-light
@@ -18,10 +19,12 @@
         - state: lantern-on
           shader: unshaded
           visible: false
+          map: [ "light" ]
     - type: Item
       sprite: Objects/Tools/lantern.rsi
       HeldPrefix: off
     - type: PointLight
+      netsync: false
       enabled: false
       radius: 3
       energy: 2.5

Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json

@@ -10,31 +10,49 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon-unshaded"
+    },
     {
       "name": "icon-flash"
     },
     {
-      "name": "off-equipped-HELMET",
+      "name": "light-overlay"
+    },
+    {
+      "name": "equipped-head",
       "directions": 4
     },
     {
-      "name": "off-inhand-left",
+      "name": "equipped-head-light",
       "directions": 4
     },
     {
-      "name": "off-inhand-right",
+      "name": "equipped-head-unshaded",
       "directions": 4
     },
     {
-      "name": "on-equipped-HELMET",
+      "name": "inhand-left",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "inhand-left-unshaded",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "inhand-left-light",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-unshaded",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-light",
       "directions": 4
     }
   ]

Resources/Textures/Objects/Tools/flashlight.rsi/meta.json

@@ -17,19 +17,19 @@
       "name": "flashlight-overlay"
     },
     {
-      "name": "off-inhand-left",
+      "name": "inhand-left",
       "directions": 4
     },
     {
-      "name": "off-inhand-right",
+      "name": "inhand-right",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "inhand-left-light",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "inhand-right-light",
       "directions": 4
     },
     {

Resources/Textures/Objects/Tools/seclite.rsi/meta.json

@@ -17,19 +17,19 @@
       "name": "seclite-overlay"
     },
     {
-      "name": "off-inhand-left",
+      "name": "inhand-left",
       "directions": 4
     },
     {
-      "name": "off-inhand-right",
+      "name": "inhand-right",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "inhand-left-light",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "inhand-right-light",
       "directions": 4
     },
     {