[MIRROR] Updates all the icons in under/suits.dmi and related sorting/cleanup [MDB IGNORE] (#22819)

* Updates all the icons in under/suits.dmi and related sorting/cleanup (#76865)

Somebody was pointing out how our suits varied WILDLY in quality
Figured I'd go through and tidy them up

* Updates all the icons in under/suits.dmi and related sorting/cleanup

* Rename Amish suit, remove scratch suit (was removed upstream)

* Fixes a rogue path

---------

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>

_maps/map_files/MetaStation/MetaStation.dmm

@@ -561,6 +561,12 @@
 	},
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain/private)
+"als" = (
+/obj/structure/table,
+/obj/item/clothing/under/costume/buttondown/slacks/service,
+/obj/effect/turf_decal/tile/neutral,
+/turf/open/floor/iron,
+/area/station/commons/fitness/recreation)
 "alE" = (
 /turf/open/floor/iron,
 /area/station/security/courtroom)
@@ -3961,6 +3967,21 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/execution/transfer)
+"buE" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/window/spawner/directional/west,
+/obj/effect/turf_decal/trimline/dark_red/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/arrows/red{
+	dir = 4
+	},
+/obj/effect/landmark/start/hangover,
+/obj/structure/cable,
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 4
+	},
+/area/station/commons/fitness)
 "buF" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -17499,6 +17520,13 @@
 /obj/effect/spawner/random/maintenance/two,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/fore)
+"gEN" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/station/commons/fitness/recreation)
 "gES" = (
 /obj/machinery/computer/shuttle/labor{
 	dir = 4
@@ -19286,12 +19314,6 @@
 /obj/structure/lattice/catwalk,
 /turf/open/space,
 /area/space/nearstation)
-"hnt" = (
-/obj/structure/cable,
-/turf/open/floor/iron/white/side{
-	dir = 4
-	},
-/area/station/commons/fitness)
 "hnv" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/mecha_wreckage/ripley,
@@ -19347,22 +19369,6 @@
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/floor/iron/white,
 /area/station/medical/pharmacy)
-"hoQ" = (
-/obj/structure/table,
-/obj/item/clothing/under/suit/black/skirt,
-/obj/item/clothing/under/suit/black_really,
-/obj/machinery/light/small/directional/north,
-/obj/item/radio/intercom/directional/north,
-/obj/item/clothing/accessory/waistcoat,
-/obj/item/clothing/suit/toggle/lawyer/black,
-/obj/item/clothing/under/suit/red,
-/obj/item/clothing/neck/tie/black,
-/obj/item/clothing/under/suit/black,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
-	dir = 1
-	},
-/turf/open/floor/iron/cafeteria,
-/area/station/commons/dorms)
 "hoY" = (
 /obj/structure/chair/office{
 	dir = 4
@@ -19416,6 +19422,21 @@
 	},
 /turf/closed/wall/r_wall,
 /area/station/engineering/atmos/pumproom)
+"hqu" = (
+/obj/structure/table,
+/obj/item/clothing/under/suit/black_really,
+/obj/machinery/light/small/directional/north,
+/obj/item/radio/intercom/directional/north,
+/obj/item/clothing/accessory/waistcoat,
+/obj/item/clothing/suit/toggle/lawyer/black,
+/obj/item/clothing/under/suit/red,
+/obj/item/clothing/neck/tie/black,
+/obj/item/clothing/under/costume/buttondown/slacks/service,
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+	dir = 1
+	},
+/turf/open/floor/iron/cafeteria,
+/area/station/commons/dorms)
 "hqE" = (
 /obj/machinery/telecomms/bus/preset_four,
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -20287,11 +20308,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/pharmacy)
-"hGG" = (
-/obj/effect/turf_decal/trimline/dark_red/mid_joiner,
-/obj/effect/turf_decal/trimline/dark_red/line,
-/turf/open/floor/iron/white/smooth_half,
-/area/station/commons/fitness)
 "hGL" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
