Welding mask change reverted.

Green lab coat can now be spawned.
Tweak to several sprites, nothing major.
Default sprite added to masks, so that some gimmick items may be spawned now.
Tea has a funnier name and description. Vending machine changed to "Hot" from "Warm" to better reflect contents.
Service Cyborgs can be picked! Shaker, dropper, tray, pen+paper for note/order taking and DOSH to show their class off. When emagged, Colonel Butlertron did it in Atmosia with the Energy Sword. Possibly bugged, must investigate further. (SoS authorized some live testing!)


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

code/WorkInProgress/Chemistry-Tools.dm

@@ -194,25 +194,6 @@
 		beakers += B1
 		beakers += B2
 		icon_state = "chemg_locked"
-/*
-/obj/item/weapon/chem_grenade/poo
-	name = "poo grenade"
-	desc = "A ShiTastic! brand biological warfare charge. Not very effective unless the target is squeamish."
-	icon_state = "chemg3"
-	stage = 2
-
-	New()
-		..()
-		var/obj/item/weapon/reagent_containers/glass/B1 = new(src)
-		var/obj/item/weapon/reagent_containers/glass/B2 = new(src)
-
-		B1.reagents.add_reagent("poo", 30)
-		B2.reagents.add_reagent("poo", 30)
-
-		beakers += B1
-		beakers += B2
-*/
-///////////////////////////////Grenades
 
 /obj/syringe_gun_dummy
 	name = ""
@@ -306,8 +287,6 @@
 				return
 
 
-
-
 /obj/reagent_dispensers
 	name = "Dispenser"
 	desc = "..."
@@ -2254,8 +2233,8 @@
 		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/tea
-	name = "Sandy Balls Tea"
-	desc = "The perfect tea for those who enjoy life's simple pleasures."
+	name = "Duke Purple Tea"
+	desc = "For excellent taste, you can always bet on Duke Purple."
 	icon_state = "tea"
 	New()
 		..()

code/defines/global.dm

@@ -71,7 +71,7 @@ var
 	enter_allowed = 1
 	shuttle_frozen = 0
 	shuttle_left = 0
-	tinted_weldhelh = 1
+	tinted_weldhelh = 0
 
 	captainMax = 1
 	engineerMax = 5

code/defines/obj/clothing/suit.dm

@@ -89,6 +89,12 @@
 	icon_state = "labcoat_cmo"
 	item_state = "labcoat_cmo"
 
+/obj/item/clothing/suit/labcoat/mad
+	name = "The Mad's labcoat"
+	desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
+	icon_state = "labcoat_cmo"
+	item_state = "labcoat_cmo"
+
 /obj/item/clothing/suit/straight_jacket
 	name = "straight jacket"
 	desc = "A suit that totally restrains an individual"

code/defines/obj/vending.dm

@@ -47,8 +47,8 @@
 	product_hideamt = "5;2"
 
 /obj/machinery/vending/coffee
-	name = "Warm drinks machine"
-	desc = "A vending machine which dispenses warm drinks."
+	name = "Hot Drinks machine"
+	desc = "A vending machine which dispenses hot drinks."
 	icon_state = "coffee"
 	icon_vend = "coffee-vend"
 	product_paths = "/obj/item/weapon/reagent_containers/food/drinks/coffee;/obj/item/weapon/reagent_containers/food/drinks/tea"

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

@@ -38,8 +38,8 @@
 /mob/living/silicon/robot/proc/pick_module()
 	if(src.module)
 		return
-	//var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Janitor", "Brobot")
-	var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Janitor", "Brobot", "Security")
+	//var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Janitor", "Service", "Brobot")
+	var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Janitor", "Brobot", "Service", "Security")
 	if(src.module)
 		return
 	switch(mod)
@@ -48,6 +48,13 @@
 			src.hands.icon_state = "standard"
 			src.icon_state = "robot"
 			src.modtype = "Stand"
+
+		if("Service")
+			src.module = new /obj/item/weapon/robot_module/butler(src)
+			src.hands.icon_state = "service"
+			src.icon_state = "Service"
+			src.modtype = "Butler"
+
 /*
 		if("Medical")
 			src.module = new /obj/item/weapon/robot_module/medical(src)

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

@@ -34,6 +34,9 @@
 /obj/item/weapon/robot_module/brobot
 	name = "brobot robot module"
 
+/obj/item/weapon/robot_module/butler
+	name = "service robot module"
+
 /obj/item/weapon/robot_module/New()//Shit all the mods have
 	src.modules += new /obj/item/device/flash(src)
 	src.emag = new /obj/item/toy/sword(src)
@@ -92,6 +95,19 @@
 	src.modules += new /obj/item/weapon/circular_saw(src)
 */
 
+
+/obj/item/weapon/robot_module/butler/New()
+	..()
+	src.modules += new /obj/item/weapon/spacecash(src)
+	src.modules += new /obj/item/weapon/pen(src)
+	src.modules += new /obj/item/weapon/paper(src)
+	src.modules += new /obj/item/weapon/reagent_containers/dropper(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/sword(src)
+	src.emag.name = "Helper's Little Helper"
+
+
 /obj/item/weapon/robot_module/security/New()
 	..()
 	src.modules += new /obj/item/weapon/baton(src)