Service Borgs: New Waitress model! She's needs tips to pay the bills.

Mime Mask : Now on par with clown masks

Bio Suits: Now can into back packs.

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

code/defines/obj/clothing/mask.dm

@@ -118,11 +118,8 @@
 	item_state = "cigaroff"
 	smoketime = 1500
 
-/obj/item/clothing/mask/mime
+/obj/item/clothing/mask/gas/mime
 	name = "mime mask"
 	desc = "It looks a little creepy"
 	icon_state = "mime"
-	throw_speed = 0.5
-	var/lastHolder = null
-	var/smoketime = 300
-	w_class = 1
+	item_state = "clown_hat"

code/defines/obj/clothing/suit.dm

@@ -29,7 +29,7 @@
 	desc = "A suit that protects against biological contamination."
 	icon_state = "bio"
 	item_state = "bio_suit"
-	w_class = 4//bulky item
+//	w_class = 4//bulky item
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01

code/game/jobs/jobprocs.dm

@@ -346,7 +346,7 @@
 			src.equip_if_possible(new /obj/item/clothing/under/mime(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/gloves/white(src), slot_gloves)
-			src.equip_if_possible(new /obj/item/clothing/mask/mime(src), slot_wear_mask)
+			src.equip_if_possible(new /obj/item/clothing/mask/gas/mime(src), slot_wear_mask)
 			src.equip_if_possible(new /obj/item/clothing/head/beret(src), slot_head)
 			src.equip_if_possible(new /obj/item/clothing/suit/suspenders(src), slot_wear_suit)
 			src.verbs += /client/proc/mimespeak

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

@@ -52,7 +52,11 @@
 		if("Service")
 			src.module = new /obj/item/weapon/robot_module/butler(src)
 			src.hands.icon_state = "service"
-			src.icon_state = "Service"
+			var/icontype = input("Select an icon!", "Robot", null, null) in list("Waitress", "Butler")
+			if(icontype== "Waitress")
+				src.icon_state = "Service"
+			else
+				src.icon_state = "Service2"
 			src.modtype = "Butler"
 
 /*