@@ -24912,14 +24928,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
-"jhP" = (
-/obj/structure/closet/athletic_mixed,
-/obj/effect/landmark/start/hangover/closet,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/commons/fitness/recreation)
 "jhS" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -27984,12 +27992,6 @@
 /obj/effect/mapping_helpers/mail_sorting/science/rd_office,
 /turf/open/floor/iron/white,
 /area/station/science/research)
-"kjL" = (
-/obj/structure/table,
-/obj/item/clothing/under/suit/sl,
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/iron,
-/area/station/commons/fitness/recreation)
 "kjO" = (
 /obj/structure/table,
 /obj/item/restraints/handcuffs/cable/white,
@@ -31212,6 +31214,14 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai)
+"lus" = (
+/obj/structure/closet/athletic_mixed,
+/obj/effect/landmark/start/hangover/closet,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/commons/fitness/recreation)
 "luE" = (
 /obj/structure/rack,
 /obj/item/integrated_circuit/loaded/hello_world,
@@ -35284,15 +35294,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/space_hut)
-"mSf" = (
-/obj/structure/weightmachine/weightlifter,
-/obj/effect/turf_decal/tile/dark_red/half/contrasted,
-/obj/effect/landmark/start/hangover,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white/textured_edge{
-	dir = 1
-	},
-/area/station/commons/fitness)
 "mSk" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -37683,19 +37684,6 @@
 /obj/structure/easel,
 /turf/open/floor/plating,
 /area/station/maintenance/disposal)
-"nIL" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/obj/structure/cable,
-/turf/open/floor/iron/dark/corner,
-/area/station/engineering/storage_shared)
 "nIP" = (
 /obj/structure/table/glass,
 /obj/item/paper_bin{
@@ -47006,13 +46994,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/storage)
-"rci" = (
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/commons/fitness/recreation)
 "rcq" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/purple/visible,
 /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{
@@ -47296,6 +47277,15 @@
 /obj/effect/landmark/start/assistant,
 /turf/open/floor/wood,
 /area/station/commons/lounge)
+"rjl" = (
+/obj/structure/weightmachine/weightlifter,
+/obj/effect/turf_decal/tile/dark_red/half/contrasted,
+/obj/effect/landmark/start/hangover,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/white/textured_edge{
+	dir = 1
+	},
+/area/station/commons/fitness)
 "rjz" = (
 /obj/machinery/power/shieldwallgen,
 /obj/structure/extinguisher_cabinet/directional/west,
@@ -49473,18 +49463,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/construction/storage_wing)
-"rVL" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/bot,
-/obj/effect/spawner/random/maintenance,
-/obj/item/storage/belt/utility,
-/obj/effect/turf_decal/tile/yellow/opposingcorners{
-	dir = 1
-	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/corner,
-/area/station/engineering/storage_shared)
 "rVY" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52886,21 +52864,6 @@
 	dir = 1
 	},
 /area/station/engineering/atmos/pumproom)
-"tho" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/window/spawner/directional/west,
-/obj/effect/turf_decal/trimline/dark_red/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/arrows/red{
-	dir = 4
-	},
-/obj/effect/landmark/start/hangover,
-/obj/structure/cable,
-/turf/open/floor/iron/white/smooth_edge{
-	dir = 4
-	},
-/area/station/commons/fitness)
 "thQ" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -55477,6 +55440,12 @@
 /obj/effect/spawner/random/structure/grille,
 /turf/open/floor/plating,
 /area/station/maintenance/port)
