The Drippening: Service

code/game/gamemodes/legacy_gang_outfits.dm

@@ -141,7 +141,8 @@
 
 /datum/outfit/rigatonifamily
 	name = "Rigatoni family"
-	uniform = /obj/item/clothing/under/rank/civilian/chef
+	uniform = /obj/item/clothing/under/rank/civilian/servicedefault
+
 	suit = /obj/item/clothing/suit/apron/chef
 	head = /obj/item/clothing/head/utility/chefhat
 

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -40,7 +40,7 @@
 		/obj/item/storage/box/mousetraps = 2,
 		/obj/item/circuitboard/machine/dish_drive = 1,
 		/obj/item/clothing/suit/toggle/chef = 1,
-		/obj/item/clothing/under/rank/civilian/chef = 1,
+		/obj/item/clothing/under/rank/civilian/servicedefault = 1,
 		/obj/item/clothing/head/utility/chefhat = 1,
 		/obj/item/reagent_containers/cup/rag = 1)
 	generate_items_inside(items_inside,src)

code/modules/clothing/head/jobs.dm

@@ -6,7 +6,7 @@
 
 //Chef
 /obj/item/clothing/head/utility/chefhat
-	name = "chef's hat"
+	name = "Chef hat"
 	item_state = "chefhat"
 	icon_state = "chef"
 	desc = "The commander in chef's head wear."
@@ -25,6 +25,22 @@
 	playsound(user, 'sound/machines/ding.ogg', 50, 1)
 	return(FIRELOSS)
 
+/obj/item/clothing/head/utility/chefhat/black
+	name = "Black chef hat"
+	icon_state = "chef_black"
+	desc = "The commander in chef's head wear."
+
+/obj/item/clothing/head/utility/chefhat/sushi
+	name = "Hachimaki"
+	icon_state = "chef_sushi"
+	desc = "The sushi master's head wear."
+
+//Botanist
+/obj/item/clothing/head/hats/botanist
+	name = "Botanist hat"
+	desc = "For sunlight protection... in space."
+	icon_state = "hydroponics"
+
 //Captain
 /obj/item/clothing/head/hats/caphat
 	name = "captain's hat"

code/modules/clothing/suits/jobs.dm

@@ -25,6 +25,16 @@
 		/obj/item/storage/bag/plants
 	)
 
+/obj/item/clothing/suit/apron/botany
+	name = "hydroponics apron"
+	desc = "A green apron for botanist."
+	icon_state = "botanyoverall"
+
+/obj/item/clothing/suit/apron/skirt
+	name = "hydroponics skirt-apron"
+	desc = "A green skirt-apron for botanist."
+	icon_state = "botanyoverall_skirt"
+
 /obj/item/clothing/suit/apron/Initialize(mapload)
 	. = ..()
 	create_storage(storage_type = /datum/storage/pockets/exo/large)
@@ -43,7 +53,7 @@
 
 //Chef
 /obj/item/clothing/suit/toggle/chef
-	name = "chef's apron"
+	name = "Chef apron"
 	desc = "An apron-jacket used by a high class chef."
 	icon_state = "chef"
 	item_state = "chef"
@@ -63,6 +73,16 @@
 /datum/armor/toggle_chef
 	bio = 50
 
+/obj/item/clothing/suit/toggle/chef/black
+	name = "Black chef apron"
+	desc = "A black apron-jacket used by a high class chef."
+	icon_state = "chef_black"
+
+/obj/item/clothing/suit/toggle/chef/sushi
+	name = "Sushi chef kimon"
+	desc = "A kimono used by a high class sushi chef."
+	icon_state = "chef_sushi"
+
 /obj/item/clothing/suit/apron/chef
 	name = "cook's apron"
 	desc = "A basic, dull, white chef's apron."

code/modules/clothing/under/jobs/civilian/civilian.dm

@@ -4,23 +4,6 @@
 	icon = 'icons/obj/clothing/under/civilian.dmi'
 	worn_icon = 'icons/mob/clothing/under/civilian.dmi'
 
