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/defines/obj/clothing/glasses.dm

@@ -23,6 +23,12 @@
 	item_state = "glasses"
 	origin_tech = "magnets=2"
 
+/obj/item/clothing/glasses/material
+	name = "Optical Material Scanner"
+	icon_state = "blindfold"
+	item_state = "blindfold"
+	origin_tech = "magnets=2"
+
 /obj/item/clothing/glasses/regular
 	name = "Prescription Glasses"
 	icon_state = "glasses"

code/defines/obj/storage.dm

@@ -59,6 +59,14 @@
 	w_class = 2.0
 	can_hold = list("/obj/item/weapon/reagent_containers/pill")
 
+/obj/item/weapon/storage/dice
+	name = "dice pack"
+	icon_state = "pill_canister"
+	icon = 'chemical.dmi'
+	item_state = "contsolid"
+	w_class = 2.0
+	can_hold = list("/obj/item/weapon/dice")
+
 /obj/item/weapon/storage/box
 	name = "box"
 	icon_state = "box"

code/defines/obj/toy.dm

@@ -13,7 +13,7 @@ obj/item/toy/blink
 
 /obj/item/toy/ammo/gun
 	name = "ammo-caps"
-	desc = "There are 7 caps left! Make sure to recyle the box when it gets empty."
+	desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty."
 	icon = 'ammo.dmi'
 	icon_state = "357-7"
 	flags = FPRINT | TABLEPASS| CONDUCT
@@ -24,7 +24,7 @@ obj/item/toy/blink
 
 	update_icon()
 		src.icon_state = text("357-[]", src.amount_left)
-		src.desc = text("There are [] caps\s left! Make sure to recycle the box in your local autolathe when it gets empty.", src.amount_left)
+		src.desc = text("There are [] caps\s left! Make sure to recycle the box in an autolathe when it gets empty.", src.amount_left)
 		return
 
 /obj/item/toy/ammo/crossbow
@@ -45,7 +45,7 @@ obj/item/toy/blink
 
 /obj/item/toy/gun
 	name = "cap gun"
-	desc = "There are 0 caps left. Looks almost like the real thing! Ages 8 and up. Please recycle in your local autolathe when your out of caps!"
+	desc = "There are 0 caps left. Looks almost like the real thing! Ages 8 and up. Please recycle in an autolathe when you're out of caps!"
 	icon = 'gun.dmi'
 	icon_state = "revolver"
 	item_state = "gun"

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 )

code/modules/mob/living/carbon/human/life.dm

@@ -751,6 +751,10 @@
 				src.sight |= SEE_MOBS
 				if(!src.druggy)
 					src.see_invisible = 2
+			else if (istype(src.glasses, /obj/item/clothing/glasses/material))
+				src.sight |= SEE_OBJS
+				if (!src.druggy)
+					src.see_invisible = 0
 
 			else if (src.stat != 2)
 				src.sight &= ~SEE_TURFS

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -31,9 +31,10 @@
 /obj/item/weapon/robot_module/janitor
 	name = "janitorial robot module"
 
+/*
 /obj/item/weapon/robot_module/brobot
 	name = "brobot robot module"
-
+*/
 /obj/item/weapon/robot_module/butler
 	name = "service robot module"
 
@@ -113,6 +114,7 @@ obj/item/weapon/robot_module/syndicate
 	src.modules += M
 
 	src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
+	src.modules += new /obj/item/weapon/zippo(src)
 	src.modules += new /obj/item/weapon/tray(src)
 	src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src)
 //	src.emag = new /obj/item/weapon/reagent_containers/food/snacks/roburgerbig(src)
@@ -164,7 +166,8 @@ obj/item/weapon/robot_module/syndicate
 	src.emag.reagents = R
 	R.my_atom = src.emag
 	R.add_reagent("beer2", 50)
-	src.emag.name = "Mickey Finn's Special Brew" */ //Merged with Service borg, not a death, just a transformation
+	src.emag.name = "Mickey Finn's Special Brew"
+*/ //Merged with Service borg, not a death, just a transformation
 
 obj/item/weapon/robot_module/syndicate/New()
 	src.modules += new /obj/item/weapon/gun/energy/crossbow(src)