[MIRROR] The GAGening: Families edition [MDB IGNORE] (#15353)

* The GAGening: Families edition * ew Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2026-08-22 20:48:56 +01:00 · 2022-08-04 15:47:58 +01:00
parent efbb63ae35
commit 8ea5bc8c04
70 changed files with 757 additions and 473 deletions
@@ -49682,7 +49682,7 @@
 "pmY" = (
 /obj/structure/rack,
 /obj/structure/window/reinforced/spawner/east,
-/obj/item/clothing/head/saints,
+/obj/item/clothing/head/fancy,
 /turf/open/floor/iron/dark/textured,
 /area/station/security/prison)
 "pna" = (
@@ -645,42 +645,42 @@

 /datum/greyscale_config/slacks
 	name = "Slacks"
-	icon_file = 'icons/obj/clothing/under/shorts_pants.dmi'
+	icon_file = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
 	json_config = 'code/datums/greyscale/json_configs/slacks.json'

 /datum/greyscale_config/slacks_worn
 	name = "Worn Slacks"
-	icon_file = 'icons/mob/clothing/under/shorts_pants.dmi'
+	icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
 	json_config = 'code/datums/greyscale/json_configs/slacks_worn.json'

 /datum/greyscale_config/shorts
 	name = "Shorts"
-	icon_file = 'icons/obj/clothing/under/shorts_pants.dmi'
+	icon_file = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
 	json_config = 'code/datums/greyscale/json_configs/shorts.json'

 /datum/greyscale_config/shorts_worn
 	name = "Worn Shorts"
-	icon_file = 'icons/mob/clothing/under/shorts_pants.dmi'
+	icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
 	json_config = 'code/datums/greyscale/json_configs/shorts_worn.json'

 /datum/greyscale_config/jeans
 	name = "Jeans"
-	icon_file = 'icons/obj/clothing/under/shorts_pants.dmi'
+	icon_file = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
 	json_config = 'code/datums/greyscale/json_configs/jeans.json'

 /datum/greyscale_config/jeans_worn
 	name = "Worn Jeans"
-	icon_file = 'icons/mob/clothing/under/shorts_pants.dmi'
+	icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
 	json_config = 'code/datums/greyscale/json_configs/jeans_worn.json'

 /datum/greyscale_config/jeanshorts
 	name = "Jean Shorts"
-	icon_file = 'icons/obj/clothing/under/shorts_pants.dmi'
+	icon_file = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
 	json_config = 'code/datums/greyscale/json_configs/jeanshorts.json'

 /datum/greyscale_config/jeanshorts_worn
 	name = "Worn Jean Shorts"
-	icon_file = 'icons/mob/clothing/under/shorts_pants.dmi'
+	icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
 	json_config = 'code/datums/greyscale/json_configs/jeanshorts_worn.json'

 /datum/greyscale_config/tape
@@ -712,3 +712,113 @@
 	name = "Worn Tape Piece"
 	icon_file = 'icons/obj/tapes.dmi'
 	json_config = 'code/datums/greyscale/json_configs/tape_piece_spikes_worn.json'
+
+/datum/greyscale_config/buttondown_slacks
+	name = "Buttondown with Slacks"
+	icon_file = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
+	json_config = 'code/datums/greyscale/json_configs/buttondown_slacks.json'
+
+/datum/greyscale_config/buttondown_slacks_worn
+	name = "Worn Buttondown with Slacks"
+	icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
+	json_config = 'code/datums/greyscale/json_configs/buttondown_slacks_worn.json'
+
+/datum/greyscale_config/buttondown_shorts
+	name = "Buttondown with Shorts"
+	icon_file = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
+	json_config = 'code/datums/greyscale/json_configs/buttondown_shorts.json'
+
+/datum/greyscale_config/buttondown_shorts_worn
+	name = "Worn Buttondown with Shorts"
+	icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
+	json_config = 'code/datums/greyscale/json_configs/buttondown_shorts_worn.json'
+
+/datum/greyscale_config/sweater
+	name = "Sweater"
+	icon_file = 'icons/obj/clothing/suits.dmi'
+	json_config = 'code/datums/greyscale/json_configs/sweater.json'
+
+/datum/greyscale_config/sweater_worn
+	name = "Worn Sweater"
+	icon_file = 'icons/mob/clothing/suits/jacket.dmi'
+	json_config = 'code/datums/greyscale/json_configs/sweater_worn.json'
+
+/datum/greyscale_config/jacket_oversized
+	name = "Oversized Jacket"
+	icon_file = 'icons/obj/clothing/suits.dmi'
+	json_config = 'code/datums/greyscale/json_configs/jacket_oversized.json'
+
+/datum/greyscale_config/jacket_oversized_worn
+	name = "Worn Oversized Jacket"
+	icon_file = 'icons/mob/clothing/suits/jacket.dmi'
+	json_config = 'code/datums/greyscale/json_configs/jacket_oversized_worn.json'
+
+/datum/greyscale_config/infinity_scarf
+	name = "Infinity Scarf"
+	icon_file = 'icons/obj/clothing/neck.dmi'
+	json_config = 'code/datums/greyscale/json_configs/infinity_scarf.json'
+
+/datum/greyscale_config/infinity_scarf_worn
+	name = "Worn Infinity Scarf"
+	icon_file = 'icons/mob/clothing/neck.dmi'
+	json_config = 'code/datums/greyscale/json_configs/infinity_scarf_worn.json'
+
+/datum/greyscale_config/football_helmet
+	name = "Football Helmet"
+	icon_file = 'icons/obj/clothing/hats.dmi'
+	json_config = 'code/datums/greyscale/json_configs/football_helmet.json'
+
+/datum/greyscale_config/football_helmet_worn
+	name = "Worn Football Helmet"
+	icon_file = 'icons/mob/clothing/head.dmi'
+	json_config = 'code/datums/greyscale/json_configs/football_helmet_worn.json'
+
+/datum/greyscale_config/football_suit
+	name = "Football Suit"
+	icon_file = 'icons/obj/clothing/under/costume.dmi'
+	json_config = 'code/datums/greyscale/json_configs/football_suit.json'
+
+/datum/greyscale_config/football_suit_worn
+	name = "Worn Football Suit"
+	icon_file = 'icons/mob/clothing/under/costume.dmi'
+	json_config = 'code/datums/greyscale/json_configs/football_suit_worn.json'
+
+/datum/greyscale_config/football_armor
+	name = "Football Armor"
+	icon_file = 'icons/obj/clothing/suits.dmi'
+	json_config = 'code/datums/greyscale/json_configs/football_armor.json'
+
+/datum/greyscale_config/football_armor_worn
+	name = "Worn Football Armor"
+	icon_file = 'icons/mob/clothing/suits/costume.dmi'
+	json_config = 'code/datums/greyscale/json_configs/football_armor_worn.json'
+
+/datum/greyscale_config/waistcoat
+	name = "Waistcoat"
+	icon_file = 'icons/obj/clothing/accessories.dmi'
+	json_config = 'code/datums/greyscale/json_configs/waistcoat.json'
+
+/datum/greyscale_config/waistcoat_worn
+	name = "Worn Waistcoat"
+	icon_file = 'icons/mob/clothing/accessories.dmi'
+	json_config = 'code/datums/greyscale/json_configs/waistcoat_worn.json'
+
+/datum/greyscale_config/fancy_hat
+	name = "Fancy Hat"
+	icon_file = 'icons/obj/clothing/hats.dmi'
+	json_config = 'code/datums/greyscale/json_configs/fancy_hat.json'
+
+/datum/greyscale_config/fancy_hat_worn
+	name = "Worn Fancy Hat"
+	icon_file = 'icons/mob/clothing/head.dmi'
+	json_config = 'code/datums/greyscale/json_configs/fancy_hat_worn.json'
+
+/datum/greyscale_config/fancy_coat
+	name = "Fancy Coat"
+	icon_file = 'icons/obj/clothing/suits.dmi'
+	json_config = 'code/datums/greyscale/json_configs/fancy_coat.json'
+
+/datum/greyscale_config/fancy_coat_worn
+	name = "Worn Fancy Coat"
+	icon_file = 'icons/mob/clothing/suits/jacket.dmi'
+	json_config = 'code/datums/greyscale/json_configs/fancy_coat_worn.json'
@@ -0,0 +1,28 @@
+{
+	"buttondown_shorts": [
+		{
+			"type": "icon_state",
+			"icon_state": "buttondown",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "buckle",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "belt",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "shorts",
+			"blend_mode": "overlay",
+			"color_ids": [ 4 ]
+		}
+	]
+}
@@ -0,0 +1,28 @@
+{
+	"buttondown_shorts": [
+		{
+			"type": "icon_state",
+			"icon_state": "buttondown",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "buckle",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "belt",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "shorts",
+			"blend_mode": "overlay",
+			"color_ids": [ 4 ]
+		}
+	]
+}
@@ -0,0 +1,28 @@
+{
+	"buttondown_slacks": [
+		{
+			"type": "icon_state",
+			"icon_state": "buttondown",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "buckle",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "belt",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "slacks",
+			"blend_mode": "overlay",
+			"color_ids": [ 4 ]
+		}
+	]
+}
@@ -0,0 +1,28 @@
+{
+	"buttondown_slacks": [
+		{
+			"type": "icon_state",
+			"icon_state": "buttondown",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "buckle",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "belt",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "slacks",
+			"blend_mode": "overlay",
+			"color_ids": [ 4 ]
+		}
+	]
+}
@@ -0,0 +1,16 @@
+{
+	"fancy_coat": [
+		{
+			"type": "icon_state",
+			"icon_state": "fancy_fur",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "fancy_coat",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}
@@ -0,0 +1,16 @@
+{
+	"fancy_coat": [
+		{
+			"type": "icon_state",
+			"icon_state": "fancy_fur",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "fancy_coat",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}
@@ -0,0 +1,16 @@
+{
+	"fancy_hat": [
+		{
+			"type": "icon_state",
+			"icon_state": "fancy_feather",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "fancy_hat",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}
@@ -0,0 +1,16 @@
+{
+	"fancy_hat": [
+		{
+			"type": "icon_state",
+			"icon_state": "fancy_feather",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "fancy_hat",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}
@@ -0,0 +1,15 @@
+{
+    "football_armor": [
+        {
+            "type": "icon_state",
+            "icon_state": "football_armor",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "football_number",
+            "blend_mode": "overlay"
+        }
+    ]
+}
@@ -0,0 +1,15 @@
+{
+    "football_armor": [
+        {
+            "type": "icon_state",
+            "icon_state": "football_armor",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "football_number",
+            "blend_mode": "overlay"
+        }
+    ]
+}
@@ -0,0 +1,15 @@
+{
+    "football_helmet": [
+        {
+            "type": "icon_state",
+            "icon_state": "football_helmet",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "football_stripe",
+            "blend_mode": "overlay"
+        }
+    ]
+}
@@ -0,0 +1,15 @@
+{
+    "football_helmet": [
+        {
+            "type": "icon_state",
+            "icon_state": "football_helmet",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "football_stripe",
+            "blend_mode": "overlay"
+        }
+    ]
+}
@@ -0,0 +1,15 @@
+{
+    "football_suit": [
+        {
+            "type": "icon_state",
+            "icon_state": "football_suit",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "football_number",
+            "blend_mode": "overlay"
+        }
+    ]
+}
@@ -0,0 +1,15 @@
+{
+    "football_suit": [
+        {
+            "type": "icon_state",
+            "icon_state": "football_suit",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        },
+		{
+            "type": "icon_state",
+            "icon_state": "football_number",
+            "blend_mode": "overlay"
+        }
+    ]
+}
@@ -0,0 +1,10 @@
+{
+	"infinity_scarf": [
+		{
+			"type": "icon_state",
+			"icon_state": "infinity_scarf",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
@@ -0,0 +1,10 @@
+{
+	"infinity_scarf": [
+		{
+			"type": "icon_state",
+			"icon_state": "infinity_scarf",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
@@ -0,0 +1,10 @@
+{
+	"jacket_oversized": [
+		{
+			"type": "icon_state",
+			"icon_state": "jacket_oversized",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
@@ -0,0 +1,10 @@
+{
+	"jacket_oversized": [
+		{
+			"type": "icon_state",
+			"icon_state": "jacket_oversized",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
@@ -2,19 +2,19 @@
 	"jeans": [
 		{
 			"type": "icon_state",
-			"icon_state": "jeans_buckle",
+			"icon_state": "buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "jeans_belt",
+			"icon_state": "belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "jeans_base",
+			"icon_state": "jeans",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		}
@@ -2,19 +2,19 @@
 	"jeans": [
 		{
 			"type": "icon_state",
-			"icon_state": "jeans_buckle",
+			"icon_state": "buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "jeans_belt",
+			"icon_state": "belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "jeans_base",
+			"icon_state": "jeans",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		}
@@ -2,19 +2,19 @@
 	"jeanshorts": [
 		{
 			"type": "icon_state",
-			"icon_state": "jeanshorts_buckle",
+			"icon_state": "buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "jeanshorts_belt",
+			"icon_state": "belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "jeanshorts_base",
+			"icon_state": "jeanshorts",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		}
@@ -2,19 +2,19 @@
 	"jeanshorts": [
 		{
 			"type": "icon_state",
-			"icon_state": "jeanshorts_buckle",
+			"icon_state": "buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "jeanshorts_belt",
+			"icon_state": "belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "jeanshorts_base",
+			"icon_state": "jeanshorts",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		}
@@ -2,19 +2,19 @@
 	"shorts": [
 		{
 			"type": "icon_state",
-			"icon_state": "shorts_buckle",
+			"icon_state": "buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "shorts_belt",
+			"icon_state": "belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "shorts_base",
+			"icon_state": "shorts",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		}
@@ -2,19 +2,19 @@
 	"shorts": [
 		{
 			"type": "icon_state",
-			"icon_state": "shorts_buckle",
+			"icon_state": "buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "shorts_belt",
+			"icon_state": "belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "shorts_base",
+			"icon_state": "shorts",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		}
@@ -2,19 +2,19 @@
 	"slacks": [
 		{
 			"type": "icon_state",
-			"icon_state": "slacks_buckle",
+			"icon_state": "buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "slacks_belt",
+			"icon_state": "belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "slacks_base",
+			"icon_state": "slacks",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		}
@@ -2,19 +2,19 @@
 	"slacks": [
 		{
 			"type": "icon_state",
-			"icon_state": "slacks_buckle",
+			"icon_state": "buckle",
 			"blend_mode": "overlay",
 			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "slacks_belt",
+			"icon_state": "belt",
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "slacks_base",
+			"icon_state": "slacks",
 			"blend_mode": "overlay",
 			"color_ids": [ 3 ]
 		}
@@ -0,0 +1,18 @@
+{
+	"sweater": [
+		{
+			"type": "icon_state",
+			"icon_state": "sweater",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"sweater_t": [
+		{
+			"type": "icon_state",
+			"icon_state": "sweater_t",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
@@ -0,0 +1,18 @@
+{
+	"sweater": [
+		{
+			"type": "icon_state",
+			"icon_state": "sweater",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"sweater_t": [
+		{
+			"type": "icon_state",
+			"icon_state": "sweater_t",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
@@ -0,0 +1,10 @@
+{
+	"waistcoat": [
+		{
+			"type": "icon_state",
+			"icon_state": "waistcoat",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
@@ -0,0 +1,10 @@
+{
+	"waistcoat": [
+		{
+			"type": "icon_state",
+			"icon_state": "waistcoat",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
@@ -166,7 +166,7 @@

 /obj/structure/closet/wardrobe/mixed/PopulateContents()
 	if(prob(40))
-		new /obj/item/clothing/suit/jacket(src)
+		new /obj/item/clothing/suit/jacket/bomber(src)
 	new /obj/item/clothing/under/color/white(src)
 	new /obj/item/clothing/under/color/jumpskirt/white(src)
 	new /obj/item/clothing/under/color/blue(src)
@@ -88,7 +88,7 @@
 /datum/outfit/syndicate/reinforcement/cybersun
 	name = "Syndicate Operative - Cybersun Reinforcement"
 	uniform = /obj/item/clothing/under/syndicate/combat
-	suit = /obj/item/clothing/suit/jacket/det_suit/dark
+	suit = /obj/item/clothing/suit/jacket/oversized
 	gloves = /obj/item/clothing/gloves/fingerless
 	glasses = /obj/item/clothing/glasses/sunglasses
 	mask = /obj/item/clothing/mask/cigarette/cigar
@@ -595,18 +595,6 @@
 		var/mob/living/carbon/human/H = user
 		H.update_sight()

-/obj/item/clothing/glasses/osi
-	name = "O.S.I. Sunglasses"
-	desc = "There's no such thing as good news! Just bad news and... weird news.."
-	icon_state = "osi_glasses"
-	inhand_icon_state = "osi_glasses"
-
-/obj/item/clothing/glasses/phantom
-	name = "Phantom Thief Mask"
-	desc = "Lookin' cool."
-	icon_state = "phantom_glasses"
-	inhand_icon_state = "phantom_glasses"
-
 /obj/item/clothing/glasses/regular/kim
 	name = "binoclard lenses"
 	desc = "Shows you know how to sew a lapel and center a back vent."
@@ -653,3 +641,15 @@
 	inhand_icon_state = "glasses"
 	glass_colour_type = /datum/client_colour/glass_colour/nightmare
 	forced_glass_color = TRUE
+
+/obj/item/clothing/glasses/osi
+	name = "O.S.I. Sunglasses"
+	desc = "There's no such thing as good news! Just bad news and... weird news.."
+	icon_state = "osi_glasses"
+	inhand_icon_state = "osi_glasses"
+
+/obj/item/clothing/glasses/phantom
+	name = "Phantom Thief Mask"
+	desc = "Lookin' cool."
+	icon_state = "phantom_glasses"
+	inhand_icon_state = "phantom_glasses"
@@ -128,57 +128,21 @@
 	flags_inv = HIDEEARS|HIDEHAIR
 	armor = list(MELEE = 5, BULLET = 0, LASER = -5, ENERGY = -15, BOMB = 10, BIO = 0, FIRE = 20, ACID = 20)

-/obj/item/clothing/head/irs
-	name = "internal revenue service cap"
-	icon_state = "irs_hat"
-	inhand_icon_state = "irs_hat"
+/obj/item/clothing/head/fancy
+	name = "fancy hat"
+	icon_state = "fancy_hat"
+	greyscale_colors = "#E3C937#782A81"
+	greyscale_config = /datum/greyscale_config/fancy_hat
+	greyscale_config_worn = /datum/greyscale_config/fancy_hat_worn
+	flags_1 = IS_PLAYER_COLORABLE_1

-/obj/item/clothing/head/pg
-	name = "powder ganger beanie"
-	icon_state = "pg_hat"
-	inhand_icon_state = "pg_hat"
-
-/obj/item/clothing/head/tmc
-	name = "Lost M.C. bandana"
-	icon_state = "tmc_hat"
-	inhand_icon_state = "tmc_hat"
-
-/obj/item/clothing/head/deckers
-	name = "Decker headphones"
-	icon_state = "decker_hat"
-	inhand_icon_state = "decker_hat"
-
-/obj/item/clothing/head/morningstar
-	name = "Morningstar beret"
-	icon_state = "morningstar_hat"
-	inhand_icon_state = "morningstar_hat"
-
-/obj/item/clothing/head/saints
-	name = "Saints hat"
-	icon_state = "saints_hat"
-	inhand_icon_state = "saints_hat"
-
-/obj/item/clothing/head/allies
-	name = "allies helmet"
-	icon_state = "allies_helmet"
-	inhand_icon_state = "allies_helmet"
-
-/obj/item/clothing/head/yuri
-	name = "yuri initiate helmet"
-	icon_state = "yuri_helmet"
-	inhand_icon_state = "yuri_helmet"
-	clothing_flags = SNUG_FIT
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
-
-/obj/item/clothing/head/sybil_slickers
-	name = "sybil slickers helmet"
-	icon_state = "football_helmet_blue"
-	inhand_icon_state = "football_helmet_blue"
-
-/obj/item/clothing/head/basil_boys
-	name = "basil boys helmet"
-	icon_state = "football_helmet_red"
-	inhand_icon_state = "football_helmet_red"
+/obj/item/clothing/head/football_helmet
+	name = "football helmet"
+	icon_state = "football_helmet"
+	greyscale_colors = "#D74722"
+	greyscale_config = /datum/greyscale_config/football_helmet
+	greyscale_config_worn = /datum/greyscale_config/football_helmet_worn
+	flags_1 = IS_PLAYER_COLORABLE_1

 /obj/item/clothing/head/tv_head
 	name = "television helmet"
@@ -201,3 +165,30 @@
 /obj/item/clothing/head/tv_head/fov_less
 	desc = "A mysterious headgear made from the hollowed out remains of a status display. How very retro-retro-futuristic of you. It's very easy to see out of this one."
 	has_fov = FALSE
+
+/obj/item/clothing/head/irs
+	name = "internal revenue service cap"
+	icon_state = "irs_hat"
+	inhand_icon_state = "irs_hat"
+
+/obj/item/clothing/head/tmc
+	name = "Lost M.C. bandana"
+	icon_state = "tmc_hat"
+	inhand_icon_state = "tmc_hat"
+
+/obj/item/clothing/head/deckers
+	name = "Decker headphones"
+	icon_state = "decker_hat"
+	inhand_icon_state = "decker_hat"
+
+/obj/item/clothing/head/yuri
+	name = "yuri initiate helmet"
+	icon_state = "yuri_helmet"
+	inhand_icon_state = "yuri_helmet"
+	clothing_flags = SNUG_FIT
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+
+/obj/item/clothing/head/allies
+	name = "allies helmet"
+	icon_state = "allies_helmet"
+	inhand_icon_state = "allies_helmet"
@@ -228,12 +228,3 @@
 		inhand_icon_state = downsprite
 		to_chat(user, span_notice("You lower the ear flaps on the ushanka."))
 	earflaps = !earflaps
-
-
-/obj/item/clothing/head/ushanka/soviet
-	name = "soviet ushanka"
-	desc = "For the union!"
-	icon_state = "sovietushankadown"
-	inhand_icon_state = "sovietushankadown"
-	upsprite = "sovietushankaup"
-	downsprite = "sovietushankadown"
@@ -391,14 +391,6 @@
 	flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR|HIDESNOUT
 	has_fov = FALSE

-/obj/item/clothing/mask/gas/driscoll
-	name = "driscoll mask"
-	desc = "Great for train hijackings. Works like a normal full face gas mask, but won't conceal your identity."
-	icon_state = "driscoll_mask"
-	flags_inv = HIDEFACIALHAIR
-	w_class = WEIGHT_CLASS_NORMAL
-	inhand_icon_state = "driscoll_mask"
-
 /obj/item/clothing/mask/gas/prop
 	name = "prop gas mask"
 	desc = "A prop gas mask designed for appearance. Unlike a normal gas mask this does not filter gasses or protect against pepper spray."
@@ -419,3 +411,11 @@
 	flags_cover = MASKCOVERSMOUTH
 	resistance_flags = FLAMMABLE
 	has_fov = FALSE
+
+/obj/item/clothing/mask/gas/driscoll
+	name = "driscoll mask"
+	desc = "Great for train hijackings. Works like a normal full face gas mask, but won't conceal your identity."
+	icon_state = "driscoll_mask"
+	flags_inv = HIDEFACIALHAIR
+	w_class = WEIGHT_CLASS_NORMAL
+	inhand_icon_state = "driscoll_mask"
@@ -266,7 +266,8 @@
 /obj/item/clothing/neck/large_scarf
 	name = "large scarf"
 	icon_state = "large_scarf"
-	custom_price = PAYCHECK_CREW * 0.2
+	w_class = WEIGHT_CLASS_TINY
+	custom_price = PAYCHECK_CREW
 	greyscale_colors = "#C6C6C6#EEEEEE"
 	greyscale_config = /datum/greyscale_config/large_scarf
 	greyscale_config_worn = /datum/greyscale_config/large_scarf_worn
@@ -290,6 +291,16 @@
 	greyscale_colors = "#B40000#545350"
 	armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 40)

+/obj/item/clothing/neck/infinity_scarf
+	name = "infinity scarf"
+	icon_state = "infinity_scarf"
+	w_class = WEIGHT_CLASS_TINY
+	custom_price = PAYCHECK_CREW
+	greyscale_colors = "#EEEEEE"
+	greyscale_config = /datum/greyscale_config/infinity_scarf
+	greyscale_config_worn = /datum/greyscale_config/infinity_scarf_worn
+	flags_1 = IS_PLAYER_COLORABLE_1
+
 /obj/item/clothing/neck/petcollar
 	name = "pet collar"
 	desc = "It's for pets."
@@ -17,7 +17,7 @@

 /obj/item/clothing/shoes/griffin/Initialize(mapload)
 	. = ..()
-	
+
 	create_storage(type = /datum/storage/pockets/shoes)

 /obj/item/clothing/shoes/singery
@@ -50,12 +50,6 @@
 	can_be_tied = FALSE
 	species_exception = list(/datum/species/golem)

-/obj/item/clothing/shoes/yakuza
-	name = "tojo clan shoes"
-	desc = "Steel-toed and intimidating."
-	icon_state = "MajimaShoes"
-	inhand_icon_state = "MajimaShoes_worn"
-
 /obj/item/clothing/shoes/jackbros
 	name = "frosty boots"
 	desc = "For when you're stepping on up to the plate."
@@ -68,39 +62,20 @@
 	icon_state = "SwagShoes"
 	inhand_icon_state = "SwagShoes"

-/obj/item/clothing/shoes/phantom
-	name = "phantom shoes"
-	desc = "Excellent for when you need to do cool flashy flips."
-	icon_state = "phantom_shoes"
-	inhand_icon_state = "phantom_shoes"
+/obj/item/clothing/shoes/glow
+	name = "glow shoes"
+	desc = "t3h c00L3st sh03z j00'LL 3v3r f1nd."
+	icon_state = "glow_shoes"
+	inhand_icon_state = "glow_shoes"
+
+/obj/item/clothing/shoes/jackbros
+	name = "frosty boots"
+	desc = "For when you're stepping on up to the plate."
+	icon_state = "JackFrostShoes"
+	inhand_icon_state = "JackFrostShoes_worn"

 /obj/item/clothing/shoes/saints
 	name = "saints sneakers"
 	desc = "Officially branded Saints sneakers. Incredibly valuable!"
 	icon_state = "saints_shoes"
 	inhand_icon_state = "saints_shoes"
-
-/obj/item/clothing/shoes/morningstar
-	name = "morningstar boots"
-	desc = "The most expensive boots on this station. Wearing them dropped the value by about 50%."
-	icon_state = "morningstar_shoes"
-	inhand_icon_state = "morningstar_shoes"
-
-/obj/item/clothing/shoes/deckers
-	name = "deckers rollerskates"
-	desc = "t3h c00L3st sh03z j00'LL 3v3r f1nd."
-	icon_state = "decker_shoes"
-	inhand_icon_state = "decker_shoes"
-
-/obj/item/clothing/shoes/sybil_slickers
-	name = "sybil slickers shoes"
-	desc = "FOOTBALL! YEAH!"
-	icon_state = "sneakers_blue"
-	inhand_icon_state = "sneakers_blue"
-
-/obj/item/clothing/shoes/basil_boys
-	name = "basil boys shoes"
-	desc = "FOOTBALL! YEAH!"
-	icon_state = "sneakers_red"
-	inhand_icon_state = "sneakers_red"
-
@@ -471,62 +471,20 @@
 	inhand_icon_state = "hawaiian_blue"
 	species_exception = list(/datum/species/golem)

-/obj/item/clothing/suit/costume/yakuza
-	name = "tojo clan jacket"
-	desc = "The jacket of a mad dog."
-	icon_state = "MajimaJacket"
-	inhand_icon_state = "MajimaJacket"
+/obj/item/clothing/suit/costume/football_armor
+	name = "football protective gear"
+	desc = "Given to members of the football team!"
+	icon_state = "football_armor"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+	greyscale_config = /datum/greyscale_config/football_armor
+	greyscale_config_worn = /datum/greyscale_config/football_armor_worn
+	greyscale_colors = "#D74722"
+	flags_1 = IS_PLAYER_COLORABLE_1

-/obj/item/clothing/suit/costume/dutch
-	name = "dutch's jacket"
-	desc = "For those long nights on the beach in Tahiti."
-	icon_state = "DutchJacket"
-	inhand_icon_state = "DutchJacket"
-	body_parts_covered = ARMS
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/suit/costume/driscoll
-	name = "driscoll poncho"
-	desc = "Keeping you warm in the harsh cold of space."
-	icon_state = "driscoll_suit"
-	inhand_icon_state = "driscoll_suit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/suit/costume/irs
-	name = "internal revenue service jacket"
-	desc = "I'm crazy enough to take on The Owl, but the IRS? Nooo thank you!"
-	icon_state = "irs_suit"
-	inhand_icon_state = "irs_suit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/suit/costume/osi
-	name = "\improper O.S.I. body armor"
-	desc = "You're beyond good and evil, super man. You work for the government. And you're a tool, boy, a tool! Built for a single purpose by the United States of shut your third fucking damn eye for a fucking reason! You can't teach a hammer to love nails, son. That dog don't hunt!"
-	icon_state = "osi_suit"
-	inhand_icon_state = "osi_suit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/suit/costume/tmc
-	name = "\improper Lost M.C. cut"
-	desc = "Making sure everyone knows you're in the best biker gang this side of Alderney."
-	icon_state = "tmc_suit"
-	inhand_icon_state = "tmc_suit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/suit/costume/pg
-	name = "powder ganger jacket"
-	desc = "Remind Security of their mistakes in giving prisoners blasting charges."
-	icon_state = "pg_suit"
-	inhand_icon_state = "pg_suit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+/obj/item/clothing/suit/costume/joker
+	name = "comedian coat"
+	desc = "I mean, don’t you have to be funny to be a comedian?"
+	icon_state = "joker_coat"

 /obj/item/clothing/suit/costume/deckers
 	name = "decker hoodie"
@@ -536,40 +494,6 @@
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

-/obj/item/clothing/suit/costume/morningstar
-	name = "morningstar coat"
-	desc = "This coat costs more than you've ever made in your entire life."
-	icon_state = "morningstar_suit"
-	inhand_icon_state = "morningstar_suit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/suit/costume/saints
-	name = "Third Street Saints fur coat"
-	desc = "Rated 10 out of 10 in Cosmo for best coat brand."
-	icon_state = "saints_suit"
-	inhand_icon_state = "saints_suit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	cold_protection = CHEST|GROIN|LEGS|ARMS
-	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/suit/costume/phantom
-	name = "phantom thief coat"
-	desc = "Your foes will never see you coming in this stealthy yet stylish getup."
-	icon_state = "phantom_suit"
-	inhand_icon_state = "phantom_suit"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
-/obj/item/clothing/suit/costume/allies
-	name = "allies body armor"
-	desc = "How 'bout some action!? Sponsored by DonkSoft Co. for historical reenactment of the Third World War!"
-	icon_state = "allies_armor"
-	inhand_icon_state = "allies_armor"
-	body_parts_covered = CHEST|GROIN
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
 /obj/item/clothing/suit/costume/soviet
 	name = "soviet armored coat"
 	desc = "Conscript reporting! Sponsored by DonkSoft Co. for historical reenactment of the Third World War!"
@@ -584,21 +508,18 @@
 	inhand_icon_state = "yuri_coat"
 	body_parts_covered = CHEST|GROIN|ARMS

-/obj/item/clothing/suit/costume/sybil_slickers
-	name = "sybil slickers protective gear"
-	desc = "Given to members of the Sybil Slickers football team!"
-	icon_state = "football_armor_blue"
-	inhand_icon_state = "football_armor_blue"
+/obj/item/clothing/suit/costume/tmc
+	name = "\improper Lost M.C. cut"
+	desc = "Making sure everyone knows you're in the best biker gang this side of Alderney."
+	icon_state = "tmc_suit"
+	inhand_icon_state = "tmc_suit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

-/obj/item/clothing/suit/costume/basil_boys
-	name = "basil boys protective gear"
-	desc = "Given to members of the Basil Boys football team!"
-	icon_state = "football_armor_red"
-	inhand_icon_state = "football_armor_red"
+/obj/item/clothing/suit/costume/pg
+	name = "powder ganger jacket"
+	desc = "Remind Security of their mistakes in giving prisoners blasting charges."
+	icon_state = "pg_suit"
+	inhand_icon_state = "pg_suit"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-
-/obj/item/clothing/suit/costume/joker
-	name = "comedian coat"
-	desc = "I mean, don’t you have to be funny to be a comedian?"
-	icon_state = "joker_coat"
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
@@ -1,15 +1,49 @@
 /obj/item/clothing/suit/jacket
-	name = "bomber jacket"
-	desc = "Aviators not included."
-	icon_state = "bomberjacket"
 	worn_icon = 'icons/mob/clothing/suits/jacket.dmi'
-	inhand_icon_state = "brownjsuit"
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio)
 	body_parts_covered = CHEST|GROIN|ARMS
 	cold_protection = CHEST|GROIN|ARMS
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 	species_exception = list(/datum/species/golem)

+/obj/item/clothing/suit/toggle/jacket/sweater
+	name = "sweater jacket"
+	desc = "A sweater jacket."
+	icon_state = "sweater"
+	worn_icon = 'icons/mob/clothing/suits/jacket.dmi'
+	greyscale_config = /datum/greyscale_config/sweater
+	greyscale_config_worn = /datum/greyscale_config/sweater_worn
+	greyscale_colors = "#414344"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/suit/jacket/oversized
+	name = "oversized jacket"
+	desc = "An oversized jacket."
+	icon_state = "jacket_oversized"
+	greyscale_config = /datum/greyscale_config/jacket_oversized
+	greyscale_config_worn = /datum/greyscale_config/jacket_oversized_worn
+	greyscale_colors = "#414344"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/suit/jacket/fancy
+	name = "fancy fur coat"
+	desc = "Rated 10 out of 10 in Cosmo for best coat brand."
+	icon_state = "fancy_coat"
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS
+	cold_protection = CHEST|GROIN|LEGS|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+	greyscale_config = /datum/greyscale_config/fancy_coat
+	greyscale_config_worn = /datum/greyscale_config/fancy_coat_worn
+	greyscale_colors = "#EDE3DC#414344"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/suit/jacket/bomber
+	name = "bomber jacket"
+	desc = "Aviators not included."
+	icon_state = "bomberjacket"
+	inhand_icon_state = "brownjsuit"
+
 /obj/item/clothing/suit/jacket/leather
 	name = "leather jacket"
 	desc = "Pompadour not included."
@@ -95,6 +95,10 @@
 	inhand_icon_state = "waistcoat"
 	minimize_when_attached = FALSE
 	attachment_slot = null
+	greyscale_config = /datum/greyscale_config/waistcoat
+	greyscale_config_worn = /datum/greyscale_config/waistcoat_worn
+	greyscale_colors = "#414344"
+	flags_1 = IS_PLAYER_COLORABLE_1

 /obj/item/clothing/accessory/vest_sheriff
 	name = "sheriff vest"
@@ -252,6 +252,34 @@
 	random_sensor = FALSE
 	can_adjust = FALSE

+/obj/item/clothing/under/costume/buttondown
+	gender = PLURAL
+	body_parts_covered = GROIN|LEGS
+	female_sprite_flags = NO_FEMALE_UNIFORM
+	custom_price = PAYCHECK_CREW
+	icon = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
+	worn_icon = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
+	species_exception = list(/datum/species/golem)
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/buttondown/slacks
+	name = "buttondown shirt with slacks"
+	desc = "A fancy buttondown shirt with slacks."
+	icon_state = "buttondown_slacks"
+	greyscale_config = /datum/greyscale_config/buttondown_slacks
+	greyscale_config_worn = /datum/greyscale_config/buttondown_slacks_worn
+	greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/under/costume/buttondown/shorts
+	name = "buttondown shirt with shorts"
+	desc = "A fancy buttondown shirt with shorts."
+	icon_state = "buttondown_shorts"
+	greyscale_config = /datum/greyscale_config/buttondown_shorts
+	greyscale_config_worn = /datum/greyscale_config/buttondown_shorts_worn
+	greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C"
+	flags_1 = IS_PLAYER_COLORABLE_1
+
 /obj/item/clothing/under/costume/jackbros
 	name = "jack bros outfit"
 	desc = "For when it's time to hee some hos."
@@ -259,103 +287,20 @@
 	inhand_icon_state = "JackFrostUniform"
 	can_adjust = FALSE

-/obj/item/clothing/under/costume/yakuza
-	name = "tojo clan pants"
-	desc = "For those long nights under the traffic cone."
-	icon_state = "MajimaPants"
-	inhand_icon_state = "MajimaPants"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/dutch
-	name = "dutch's suit"
-	desc = "You can feel a <b>god damn plan</b> coming on."
-	icon_state = "DutchUniform"
-	inhand_icon_state = "DutchUniform"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/irs
-	name = "internal revenue service outfit"
-	icon_state = "irs_jumpsuit"
-	inhand_icon_state = "irs_jumpsuit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/osi
-	name = "O.S.I. jumpsuit"
-	icon_state = "osi_jumpsuit"
-	inhand_icon_state = "osi_jumpsuit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/tmc
-	name = "Lost MC clothing"
-	icon_state = "tmc_jumpsuit"
-	inhand_icon_state = "tmc_jumpsuit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/pg
-	name = "powder ganger prison jumpsuit"
-	icon_state = "pg_jumpsuit"
-	inhand_icon_state = "pg_jumpsuit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/driscoll
-	name = "O'Driscoll outfit"
-	icon_state = "driscoll_jumpsuit"
-	inhand_icon_state = "driscoll_jumpsuit"
-	can_adjust = FALSE
-
 /obj/item/clothing/under/costume/deckers
 	name = "deckers outfit"
 	icon_state = "decker_jumpsuit"
 	inhand_icon_state = "decker_jumpsuit"
 	can_adjust = FALSE

-/obj/item/clothing/under/costume/morningstar
-	name = "Morningstar suit"
-	icon_state = "morningstar_jumpsuit"
-	inhand_icon_state = "morningstar_jumpsuit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/saints
-	name = "Saints outfit"
-	icon_state = "saints_jumpsuit"
-	inhand_icon_state = "saints_jumpsuit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/phantom
-	name = "Phantom Thief outfit"
-	icon_state = "phantom_jumpsuit"
-	inhand_icon_state = "phantom_jumpsuit"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/allies
-	name = "allies tanktop"
-	icon_state = "allies_uniform"
-	inhand_icon_state = "allies_uniform"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/soviet_families
-	name = "soviet conscript uniform"
-	icon_state = "soviet_uniform"
-	inhand_icon_state = "soviet_uniform"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/yuri
-	name = "yuri initiate jumpsuit"
-	icon_state = "yuri_uniform"
-	inhand_icon_state = "yuri_uniform"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/sybil_slickers
-	name = "sybil slickers uniform"
-	icon_state = "football_blue"
-	inhand_icon_state = "football_blue"
-	can_adjust = FALSE
-
-/obj/item/clothing/under/costume/basil_boys
-	name = "basil boys uniform"
-	icon_state = "football_red"
-	inhand_icon_state = "football_red"
+/obj/item/clothing/under/costume/football_suit
+	name = "football uniform"
+	icon_state = "football_suit"
 	can_adjust = FALSE
+	greyscale_config = /datum/greyscale_config/football_suit
+	greyscale_config_worn = /datum/greyscale_config/football_suit_worn
+	greyscale_colors = "#D74722"
+	flags_1 = IS_PLAYER_COLORABLE_1

 /obj/item/clothing/under/costume/swagoutfit
 	name = "Swag outfit"
@@ -376,3 +321,29 @@
 	desc = "The worst part of having a mental illness is people expect you to behave as if you don't."
 	icon_state = "joker"
 	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/yuri
+	name = "yuri initiate jumpsuit"
+	icon_state = "yuri_uniform"
+	inhand_icon_state = "yuri_uniform"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/dutch
+	name = "dutch's suit"
+	desc = "You can feel a <b>god damn plan</b> coming on."
+	icon_state = "DutchUniform"
+	inhand_icon_state = "DutchUniform"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/osi
+	name = "O.S.I. jumpsuit"
+	icon_state = "osi_jumpsuit"
+	inhand_icon_state = "osi_jumpsuit"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/costume/tmc
+	name = "Lost MC clothing"
+	icon_state = "tmc_jumpsuit"
+	inhand_icon_state = "tmc_jumpsuit"
+	can_adjust = FALSE
+
@@ -4,8 +4,8 @@
 	female_sprite_flags = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
 	custom_price = PAYCHECK_CREW
-	icon = 'icons/obj/clothing/under/shorts_pants.dmi'
-	worn_icon = 'icons/mob/clothing/under/shorts_pants.dmi'
+	icon = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
+	worn_icon = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
 	species_exception = list(/datum/species/golem)

 /obj/item/clothing/under/pants/slacks
@@ -141,6 +141,11 @@
 		/obj/item/clothing/under/rank/medical/doctor/nurse = 1,
 		/obj/item/clothing/mask/gas/prop = 4,
 		/obj/item/clothing/mask/gas/atmosprop = 3,
+		/obj/item/storage/backpack/henchmen = 5,
+		/obj/item/clothing/under/suit/henchmen = 5,
+		/obj/item/clothing/head/jackbros = 5,
+		/obj/item/clothing/under/costume/jackbros = 5,
+		/obj/item/clothing/under/costume/deckers = 5,
 	)
 	contraband = list(
 		/obj/item/clothing/suit/costume/judgerobe = 1,
@@ -8,6 +8,7 @@
 	vend_reply = "Thank you for using the ClothesMate!"
 	products = list(
 		/obj/item/clothing/head/wig/natural = 4,
+		/obj/item/clothing/head/fancy = 4,
 		/obj/item/clothing/head/beanie = 8,
 		/obj/item/clothing/head/beret/black = 3,
 		/obj/item/clothing/mask/bandana = 3,
@@ -15,27 +16,38 @@
 		/obj/item/clothing/mask/bandana/skull = 3,
 		/obj/item/clothing/neck/scarf = 6,
 		/obj/item/clothing/neck/large_scarf = 6,
+		/obj/item/clothing/neck/infinity_scarf = 6,
 		/obj/item/clothing/neck/tie = 6,
 		/obj/item/clothing/accessory/pride = 15,
+		/obj/item/clothing/accessory/waistcoat = 4,
 		/obj/item/clothing/suit/toggle/suspenders = 4,
+		/obj/item/clothing/suit/toggle/jacket/sweater = 4,
+		/obj/item/clothing/suit/jacket/oversized = 4,
+		/obj/item/clothing/suit/jacket/fancy = 4,
 		/obj/item/clothing/under/pants/slacks = 5,
 		/obj/item/clothing/under/shorts = 5,
 		/obj/item/clothing/under/pants/jeans = 5,
 		/obj/item/clothing/under/jeanshorts = 5,
+		/obj/item/clothing/under/costume/buttondown/slacks = 4,
+		/obj/item/clothing/under/costume/buttondown/shorts = 4,
 		/obj/item/clothing/under/dress/sundress = 2,
 		/obj/item/clothing/under/dress/tango = 2,
 		/obj/item/clothing/under/dress/skirt/plaid = 4,
 		/obj/item/clothing/under/dress/skirt/turtleskirt = 4,
 		/obj/item/clothing/suit/hooded/wintercoat/custom = 2,
 		/obj/item/clothing/shoes/sneakers/black = 4,
+		/obj/item/clothing/head/football_helmet = 6,
+		/obj/item/clothing/under/costume/football_suit = 6,
+		/obj/item/clothing/suit/costume/football_armor = 6,
 		/obj/item/clothing/suit/mothcoat = 3,
 		/obj/item/clothing/suit/mothcoat/winter = 3,
 		/obj/item/clothing/head/mothcap = 3,
 		/obj/item/clothing/head/rasta = 3,
 		/obj/item/clothing/head/kippah = 3,
 		/obj/item/clothing/head/taqiyahred = 3,
-		/obj/item/clothing/head/that = 1,
-		/obj/item/clothing/head/fedora = 1,
+		/obj/item/clothing/head/that = 3,
+		/obj/item/clothing/head/fedora = 3,
+		/obj/item/clothing/head/bowler = 3,
 		/obj/item/clothing/head/cowboy_hat_white = 1,
 		/obj/item/clothing/head/cowboy_hat_grey = 1,
 		/obj/item/clothing/head/sombrero = 1,
@@ -46,7 +58,6 @@
 		/obj/item/clothing/glasses/red = 1,
 		/obj/item/clothing/glasses/monocle = 1,
 		/obj/item/clothing/gloves/fingerless = 2,
-		/obj/item/clothing/accessory/waistcoat = 1,
 		/obj/item/storage/belt/fannypack = 3,
 		/obj/item/storage/belt/fannypack/blue = 3,
 		/obj/item/storage/belt/fannypack/red = 3,
@@ -69,7 +80,7 @@
 		/obj/item/clothing/under/suit/sl = 1,
 		/obj/item/clothing/under/rank/civilian/bartender/purple = 2,
 		/obj/item/clothing/suit/apron/purple_bartender = 2,
-		/obj/item/clothing/suit/jacket = 2,
+		/obj/item/clothing/suit/jacket/bomber = 2,
 		/obj/item/clothing/suit/jacket/puffer/vest = 2,
 		/obj/item/clothing/suit/jacket/puffer = 2,
 		/obj/item/clothing/suit/jacket/letterman = 2,
@@ -80,69 +91,29 @@
 		/obj/item/clothing/shoes/sandal = 2,
 		/obj/item/clothing/shoes/laceup = 2,
 		/obj/item/clothing/shoes/winterboots = 2,
+		/obj/item/clothing/shoes/glow = 2,
 		/obj/item/clothing/shoes/cowboy = 2,
 		/obj/item/clothing/shoes/cowboy/white = 2,
 		/obj/item/clothing/shoes/cowboy/black = 2,
-		/obj/item/storage/backpack/henchmen = 20,
-		/obj/item/clothing/under/suit/henchmen = 20,
-		/obj/item/clothing/under/costume/yakuza = 20,
-		/obj/item/clothing/shoes/yakuza = 20,
-		/obj/item/clothing/suit/costume/yakuza = 20,
-		/obj/item/clothing/under/costume/jackbros = 20,
-		/obj/item/clothing/shoes/jackbros = 20,
-		/obj/item/clothing/head/jackbros = 20,
-		/obj/item/clothing/under/costume/dutch = 20,
-		/obj/item/clothing/head/bowler = 20,
-		/obj/item/clothing/suit/costume/dutch = 20,
-		/obj/item/clothing/shoes/cowboy = 20,
-		/obj/item/clothing/suit/costume/irs = 20,
-		/obj/item/clothing/under/costume/irs = 20,
 		/obj/item/clothing/head/irs = 20,
-		/obj/item/clothing/suit/costume/osi = 20,
-		/obj/item/clothing/under/costume/osi = 20,
-		/obj/item/clothing/glasses/osi = 20,
-		/obj/item/clothing/suit/costume/tmc = 20,
-		/obj/item/clothing/under/costume/tmc = 20,
 		/obj/item/clothing/head/tmc = 20,
-		/obj/item/clothing/suit/costume/pg = 20,
-		/obj/item/clothing/under/costume/pg = 20,
-		/obj/item/clothing/head/pg = 20,
-		/obj/item/clothing/suit/costume/driscoll = 20,
-		/obj/item/clothing/under/costume/driscoll = 20,
-		/obj/item/clothing/mask/gas/driscoll = 20,
-		/obj/item/clothing/suit/costume/deckers = 20,
-		/obj/item/clothing/under/costume/deckers = 20,
 		/obj/item/clothing/head/deckers = 20,
-		/obj/item/clothing/shoes/deckers = 20,
-		/obj/item/clothing/suit/costume/morningstar = 20,
-		/obj/item/clothing/under/costume/morningstar = 20,
-		/obj/item/clothing/head/morningstar = 20,
-		/obj/item/clothing/shoes/morningstar = 20,
-		/obj/item/clothing/suit/costume/saints = 20,
-		/obj/item/clothing/under/costume/saints = 20,
-		/obj/item/clothing/head/saints = 20,
-		/obj/item/clothing/shoes/saints = 20,
-		/obj/item/clothing/suit/costume/phantom = 20,
-		/obj/item/clothing/under/costume/phantom = 20,
-		/obj/item/clothing/glasses/phantom = 20,
-		/obj/item/clothing/shoes/phantom = 20,
-		/obj/item/clothing/suit/costume/allies = 20,
-		/obj/item/clothing/under/costume/allies = 20,
-		/obj/item/clothing/head/allies = 20,
-		/obj/item/clothing/suit/costume/soviet = 20,
-		/obj/item/clothing/under/costume/soviet_families = 20,
-		/obj/item/clothing/head/ushanka/soviet = 20,
-		/obj/item/clothing/suit/costume/yuri = 20,
-		/obj/item/clothing/under/costume/yuri = 20,
 		/obj/item/clothing/head/yuri = 20,
-		/obj/item/clothing/suit/costume/sybil_slickers = 20,
-		/obj/item/clothing/under/costume/sybil_slickers = 20,
-		/obj/item/clothing/head/sybil_slickers = 20,
-		/obj/item/clothing/shoes/sybil_slickers = 20,
-		/obj/item/clothing/suit/costume/basil_boys = 20,
-		/obj/item/clothing/under/costume/basil_boys = 20,
-		/obj/item/clothing/head/basil_boys = 20,
-		/obj/item/clothing/shoes/basil_boys = 20,
+		/obj/item/clothing/head/allies = 20,
+		/obj/item/clothing/glasses/osi = 20,
+		/obj/item/clothing/glasses/phantom = 20,
+		/obj/item/clothing/mask/gas/driscoll = 20,
+		/obj/item/clothing/under/costume/yuri = 20,
+		/obj/item/clothing/under/costume/dutch = 20,
+		/obj/item/clothing/under/costume/osi = 20,
+		/obj/item/clothing/under/costume/tmc = 20,
+		/obj/item/clothing/suit/costume/deckers = 20,
+		/obj/item/clothing/suit/costume/soviet = 20,
+		/obj/item/clothing/suit/costume/yuri = 20,
+		/obj/item/clothing/suit/costume/tmc = 20,
+		/obj/item/clothing/suit/costume/pg = 20,
+		/obj/item/clothing/shoes/jackbros = 20,
+		/obj/item/clothing/shoes/saints = 20,
 	)
 	contraband = list(
 		/obj/item/clothing/under/syndicate/tacticool = 1,
@@ -327,9 +327,6 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
 	name = "Ushanka"
 	item_path = /obj/item/clothing/head/ushanka

-/datum/loadout_item/head/ushanka/soviet
-	name = "Soviet Ushanka"
-	item_path = /obj/item/clothing/head/ushanka/soviet

 /datum/loadout_item/head/wrussian
 	name = "Black Papakha"
@@ -212,34 +212,6 @@ GLOBAL_LIST_INIT(loadout_shoes, generate_loadout_items(/datum/loadout_item/shoes
 	item_path = /obj/item/clothing/shoes/clown_shoes/jester
 	restricted_roles = list(JOB_CLOWN)

-/*
-*	FAMILIES
-*/
-
-/datum/loadout_item/shoes/deckers
-	name = "Deckers Shoes"
-	item_path = /obj/item/clothing/shoes/deckers
-
-/datum/loadout_item/shoes/morningstar
-	name = "Morningstar Shoes"
-	item_path = /obj/item/clothing/shoes/morningstar
-
-/datum/loadout_item/shoes/saints
-	name = "Saints Shoes"
-	item_path = /obj/item/clothing/shoes/saints
-
-/datum/loadout_item/shoes/phantom
-	name = "Phantom Shoes"
-	item_path = /obj/item/clothing/shoes/phantom
-
-/datum/loadout_item/shoes/sybil
-	name = "Sybil Shoes"
-	item_path = /obj/item/clothing/shoes/sybil_slickers
-
-/datum/loadout_item/shoes/basil
-	name = "Basil Shoes"
-	item_path = /obj/item/clothing/shoes/basil_boys
-
 /*
 *	DONATOR
 */
@@ -877,37 +877,6 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
 	name = "TMC Uniform"
 	item_path = /obj/item/clothing/under/costume/tmc

-/datum/loadout_item/under/formal/pg
-	name = "PG Uniform"
-	item_path = /obj/item/clothing/under/costume/pg
-
-/datum/loadout_item/under/formal/driscol
-	name = "Driscol Uniform"
-	item_path = /obj/item/clothing/under/costume/driscoll
-
-/datum/loadout_item/under/formal/deckers
-	name = "Deckers Uniform"
-	item_path = /obj/item/clothing/under/costume/deckers
-
-/datum/loadout_item/under/formal/morningstar
-	name = "Morningstar Uniform"
-	item_path = /obj/item/clothing/under/costume/morningstar
-
-/datum/loadout_item/under/formal/saints
-	name = "Saints Uniform"
-	item_path = /obj/item/clothing/under/costume/saints
-
-/datum/loadout_item/under/formal/phantom
-	name = "Phantom Uniform"
-	item_path = /obj/item/clothing/under/costume/phantom
-
-/datum/loadout_item/under/formal/sybil
-	name = "Sybil Uniform"
-	item_path = /obj/item/clothing/under/costume/sybil_slickers
-
-/datum/loadout_item/under/formal/basil
-	name = "Basil Uniform"
-	item_path = /obj/item/clothing/under/costume/basil_boys

 /datum/loadout_item/under/formal/inferno
 	name = "Inferno Suit"