-/obj/item/clothing/under/rank/civilian/bartender
-	desc = "It looks like it could use some more flair."
-	name = "bartender's uniform"
-	icon_state = "barman"
-	item_state = "bar_suit"
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/rank/civilian/bartender/skirt
-	name = "bartender's skirt"
-	desc = "It looks like it could use some more flair."
-	icon_state = "barman_skirt"
-	item_state = "bar_suit"
-	body_parts_covered = CHEST|GROIN|ARMS
-	can_adjust = FALSE
-	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
-	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
-	dying_key = DYE_REGISTRY_JUMPSKIRT
 
 /obj/item/clothing/under/rank/civilian/bartender/purple
 	desc = "It looks like it has lots of flair!"
@@ -48,16 +31,16 @@
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 	dying_key = DYE_REGISTRY_JUMPSKIRT
 
-/obj/item/clothing/under/rank/civilian/chef
-	name = "cook's suit"
-	desc = "A suit which is given only to the most <b>hardcore</b> cooks in space."
-	icon_state = "chef"
+/obj/item/clothing/under/rank/civilian/servicedefault
+	name = "Service suit"
+	desc = "A suit which is given only to the most <b>hardcore</b> service members in space."
+	icon_state = "service_under"
 	alt_covers_chest = TRUE
 
-/obj/item/clothing/under/rank/civilian/chef/skirt
-	name = "cook's skirt"
-	desc = "A skirt which is given only to the most <b>hardcore</b> cooks in space."
-	icon_state = "chef_skirt"
+/obj/item/clothing/under/rank/civilian/servicedefault/skirt
+	name = "Service skirt"
+	desc = "A skirt which is given only to the most <b>hardcore</b> service members space."
+	icon_state = "service_under_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
 	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
@@ -105,27 +88,32 @@
 	dying_key = DYE_REGISTRY_JUMPSKIRT
 
 /obj/item/clothing/under/rank/civilian/hydroponics
-	desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
-	name = "botanist's jumpsuit"
+	desc = "A comfortable pair of shorts and shirt to wear under an apron."
+	name = "botanist's outfit"
 	icon_state = "hydroponics"
 	item_state = "g_suit"
 	armor_type = /datum/armor/civilian_hydroponics
 
+/obj/item/clothing/under/rank/civilian/hydroponics/original
+	desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
+	name = "botanist's  jumpsuit"
+	icon_state = "hydroponics_og"
+	armor_type = /datum/armor/civilian_hydroponics
 
-/datum/armor/civilian_hydroponics
-	bio = 50
-
-/obj/item/clothing/under/rank/civilian/hydroponics/skirt
+/obj/item/clothing/under/rank/civilian/hydroponics/original/skirt
 	name = "botanist's jumpskirt"
 	desc = "It's a jumpskirt designed to protect against minor plant-related hazards."
-	icon_state = "hydroponics_skirt"
-	item_state = "g_suit"
+	icon_state = "hydroponics_og_skirt"
+	item_state = "b_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
 	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 	dying_key = DYE_REGISTRY_JUMPSKIRT
 
+/datum/armor/civilian_hydroponics
+	bio = 50
+
 /obj/item/clothing/under/rank/civilian/janitor
 	desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
 	name = "janitor's jumpsuit"

code/modules/jobs/job_types/bartender.dm

@@ -38,7 +38,7 @@
 	glasses = /obj/item/clothing/glasses/sunglasses/advanced/reagent
 	belt = /obj/item/modular_computer/tablet/pda/preset/bartender
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/civilian/bartender
+	uniform = /obj/item/clothing/under/rank/civilian/servicedefault
 	suit = /obj/item/clothing/suit/armor/vest
 	l_hand = /obj/item/storage/box/beanbag
 	shoes = /obj/item/clothing/shoes/laceup

code/modules/jobs/job_types/botanist.dm

@@ -32,6 +32,7 @@
 	jobtype = /datum/job/botanist
 
 	id = /obj/item/card/id/job/botanist
+	head = /obj/item/clothing/head/hats/botanist
 	belt = /obj/item/modular_computer/tablet/pda/preset/service
 	ears = /obj/item/radio/headset/headset_srv
 	uniform = /obj/item/clothing/under/rank/civilian/hydroponics

code/modules/jobs/job_types/cook.dm

