Basic Uniform Resprite: Civilian

code/datums/outfits/jobs/civilian.dm

@@ -49,6 +49,8 @@
 
 /decl/hierarchy/outfit/job/service/chef/cook
 	name = OUTFIT_JOB_NAME("Cook")
+	suit = /obj/item/clothing/suit/storage/apron/white
+	head = /obj/item/clothing/head/surgery/hairnet
 	id_pda_assignment = "Cook"
 
 /decl/hierarchy/outfit/job/service/gardener
@@ -72,7 +74,7 @@
 
 /decl/hierarchy/outfit/job/librarian
 	name = OUTFIT_JOB_NAME("Librarian")
-	uniform = /obj/item/clothing/under/suit_jacket/red
+	uniform = /obj/item/clothing/under/suit_jacket/tan
 	l_hand = /obj/item/barcodescanner
 	id_type = /obj/item/card/id/civilian
 	pda_type = /obj/item/pda/librarian

code/datums/supplypacks/costumes.dm

@@ -75,7 +75,6 @@
 			/obj/item/clothing/under/waiter,
 			/obj/item/clothing/under/gladiator,
 			/obj/item/clothing/under/soviet,
-			/obj/item/clothing/under/scratch,
 			/obj/item/clothing/under/wedding/bride_white,
 			/obj/item/clothing/suit/chef,
 			/obj/item/clothing/suit/storage/apron/overalls,
@@ -164,4 +163,4 @@
 			/obj/item/clothing/under/dress/dress_orange,
 			/obj/item/clothing/under/dress/dress_yellow,
 			/obj/item/clothing/under/dress/dress_saloon
-			)
+			)

code/game/jobs/job/civilian.dm

@@ -53,6 +53,7 @@
 /datum/alt_title/cook
 	title = "Cook"
 	title_blurb = "A Cook has the same duties, though they may be less experienced."
+	title_outfit = /decl/hierarchy/outfit/job/service/chef/cook
 
 //////////////////////////////////
 //			Botanist

code/game/objects/effects/landmarks.dm

@@ -177,15 +177,6 @@
 	new /obj/item/clothing/head/that(src.loc)
 	return INITIALIZE_HINT_QDEL
 
-/obj/effect/landmark/costume/scratch/Initialize()
-	..()
-	new /obj/item/clothing/gloves/white(src.loc)
-	new /obj/item/clothing/shoes/white(src.loc)
-	new /obj/item/clothing/under/scratch(src.loc)
-	if (prob(30))
-		new /obj/item/clothing/head/cueball(src.loc)
-	return INITIALIZE_HINT_QDEL
-
 /obj/effect/landmark/costume/highlander/Initialize()
 	..()
 	new /obj/item/clothing/under/kilt(src.loc)

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

@@ -439,8 +439,8 @@
 		/obj/item/clothing/under/suit_jacket/really_black/skirt,
 		/obj/item/clothing/under/suit_jacket/red,
 		/obj/item/clothing/under/suit_jacket/red/skirt,
-		/obj/item/clothing/under/scratch,
-		/obj/item/clothing/under/scratch/skirt,
+		/obj/item/clothing/under/lawyer/white,
+		/obj/item/clothing/under/lawyer/white/skirt,
 		/obj/item/storage/backpack/satchel = 2)
 
 /obj/structure/closet/wardrobe/captain

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -93,13 +93,14 @@
 //Orange emergency space suit
 /obj/item/clothing/head/helmet/space/emergency
 	name = "Emergency Space Helmet"
-	icon_state = "syndicate-helm-orange"
+	icon_state = "emergencyhelm"
 	desc = "A simple helmet with a built in light, smells like mothballs."
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
 	flash_protection = FLASH_PROTECTION_NONE
 
 /obj/item/clothing/suit/space/emergency
 	name = "Emergency Softsuit"
-	icon_state = "syndicate-orange"
+	icon_state = "emergency_softsuit"
 	desc = "A thin, ungainly softsuit colored in blaze orange for rescuers to easily locate, looks pretty fragile."
 	slowdown = 2
 
@@ -109,6 +110,7 @@
 	name = "performance sports space helmet"
 	icon_state = "sports_void"
 	desc = "A sleek space helmet for the civilian extra-vehicular extreme sports market. Please replace after any impact!"
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
 
 /obj/item/clothing/suit/space/sports
 	name = "performance sports spacesuit"

code/modules/clothing/spacesuits/spacesuits.dm

@@ -11,7 +11,6 @@
 	item_flags = THICKMATERIAL | AIRTIGHT | ALLOW_SURVIVALFOOD | PHORONGUARD
 	permeability_coefficient = 0.01
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES
 	cold_protection = HEAD
 	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE

code/modules/clothing/spacesuits/syndi.dm

@@ -4,6 +4,7 @@
 	icon_state = "syndicate"
 	desc = "A crimson helmet sporting clean lines and durable plating. Engineered to look menacing."
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
 	siemens_coefficient = 0.6
 
 /obj/item/clothing/suit/space/syndicate
@@ -134,4 +135,4 @@
 /obj/item/clothing/suit/space/syndicate/black/engie
 	name = "black engineering space suit"
 	desc = "A black spacesuit sporting red and yellow stripes and durable plating. Robust, reliable, and slightly suspicious."
-	icon_state = "syndicate-black-engie"
+	icon_state = "syndicate-black-engie"

code/modules/clothing/spacesuits/void/void.dm

