diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm
index f81cc3527f4..242e84fb9e4 100644
--- a/code/game/objects/devices/flashlight.dm
+++ b/code/game/objects/devices/flashlight.dm
@@ -161,6 +161,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)
+
 // the desk lamps are a bit special
 /obj/item/device/flashlight/lamp
 	name = "desk lamp"
diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index 099a4f9a5e6..f858c6a82fe 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -1,20 +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"
+	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/suit/space/rig
 	name = "engineer RIG suit"
diff --git a/html/changelog.html b/html/changelog.html
index 7fb20a80880..2ecf2a8b7fa 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -46,6 +46,13 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">Tuesday, May 22</h2>
+	<h3 class="author">Icarus updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">RIG helmets can now be used as flashlights, just like hardhats. Credit to Sly for the sprites.</li>
+	</ul>
+</div>
 
 <div class="commit sansserif">
 	<h2 class="date">Sunday, May 20 2012</h2>
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 4d140c8ec96..579354c184e 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index ead93b33f12..db79fb6e83d 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 0893c69cdfd..d4256b76b2c 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index c1de93e79b9..602253bd5cd 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