+"ubs" = (
+/obj/structure/cable,
+/turf/open/floor/iron/white/side{
+	dir = 4
+	},
+/area/station/commons/fitness)
 "ubw" = (
 /obj/structure/lattice,
 /obj/structure/window/reinforced/spawner/directional/north,
@@ -55676,6 +55645,18 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/office)
+"uew" = (
+/obj/structure/table/reinforced,
+/obj/machinery/microwave{
+	pixel_y = 6
+	},
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/tile/yellow{
+	dir = 8
+	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/checker,
+/area/station/engineering/storage_shared)
 "ueB" = (
 /obj/machinery/airalarm/directional/south,
 /obj/effect/turf_decal/tile/yellow/half/contrasted,
@@ -56737,18 +56718,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/science/server)
-"uzg" = (
-/obj/structure/table/reinforced,
-/obj/machinery/microwave{
-	pixel_y = 6
-	},
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/checker,
-/area/station/engineering/storage_shared)
 "uzi" = (
 /obj/structure/lattice,
 /obj/structure/chair/sofa/corp/left{
@@ -57869,6 +57838,19 @@
 /obj/effect/spawner/random/structure/closet_maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
+"uUL" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 8
+	},
+/obj/structure/cable,
+/turf/open/floor/iron/dark/corner,
+/area/station/engineering/storage_shared)
 "uUX" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable/layer3,
@@ -60597,6 +60579,18 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/command/heads_quarters/cmo)
+"vPV" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/effect/spawner/random/maintenance,
+/obj/item/storage/belt/utility,
+/obj/effect/turf_decal/tile/yellow/opposingcorners{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/corner,
+/area/station/engineering/storage_shared)
 "vPW" = (
 /obj/item/extinguisher,
 /turf/open/floor/plating,
@@ -63112,13 +63106,6 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"wLi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white/side{
-	dir = 1
-	},
-/area/station/commons/fitness)
 "wLu" = (
 /obj/structure/chair/office{
 	dir = 8
@@ -64795,6 +64782,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
+"xpb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white/side{
+	dir = 1
+	},
+/area/station/commons/fitness)
 "xpi" = (
 /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
@@ -67126,6 +67120,11 @@
 	},
 /turf/open/floor/plating,
 /area/station/medical/chemistry)
+"yfm" = (
+/obj/effect/turf_decal/trimline/dark_red/mid_joiner,
+/obj/effect/turf_decal/trimline/dark_red/line,
+/turf/open/floor/iron/white/smooth_half,
+/area/station/commons/fitness)
 "yfn" = (
 /obj/machinery/vending/dinnerware,
 /obj/structure/cable,
@@ -102757,8 +102756,8 @@ rrt
 aaa
 aaa
 iHc
-hGG
-wLi
+yfm
+xpb
 cMG
 qMe
 fqB
@@ -102779,7 +102778,7 @@ lnc
 cqp
 wvF
 lnc
-hoQ
+hqu
 wcr
 ikb
 urK
@@ -103014,15 +103013,15 @@ rrt
 lMJ
 blx
 aag
-mSf
+rjl
 htk
-hnt
+ubs
 cfy
 jlJ
 eZN
 ewf
 ewf
-kjL
+als
 lhk
 rwE
 tgo
@@ -103273,7 +103272,7 @@ aaa
 iHc
 gpF
 pHe
-tho
+buE
 aag
 szp
 jjG
@@ -103789,7 +103788,7 @@ iHc
 iHc
 aag
 aag
-jhP
+lus
 clE
 byz
 biF
@@ -104304,7 +104303,7 @@ lMJ
 aaa
 szp
 szp
-rci
+gEN
 sqH
 jAs
 aiw
@@ -109225,7 +109224,7 @@ qjl
 wlx
 qPT
 jRb
-uzg
+uew
 qsv
 sKD
 lUz
@@ -109739,7 +109738,7 @@ nJM
 lOg
 pom
 pom
-nIL
+uUL
 qsv
 bjH
 bbi
@@ -109996,7 +109995,7 @@ uJz
 iHy
 vSC
 eKw
-rVL
+vPV
 qsv
 lfd
 eup

code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm

@@ -332,7 +332,7 @@ SKYRAT EDIT END */
 /datum/greyscale_config/buttondown_slacks/worn
 	name = "Buttondown with Slacks (Worn)"
 	icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
-	json_config = 'code/datums/greyscale/json_configs/buttondown_slacks_worn.json'
+	json_config = 'code/datums/greyscale/json_configs/buttondown_slacks_worn.json' //Needed a unique object .json to fix height issues, so the worn is separate
 
 /datum/greyscale_config/buttondown_shorts
 	name = "Buttondown with Shorts"
@@ -342,7 +342,7 @@ SKYRAT EDIT END */
 /datum/greyscale_config/buttondown_shorts/worn
 	name = "Buttondown with Shorts (Worn)"
 	icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
-	json_config = 'code/datums/greyscale/json_configs/buttondown_shorts_worn.json'
+	json_config = 'code/datums/greyscale/json_configs/buttondown_shorts_worn.json' //Ditto
 
 //
 // SUITS

code/datums/greyscale/json_configs/buttondown_shorts.json

@@ -8,19 +8,19 @@
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "buckle",
+			"icon_state": "buttondown_obj_buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "belt",
+			"icon_state": "buttondown_obj_belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "shorts",
+			"icon_state": "buttondown_obj_shorts",
 			"blend_mode": "overlay",
 			"color_ids": [ 4 ]
 		}