@@ -36,11 +36,12 @@
 	id = /obj/item/card/id/job/cook
 	belt = /obj/item/modular_computer/tablet/pda/preset/cook
 	ears = /obj/item/radio/headset/headset_srv
-	uniform = /obj/item/clothing/under/rank/civilian/chef
+	uniform = /obj/item/clothing/under/rank/civilian/servicedefault
 	suit = /obj/item/clothing/suit/toggle/chef
 	head = /obj/item/clothing/head/utility/chefhat
 	mask = /obj/item/clothing/mask/fakemoustache/italian
 	backpack_contents = list(/obj/item/sharpener = 1)
+	shoes = /obj/item/clothing/shoes/laceup
 
 /datum/outfit/job/cook/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	..()

code/modules/vending/autodrobe.dm

@@ -68,7 +68,6 @@
 		/obj/item/clothing/under/costume/griffin = 1,
 		/obj/item/clothing/shoes/griffin = 1,
 		/obj/item/clothing/head/costume/griffin = 1,
-		/obj/item/clothing/suit/apron = 1,
 		/obj/item/clothing/under/suit/waiter = 1,
 		/obj/item/clothing/suit/jacket/miljacket = 1,
 		/obj/item/clothing/under/costume/pirate = 1,

code/modules/vending/wardrobes.dm

@@ -278,10 +278,11 @@
 	products = list(/obj/item/storage/backpack/botany = 2,
 					/obj/item/storage/backpack/satchel/hyd = 2,
 					/obj/item/clothing/suit/hooded/wintercoat/hydro = 2,
-					/obj/item/clothing/suit/apron = 2,
-					/obj/item/clothing/suit/apron/overalls = 3,
+					/obj/item/clothing/suit/apron = 3,
+					/obj/item/clothing/suit/apron/botany = 3,
 					/obj/item/clothing/under/rank/civilian/hydroponics = 3,
-					/obj/item/clothing/under/rank/civilian/hydroponics/skirt = 3,
+					/obj/item/clothing/under/rank/civilian/hydroponics/original = 3,
+					/obj/item/clothing/under/rank/civilian/hydroponics/original/skirt = 3,
 					/obj/item/clothing/mask/bandana/striped/botany = 3,
 					/obj/item/clothing/under/plasmaman/botany = 3,
 					/obj/item/clothing/head/helmet/space/plasmaman/botany = 3,
@@ -339,7 +340,7 @@
 		/obj/item/clothing/under/suit/sl = 2,
 		/obj/item/clothing/under/rank/civilian/bartender = 2,
 		/obj/item/clothing/under/rank/civilian/bartender/purple = 2,
-		/obj/item/clothing/under/rank/civilian/bartender/skirt = 2,
+		/obj/item/clothing/under/rank/civilian/servicedefault/skirt = 2,
 		/obj/item/clothing/under/plasmaman/enviroslacks = 2,
 		/obj/item/clothing/head/helmet/space/plasmaman/white = 2,
 		/obj/item/clothing/accessory/waistcoat = 2,
@@ -382,10 +383,14 @@
 					/obj/item/clothing/suit/toggle/chef = 1,
 					/obj/item/clothing/under/plasmaman/chef = 1,
 					/obj/item/clothing/head/helmet/space/plasmaman/white = 1,
-					/obj/item/clothing/under/rank/civilian/chef = 1,
-					/obj/item/clothing/under/rank/civilian/chef/skirt = 2,
+					/obj/item/clothing/under/rank/civilian/servicedefault = 1,
+					/obj/item/clothing/under/rank/civilian/servicedefault/skirt = 2,
 					/obj/item/clothing/under/rank/civilian/altchef = 1,
+					/obj/item/clothing/suit/toggle/chef/black = 2,
+					/obj/item/clothing/suit/toggle/chef/sushi = 2,
 					/obj/item/clothing/head/utility/chefhat = 3,
+					/obj/item/clothing/head/utility/chefhat/black = 2,
+					/obj/item/clothing/head/utility/chefhat/sushi =2,
 					/obj/item/reagent_containers/cup/rag = 1,
 					/obj/item/clothing/suit/hooded/wintercoat = 2,
 	)