diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 511389d3c981f2..81d861838bd2c1 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -226,7 +226,7 @@
 
 #Captain's Hardsuit
 - type: entity
-  parent: ClothingHeadHardsuitBase
+  parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitCap
   noSpawn: true
   name: captain's hardsuit helmet
@@ -347,7 +347,7 @@
 
 #Cybersun Juggernaut Hardsuit
 - type: entity
-  parent: ClothingHeadHardsuitBase
+  parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitCybersun
   noSpawn: true
   name: cybersun juggernaut helmet
@@ -357,6 +357,8 @@
     sprite: Clothing/Head/Hardsuits/cybersun.rsi
   - type: Clothing
     sprite: Clothing/Head/Hardsuits/cybersun.rsi
+  - type: PointLight
+    color: red
   - type: PressureProtection
     highPressureMultiplier: 0.3
     lowPressureMultiplier: 1000
@@ -599,7 +601,7 @@
 
 #Deathsquad Hardsuit
 - type: entity
-  parent: ClothingHeadHardsuitBase
+  parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitDeathsquad
   noSpawn: true
   name: deathsquad hardsuit helmet
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon-flash.png
new file mode 100644
index 00000000000000..5cfffd9203b6df
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
index 855e3345c98e5d..3d06cd524d7154 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
@@ -11,15 +11,30 @@
       "name": "icon"
     },
     {
-      "name": "equipped-HELMET",
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "on-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-right",
+      "name": "on-inhand-right",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET.png
new file mode 100644
index 00000000000000..d67b95fdff3b7c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-left.png
new file mode 100644
index 00000000000000..ee1c8d1c4b6a6c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-right.png
new file mode 100644
index 00000000000000..fa19eea1f7b3c5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-right.png differ