Ahem...

Glasses: 
Added Optical Material Scanner - A gimmicky item that lets people see ALL OBJCECTS, even if hidden by turf.

Storage:
Added dice pack - one d6, one d20 (will add more once I add more Dice types).

Toys:
Typo fixes.

Cigarette lighters:
Zippo - Made the lighting message gender neutral.
Match - Made the lighting message gender neutral.

RSF:
Provides new items - Dice packs, pens, and cigarettes

Human life:
Made the Optical material scanners work to see objects.

Robot Modules:
Servicce borg - Has a lighter now (which will be modified soon so people can light other people's cigarettes).

Icons:
Night vision goggles slightly modifies to have a space for the nose of humans to stick out.  The item state changed a bit out of the place holder status.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1386 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/items/weapons/RSF.dm

@@ -31,6 +31,18 @@ RSF
 		user << "Changed dispensing mode to 'Paper'"
 		return
 	if (mode == 3)
+		mode = 4
+		user << "Changed dispensing mode to 'Pen'"
+		return
+	if (mode == 4)
+		mode = 5
+		user << "Changed dispensing mode to 'Dice Pack'"
+		return
+	if (mode == 5)
+		mode = 6
+		user << "Changed dispensing mode to 'Cigarette'"
+		return
+	if (mode == 6)
 		mode = 1
 		user << "Changed dispensing mode to 'Dosh'"
 		return
@@ -80,4 +92,46 @@ RSF
 				matter--
 				user << "The RSF now holds [matter]/30 fabrication-units."
 				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+		return
+
+	else if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && mode == 4)
+		if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && matter >= 1)
+			user << "Dispensing Pen..."
+			playsound(src.loc, 'click.ogg', 10, 1)
+			new /obj/item/weapon/pen( A.loc )
+			if (isrobot(user))
+				var/mob/living/silicon/robot/engy = user
+				engy.cell.charge -= 50
+			else
+				matter--
+				user << "The RSF now holds [matter]/30 fabrication-units."
+				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+		return
+
+	else if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && mode == 5)
+		if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && matter >= 1)
+			user << "Dispensing Dice Pack..."
+			playsound(src.loc, 'click.ogg', 10, 1)
+			new /obj/item/weapon/storage/dice( A.loc )
+			if (isrobot(user))
+				var/mob/living/silicon/robot/engy = user
+				engy.cell.charge -= 200
+			else
+				matter--
+				user << "The RSF now holds [matter]/30 fabrication-units."
+				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+		return
+
+	else if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && mode == 6)
+		if (((istype(A, /obj/table) || istype(A, /turf/simulated/floor))) && matter >= 1)
+			user << "Dispensing Cigarette..."
+			playsound(src.loc, 'click.ogg', 10, 1)
+			new /obj/item/clothing/mask/cigarette( A.loc )
+			if (isrobot(user))
+				var/mob/living/silicon/robot/engy = user
+				engy.cell.charge -= 10
+			else
+				matter--
+				user << "The RSF now holds [matter]/30 fabrication-units."
+				desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 		return

code/game/objects/items/weapons/cigs_lighters.dm

@@ -89,7 +89,7 @@ obj/item/weapon/matchbox.attackby(obj/item/weapon/match/W as obj, mob/user as mo
 			src.icon_state = icon_on
 			src.item_state = icon_on
 			for(var/mob/O in viewers(user, null))
-				O.show_message(text("\red With a single flick of his wrist, [] smoothly lights his [] with his []. Damn they're cool.", user, src.name, W), 1)
+				O.show_message(text("\red With a single flick of their wrist, [] smoothly lights their [] with their []. Damn they're cool.", user, src.name, W), 1)
 			spawn() //start fires while it's lit
 				src.process()
 	else if(istype(W, /obj/item/weapon/match) && W:lit)
@@ -98,7 +98,7 @@ obj/item/weapon/matchbox.attackby(obj/item/weapon/match/W as obj, mob/user as mo
 			src.icon_state = icon_on
 			src.item_state = icon_on
 			for(var/mob/O in viewers(user, null))
-				O.show_message(text("\red [] lights his [] with his []. How poor can you get?", user, src.name, W), 1)
+				O.show_message(text("\red [] lights their [] with their []. How poor can you get?", user, src.name, W), 1)
 			spawn() //start fires while it's lit
 				src.process()
 

code/game/objects/storage/storage.dm

@@ -176,6 +176,12 @@
 	..()
 	return
 
+/obj/item/weapon/storage/dice/New()
+	new /obj/item/weapon/dice( src )
+	new /obj/item/weapon/dice/d20( src )
+	..()
+	return
+
 /obj/item/weapon/storage/mousetraps/New()
 	new /obj/item/weapon/mousetrap( src )
 	new /obj/item/weapon/mousetrap( src )