code/datums/greyscale/json_configs/buttondown_slacks.json

@@ -8,19 +8,19 @@
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "buckle",
+			"icon_state": "buttondown_obj_buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "belt",
+			"icon_state": "buttondown_obj_belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "slacks",
+			"icon_state": "buttondown_obj_slacks",
 			"blend_mode": "overlay",
 			"color_ids": [ 4 ]
 		}

code/game/objects/effects/spawners/costume.dm

@@ -65,7 +65,7 @@
 	name = "butler costume spawner"
 	items = list(
 		/obj/item/clothing/accessory/waistcoat,
-		/obj/item/clothing/under/suit/black,
+		/obj/item/clothing/under/costume/buttondown/slacks/service,
 		/obj/item/clothing/neck/tie/black,
 		/obj/item/clothing/head/hats/tophat,
 	)
@@ -95,7 +95,7 @@
 		/obj/effect/spawner/random/clothing/bowler_or_that,
 		/obj/item/clothing/shoes/sneakers/black,
 		/obj/item/cane,
-		/obj/item/clothing/under/suit/sl,
+		/obj/item/clothing/under/costume/buttondown/slacks/service,
 		/obj/item/clothing/mask/fakemoustache,
 	)
 
@@ -210,7 +210,7 @@
 	name = "black mafia outfit spawner"
 	items = list(
 		/obj/item/clothing/head/fedora,
-		/obj/item/clothing/under/suit/blacktwopiece,
+		/obj/item/clothing/under/suit/black,
 		/obj/item/clothing/shoes/laceup,
 	)
 

code/game/objects/items/storage/backpack.dm

@@ -656,7 +656,7 @@
 	inhand_icon_state = "duffel-syndieammo"
 
 /obj/item/storage/backpack/duffelbag/syndie/hitman/PopulateContents()
-	new /obj/item/clothing/under/suit/black(src)
+	new /obj/item/clothing/under/costume/buttondown/slacks/service(src)
 	new /obj/item/clothing/neck/tie/red/hitman(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
 	new /obj/item/clothing/suit/toggle/lawyer/black(src)

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

@@ -10,7 +10,7 @@
 	var/static/items_inside = list(
 		/obj/item/clothing/head/hats/tophat = 2,
 		/obj/item/radio/headset/headset_srv = 2,
-		/obj/item/clothing/under/suit/sl = 2,
+		/obj/item/clothing/under/costume/buttondown/slacks/service = 2,
 		/obj/item/clothing/under/rank/civilian/bartender = 2,
 		/obj/item/clothing/accessory/waistcoat = 2,
 		/obj/item/clothing/head/soft/black = 2,
@@ -80,7 +80,7 @@
 
 /obj/structure/closet/lawcloset/PopulateContents()
 	..()
-	new /obj/item/clothing/under/suit/blacktwopiece(src)
+	new /obj/item/clothing/under/suit/black(src)
 	new /obj/item/clothing/under/rank/civilian/lawyer/beige(src)
 	new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
 	new /obj/item/clothing/under/rank/civilian/lawyer/red(src)
@@ -89,7 +89,7 @@
 	new /obj/item/clothing/suit/toggle/lawyer(src)
 	new /obj/item/clothing/under/rank/civilian/lawyer/purpsuit(src)
 	new /obj/item/clothing/suit/toggle/lawyer/purple(src)
-	new /obj/item/clothing/under/suit/black(src)
+	new /obj/item/clothing/under/costume/buttondown/slacks/service(src)
 	new /obj/item/clothing/neck/tie/black(src)
 	new /obj/item/clothing/suit/toggle/lawyer/black(src)
 	new /obj/item/clothing/shoes/laceup(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -55,8 +55,7 @@
 
 /obj/structure/closet/secure_closet/psychology/PopulateContents()
 	..()
-	new /obj/item/clothing/under/suit/black(src)
-	new /obj/item/clothing/under/suit/black/skirt(src)
+	new /obj/item/clothing/under/costume/buttondown/slacks/service(src)
 	new /obj/item/clothing/neck/tie/black(src)
 	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/storage/backpack/medic(src)

code/modules/admin/topic.dm

@@ -694,7 +694,7 @@
 
 		if(ishuman(L))
 			var/mob/living/carbon/human/observer = L
-			observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit/black(observer), ITEM_SLOT_ICLOTHING)
+			observer.equip_to_slot_or_del(new /obj/item/clothing/under/costume/buttondown/slacks/service(observer), ITEM_SLOT_ICLOTHING)
 			observer.equip_to_slot_or_del(new /obj/item/clothing/neck/tie/black/tied(observer), ITEM_SLOT_NECK)
 			observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), ITEM_SLOT_FEET)
 		L.Unconscious(100)

