diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm
index ddbff34c407..66b6f327f2f 100644
--- a/code/game/objects/devices/flashlight.dm
+++ b/code/game/objects/devices/flashlight.dm
@@ -164,6 +164,32 @@
 		user.UpdateLuminosity()
 		src.sd_SetLuminosity(brightness_on)
 
+//RIG helmet light
+/obj/item/clothing/head/helmet/space/rig/attack_self(mob/user)
+	if(!isturf(user.loc))
+		user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities.
+		return
+	on = !on
+	icon_state = "rig[on]-[color]"
+	item_state = "rig[on]-[color]"
+
+	if(on)
+		user.total_luminosity += brightness_on
+	else
+		user.total_luminosity -= brightness_on
+
+/obj/item/clothing/head/helmet/space/rig/pickup(mob/user)
+	if(on)
+		user.total_luminosity += brightness_on
+		user.UpdateLuminosity()
+		src.sd_SetLuminosity(0)
+
+/obj/item/clothing/head/helmet/space/rig/dropped(mob/user)
+	if(on)
+		user.total_luminosity -= brightness_on
+		user.UpdateLuminosity()
+		src.sd_SetLuminosity(brightness_on)
+
 /obj/item/device/flashlight/lamp/verb/toggle_light()
 	set name = "Toggle light"
 	set category = "Object"
diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index e7e8dc4e411..0aa74b947b5 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -1,18 +1,26 @@
 /obj/item/clothing/head/helmet/space/rig
 	name = "engineer RIG helmet"
 	desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
-	icon_state = "rig-engineering"
-	item_state = "rig_helm"
-	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
+	icon_state = "rig0-engineering"
+	item_state = "rig0_engineering"
+	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/device/flashlight)
+	var/brightness_on = 4 //luminosity when on
+	var/on = 0
+	color = "engineering" //Determines used sprites: rig[on]-[color] and rig[on]-[color]2 (lying down sprite)
 
 /obj/item/clothing/head/helmet/space/rig/mining
 	name = "mining RIG helmet"
-	icon_state = "rig-mining"
+	icon_state = "rig0-mining"
+	item_state = "rig0-mining"
+	color = "mining"
+
 
 /obj/item/clothing/head/helmet/space/rig/elite
 	name = "advanced RIG helmet"
-	icon_state = "rig-white"
+	icon_state = "rig0-white"
+	item_state = "rig0-white"
+	color = "white"
 
 /obj/item/clothing/head/helmet/space/rig/engspace_helmet
 	name = "engineering space helmet"
@@ -32,7 +40,8 @@
 
 /obj/item/clothing/head/helmet/space/rig/security
 	name = "security RIG helmet"
-	icon_state = "rig-security"
+	icon_state = "rig0-security"
+	color = "security"
 	armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
 
 /obj/item/clothing/suit/space/rig
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index efb51ab8062..b9c2ad151c3 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 74ada6cdc50..b30213d6e46 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