@@ -5,13 +5,12 @@
 	icon_state = "void"
 	item_state_slots = list(slot_r_hand_str = "syndicate", slot_l_hand_str = "syndicate")
 	heat_protection = HEAD
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
 	armor = list(melee = 30, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
 	min_pressure_protection = 0 * ONE_ATMOSPHERE
 	max_pressure_protection = 10 * ONE_ATMOSPHERE
 
-//	flags_inv = HIDEEARS|BLOCKHAIR
-
 	//Species-specific stuff.
 	species_restricted = list("Human", "Promethean")
 	sprite_sheets_refit = list(
@@ -67,7 +66,7 @@
 	var/obj/item/clothing/head/helmet/helmet = null   // Deployable helmet, if any.
 	var/obj/item/tank/tank = null              // Deployable tank, if any.
 	var/obj/item/suit_cooling_unit/cooler = null// Cooling unit, for FBPs.  Cannot be installed alongside a tank.
-	
+
 	//Cycler settings
 	var/no_cycle = FALSE	//stop this item from being put in a cycler
 

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

@@ -138,12 +138,13 @@
 	item_state_slots = list(slot_r_hand_str = "lightblue", slot_l_hand_str = "lightblue")
 
 /obj/item/clothing/under/lawyer/black
-	name = "tacky black lawyer suit"
+	name = "slick black suit"
 	icon_state = "lawyer_black"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
 
 /obj/item/clothing/under/lawyer/black/skirt
-	name = "tacky black lawyer skirt"
+	name = "slick black skirt"
+	index = 1
 	icon_state = "lawyer_black_skirt"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
 
@@ -169,26 +170,55 @@
 	icon_state = "trim_skirtsuit"
 	index = 1
 	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
+
 /obj/item/clothing/under/lawyer/red
-	name = "tacky red suit"
+	name = "slick red suit"
 	icon_state = "lawyer_red"
 	item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red")
 
 /obj/item/clothing/under/lawyer/red/skirt
-	name = "tacky red skirt"
+	name = "slick red skirt"
+	index = 1
 	icon_state = "lawyer_red_skirt"
 	item_state_slots = list(slot_r_hand_str = "lawyer_red", slot_l_hand_str = "lawyer_red")
 
 /obj/item/clothing/under/lawyer/blue
-	name = "tacky blue suit"
+	name = "slick blue suit"
 	icon_state = "lawyer_blue"
 	item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
 
 /obj/item/clothing/under/lawyer/blue/skirt
-	name = "tacky blue skirt"
+	name = "slick blue skirt"
+	index = 1
 	icon_state = "lawyer_blue_skirt"
 	item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
 
+/obj/item/clothing/under/lawyer/grey
+	name = "slick grey suit"
+	desc = "Man, this looks good."
+	icon_state = "good_suit"
+	item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey")
+
+/obj/item/clothing/under/lawyer/grey/skirt
+	name = "slick grey skirt"
+	index = 1
+	icon_state = "good_suit_skirt"
+
+/obj/item/clothing/under/lawyer/white
+	name = "slick white suit"
+	icon_state = "good_suit"
+	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
+
+/obj/item/clothing/under/lawyer/white/skirt
+	name = "slick white skirt"
+	index = 1
+	icon_state = "white_suit_skirt"
+
+/obj/item/clothing/under/lawyer/beige
+	name = "beige suit"
+	icon_state = "beige_suit"
+	item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
+
 /obj/item/clothing/under/lawyer/bluesuit
 	name = "blue suit"
 	desc = "A classy suit."

code/modules/clothing/under/miscellaneous.dm

@@ -16,16 +16,6 @@
 	icon_state = "captain_fly"
 	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
 
-/obj/item/clothing/under/scratch
-	name = "white suit"
-	desc = "A white suit, suitable for an excellent host"
-	icon_state = "scratch"
-
-/obj/item/clothing/under/scratch/skirt
-	name = "white skirt suit"
-	icon_state = "scratch_skirt"
-	item_state_slots = list(slot_r_hand_str = "scratch", slot_l_hand_str = "scratch")
-
 /obj/item/clothing/under/sl_suit
 	desc = "It's a very amish looking suit."
 	name = "amish suit"
@@ -195,25 +185,26 @@
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
 
 /obj/item/clothing/under/suit_jacket/really_black
-	name = "executive suit"
-	desc = "A formal black suit and red tie, intended for the station's finest."
+	name = "casual black suit"
+	desc = "An informal black suit, intended for the station's finest."
 	icon_state = "really_black_suit"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
 
 /obj/item/clothing/under/suit_jacket/really_black/skirt
-	name = "executive skirt suit"
-	desc = "A formal black suit and red necktie, intended for the station's finest."
+	name = "casual skirt suit"
+	desc = "An informal black suit, intended for the station's finest."
+	index = 1
 	icon_state = "really_black_suit_skirt"
 
 /obj/item/clothing/under/suit_jacket/female
-	name = "female executive suit"
+	name = "feminine executive suit"
 	desc = "A formal trouser suit for women, intended for the station's finest."
 	icon_state = "black_suit_fem"
 	item_state_slots = list(slot_r_hand_str = "lawyer_black", slot_l_hand_str = "lawyer_black")
 
 /obj/item/clothing/under/suit_jacket/female/skirt
 	name = "executive skirt"
-	desc = "A formal suit skirt  for women, intended for the station's finest."
+	desc = "A formal suit skirt for women, intended for the station's finest."
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	icon_state = "black_suit_fem"
 	item_state = "black_formal_skirt"

maps/cynosure/job/outfits.dm

@@ -75,7 +75,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
 	mask =     /obj/item/clothing/mask/gas
 	r_pocket = /obj/item/tank/emergency/oxygen/double
 	l_pocket = /obj/item/radio
-	uniform =  /obj/item/clothing/under/ascetic
+	uniform =  /obj/item/clothing/under/color/grey
 	shoes =    /obj/item/clothing/shoes/boots/winter
 	suit =     /obj/item/clothing/suit/storage/hooded/wintercoat
 	belt =     /obj/item/gun/energy/phasegun/pistol // better make that cell count