code/modules/clothing/outfits/standard.dm

@@ -188,7 +188,7 @@
 
 	id = /obj/item/card/id/advanced/chameleon/black
 	id_trim = /datum/id_trim/reaper_assassin
-	uniform = /obj/item/clothing/under/suit/black
+	uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
 	neck = /obj/item/clothing/neck/tie/red/hitman/tied
 	belt = /obj/item/modular_computer/pda/heads
 	ears = /obj/item/radio/headset

code/modules/clothing/under/costume.dm

@@ -277,6 +277,9 @@
 	greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C"
 	flags_1 = IS_PLAYER_COLORABLE_1
 
+/obj/item/clothing/under/costume/buttondown/slacks/service //preset one to be a formal white shirt and black pants
+	greyscale_colors = "#EEEEEE#CBDBFC#17171B#222227"
+
 /obj/item/clothing/under/costume/buttondown/shorts
 	name = "buttondown shirt with shorts"
 	desc = "A fancy buttondown shirt with shorts."
@@ -362,3 +365,13 @@
 	inhand_icon_state = null
 	female_sprite_flags = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/henchmen
+	name = "henchmen jumpsuit"
+	desc = "A very gaudy jumpsuit for a proper Henchman. Guild regulations, you understand."
+	icon = 'icons/obj/clothing/under/syndicate.dmi'
+	worn_icon = 'icons/mob/clothing/under/syndicate.dmi'
+	icon_state = "henchmen"
+	inhand_icon_state = null
+	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR

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

@@ -173,6 +173,7 @@
 	desc = "A tacky suit perfect for a CRIMINAL lawyer!"
 	icon_state = "good_suit"
 	inhand_icon_state = "good_suit"
+	icon = 'icons/obj/clothing/under/suits.dmi'
 	worn_icon = 'icons/mob/clothing/under/suits.dmi'
 
 /obj/item/clothing/under/rank/civilian/lawyer/beige/skirt
@@ -180,7 +181,6 @@
 	desc = "A tacky suitskirt perfect for a CRIMINAL lawyer!"
 	icon_state = "good_suit_skirt"
 	inhand_icon_state = "good_suit"
-	worn_icon = 'icons/mob/clothing/under/suits.dmi'
 	dying_key = DYE_REGISTRY_JUMPSKIRT
 	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

code/modules/clothing/under/suits.dm

@@ -3,27 +3,81 @@
 	worn_icon = 'icons/mob/clothing/under/suits.dmi'
 	can_adjust = FALSE
 	female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS
-
-/obj/item/clothing/under/suit/white_on_white
-	name = "white suit"
-	desc = "A white suit, suitable for an excellent host."
-	icon_state = "scratch"
 	inhand_icon_state = null
 
+/obj/item/clothing/under/suit/green
+	name = "green suit"
+	desc = "A green suit and yellow necktie. Baller."
+	icon = 'icons/obj/clothing/under/captain.dmi'
+	icon_state = "green_suit"
+	inhand_icon_state = "dg_suit"
+	worn_icon = 'icons/mob/clothing/under/captain.dmi'
+
+/obj/item/clothing/under/suit/red //Also used by the Curator's suit, /obj/item/clothing/under/rank/civilian/curator
+	name = "red suit"
+	desc = "A red suit and blue tie. Somewhat formal."
+	icon_state = "red_suit"
+	inhand_icon_state = "r_suit"
+
+/obj/item/clothing/under/suit/charcoal
+	name = "charcoal suit"
+	desc = "A charcoal suit and red tie. Very professional."
+	icon_state = "charcoal_suit"
+
+/obj/item/clothing/under/suit/navy
+	name = "navy suit"
+	desc = "A navy suit and red tie, intended for the station's finest."
+	icon_state = "navy_suit"
+
+/obj/item/clothing/under/suit/burgundy
+	name = "burgundy suit"
+	desc = "A burgundy suit and black tie. Somewhat formal."
+	icon_state = "burgundy_suit"
+
+/obj/item/clothing/under/suit/checkered
+	name = "checkered suit"
+	desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?"
+	icon_state = "checkered_suit"
+
+/obj/item/clothing/under/suit/beige
+	name = "beige suit"
+	desc = "An excellent light colored suit, experts in the field stress that it should not to be confused with the inferior tan suit."
+	icon_state = "beige_suit"
+
+/obj/item/clothing/under/suit/black
+	name = "black two piece suit"
+	desc = "A black suit with charcoal pants and a red tie. Very formal."
+	icon_state = "black_suit"
+
+/obj/item/clothing/under/suit/black/skirt
+	name = "black two piece suit"
+	desc = "A black suit with a charcoal skirt and a red tie. Very formal."
+	icon_state = "black_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	dying_key = DYE_REGISTRY_JUMPSKIRT
+	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/under/suit/white
+	name = "white suit"
+	desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!"
+	icon_state = "white_suit"
+	inhand_icon_state = "white_suit"
+
 /obj/item/clothing/under/suit/white/skirt
 	name = "white suitskirt"
 	desc = "A white suitskirt, suitable for an excellent host."
 	icon_state = "white_suit_skirt"
-	inhand_icon_state = null
 	body_parts_covered = CHEST|GROIN|ARMS
 	dying_key = DYE_REGISTRY_JUMPSKIRT
-	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS
+	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
 
-/obj/item/clothing/under/suit/sl
-	desc = "It's a very amish looking suit."
-	name = "amish suit"
-	icon_state = "sl_suit"
+/obj/item/clothing/under/suit/tan
+	name = "tan suit"
+	desc = "A tan suit. Smart, but casual."
+	icon_state = "tan_suit"
+	inhand_icon_state = "tan_suit"
 
 /obj/item/clothing/under/suit/waiter
 	name = "waiter's outfit"
@@ -32,31 +86,6 @@
 	inhand_icon_state = "waiter"
 	supports_variations_flags = CLOTHING_MONKEY_VARIATION
 
-/obj/item/clothing/under/suit/blacktwopiece
-	name = "black two piece suit"
-	desc = "A black suit and red tie. Very formal."
-	icon_state = "black_suit"
-	inhand_icon_state = null
-
-/obj/item/clothing/under/suit/black
-	name = "black suit"
-	desc = "A professional looking black suit. Ready for some serious law."
-	icon_state = "blacksuit"
-	inhand_icon_state = null
-	can_adjust = TRUE
-	alt_covers_chest = TRUE
-
-/obj/item/clothing/under/suit/black/skirt
-	name = "black suitskirt"
-	desc = "A professional black suitskirt. Nanotrasen Investigation Bureau approved!"
-	icon_state = "blacksuit_skirt"
-	inhand_icon_state = "bar_suit"
-	alt_covers_chest = TRUE
-	body_parts_covered = CHEST|GROIN|ARMS
-	dying_key = DYE_REGISTRY_JUMPSKIRT
-	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
 /obj/item/clothing/under/suit/black_really
 	name = "executive suit"
 	desc = "A formal black suit, intended for the station's finest."
@@ -73,72 +102,6 @@
 	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
 
-/obj/item/clothing/under/suit/green
-	name = "green suit"
-	desc = "A green suit and yellow necktie. Baller."
-	icon = 'icons/obj/clothing/under/captain.dmi'
-	icon_state = "green_suit"
-	inhand_icon_state = "dg_suit"
-	worn_icon = 'icons/mob/clothing/under/captain.dmi'
-
-/obj/item/clothing/under/suit/red
-	name = "red suit"
-	desc = "A red suit and blue tie. Somewhat formal."
-	icon_state = "red_suit"
-	inhand_icon_state = "r_suit"
-
-/obj/item/clothing/under/suit/charcoal
-	name = "charcoal suit"
-	desc = "A charcoal suit and red tie. Very professional."
-	icon_state = "charcoal_suit"
-	inhand_icon_state = null
-
-/obj/item/clothing/under/suit/navy
-	name = "navy suit"
-	desc = "A navy suit and red tie, intended for the station's finest."
-	icon_state = "navy_suit"
-	inhand_icon_state = null
-
-/obj/item/clothing/under/suit/burgundy
-	name = "burgundy suit"
-	desc = "A burgundy suit and black tie. Somewhat formal."
-	icon_state = "burgundy_suit"
-	inhand_icon_state = null
-
-/obj/item/clothing/under/suit/checkered
-	name = "checkered suit"
-	desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?"
-	icon_state = "checkered_suit"
-	inhand_icon_state = null
-
-/obj/item/clothing/under/suit/tan
-	name = "tan suit"
-	desc = "A tan suit. Smart, but casual."
-	icon_state = "tan_suit"
-	inhand_icon_state = "tan_suit"
-
-/obj/item/clothing/under/suit/white
-	name = "white suit"
-	desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!"
-	icon_state = "white_suit"
-	inhand_icon_state = "white_suit"
-
-/obj/item/clothing/under/suit/beige
-	name = "beige suit"
-	desc = "An excellent light colored suit, experts in the field stress that it should not to be confused with the inferior tan suit."
-	icon_state = "beige_suit"
-	inhand_icon_state = null
-
-/obj/item/clothing/under/suit/henchmen
-	name = "henchmen jumpsuit"
-	desc = "A very gaudy jumpsuit for a proper Henchman. Guild regulations, you understand."
-	icon = 'icons/obj/clothing/under/syndicate.dmi'
-	worn_icon = 'icons/mob/clothing/under/syndicate.dmi'
-	icon_state = "henchmen"
-	inhand_icon_state = null
-	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR
-
 /obj/item/clothing/under/suit/tuxedo
 	name = "tuxedo"
 	desc = "A formal black tuxedo. It exudes classiness."

code/modules/jobs/job_types/psychologist.dm

@@ -40,7 +40,7 @@
 
 	id = /obj/item/card/id/advanced
 	id_trim = /datum/id_trim/job/psychologist
-	uniform = /obj/item/clothing/under/suit/black
+	uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
 	backpack_contents = list(
 		/obj/item/storage/pill_bottle/happinesspsych,
 		/obj/item/storage/pill_bottle/lsdpsych,

code/modules/mafia/outfits.dm

@@ -46,7 +46,7 @@
 	gloves = /obj/item/clothing/gloves/color/white
 	shoes = /obj/item/clothing/shoes/laceup
 	suit = /obj/item/clothing/suit/costume/gothcoat
-	uniform = /obj/item/clothing/under/suit/black
+	uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
 
 //town
 
@@ -69,7 +69,7 @@
 /datum/outfit/mafia/psychologist
 	name = "Mafia Psychologist"
 
-	uniform = /obj/item/clothing/under/suit/black
+	uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
 	neck = /obj/item/clothing/neck/tie/black/tied
 	shoes = /obj/item/clothing/shoes/laceup
 

code/modules/vending/autodrobe.dm

@@ -46,7 +46,7 @@
 				/obj/item/clothing/under/costume/referee = 1,
 				/obj/item/clothing/mask/whistle = 1,
 				/obj/item/storage/backpack/henchmen = 5,
-				/obj/item/clothing/under/suit/henchmen = 5,
+				/obj/item/clothing/under/costume/henchmen = 5,
 				/obj/item/clothing/head/costume/jackbros = 5,
 				/obj/item/clothing/under/costume/jackbros = 5,
 				/obj/item/clothing/under/costume/deckers = 5,
@@ -104,7 +104,6 @@
 				/obj/item/clothing/shoes/singerb = 1,
 				/obj/item/clothing/under/costume/singer/blue = 1,
 				/obj/item/clothing/head/costume/cueball = 1,
-				/obj/item/clothing/under/suit/white_on_white = 1,
 			),
 		),
 		list(
@@ -160,8 +159,7 @@
 			"name" = "Service",
 			"icon" = "kitchen-set",
 			"products" = list(
-				/obj/item/clothing/under/suit/black = 1,
-				/obj/item/clothing/under/suit/sl = 1,
+				/obj/item/clothing/under/costume/buttondown/slacks/service = 1,
 				/obj/item/clothing/accessory/waistcoat = 1,
 				/obj/item/clothing/under/suit/waiter = 1,
 				/obj/item/clothing/suit/apron = 1,

code/modules/vending/clothesmate.dm

@@ -100,7 +100,7 @@
 				/obj/item/clothing/under/suit/burgundy = 1,
 				/obj/item/clothing/under/suit/charcoal = 1,
 				/obj/item/clothing/under/suit/white = 1,
-				/obj/item/clothing/under/suit/sl = 1,
+				/obj/item/clothing/under/costume/buttondown/slacks/service = 1,
 				/obj/item/clothing/suit/jacket/bomber = 2,
 				/obj/item/clothing/suit/jacket/puffer/vest = 2,
 				/obj/item/clothing/suit/jacket/puffer = 2,

code/modules/vending/wardrobes.dm

@@ -167,7 +167,7 @@
 		/obj/item/clothing/head/costume/mailman = 1,
 		/obj/item/clothing/under/misc/mailman = 1,
 		/obj/item/clothing/under/rank/cargo/miner = 3,
-		
+
 	)
 	refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
 	payment_department = ACCOUNT_CAR
@@ -229,7 +229,7 @@
 		/obj/item/storage/backpack/satchel/science = 3,
 		/obj/item/storage/backpack/duffelbag/science = 3,
 		/obj/item/radio/headset/headset_sci = 3,
-		
+
 	)
 	refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe
 	payment_department = ACCOUNT_SCI
@@ -350,7 +350,7 @@
 		/obj/item/clothing/head/hats/tophat = 2,
 		/obj/item/clothing/head/soft/black = 2,
 		/obj/item/clothing/neck/petcollar = 1,
-		/obj/item/clothing/under/suit/sl = 2,
+		/obj/item/clothing/under/costume/buttondown/slacks/service = 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,

modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm

@@ -614,8 +614,8 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
 /datum/loadout_item/under/formal
 
 /datum/loadout_item/under/formal/amish_suit
-	name = "Amish Suit"
-	item_path = /obj/item/clothing/under/suit/sl
+	name = "White Buttondown Shirt with Black Slacks"
+	item_path = /obj/item/clothing/under/costume/buttondown/slacks/service
 
 /datum/loadout_item/under/formal/formaldressred
 	name = "Formal Red Dress"
@@ -749,10 +749,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
 	name = "Sailor Dress"
 	item_path = /obj/item/clothing/under/dress/sailor
 
-/datum/loadout_item/under/formal/scratch_suit
-	name = "Scratch Suit"
-	item_path = /obj/item/clothing/under/suit/white_on_white
-
 /datum/loadout_item/under/formal/sensible_suit
 	name = "Sensible Suit"
 	item_path = /obj/item/clothing/under/rank/civilian/curator

modular_skyrat/modules/modular_vending/code/wardrobes.dm

@@ -179,7 +179,7 @@
 	products = list(
 		/obj/item/clothing/head/hats/tophat = 2,
 		/obj/item/radio/headset/headset_srv = 0,
-		/obj/item/clothing/under/suit/sl = 2,
+		/obj/item/clothing/under/costume/buttondown/slacks/service = 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,