diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
index 57f8815cbf..963203fef4 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -577,3 +577,17 @@ Talon pin
 /datum/gear/accessory/bunny_tail/New()
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/accessory/legwarmer_selection
+	display_name = "legwarmers (selection, colorable)"
+	path = /obj/item/clothing/accessory/legwarmers
+
+/datum/gear/accessory/legwarmer_selection/New()
+	..()
+	var/list/legwarmer_lists = list(
+	"Legwarmers, thigh" = /obj/item/clothing/accessory/legwarmers,
+	"Legwarmers, medium" = /obj/item/clothing/accessory/legwarmersmedium,
+	"Legwarmers, short" = /obj/item/clothing/accessory/legwarmersshort
+	)
+	gear_tweaks += new/datum/gear_tweak/path(legwarmer_lists)
+	gear_tweaks += gear_tweak_free_color_choice
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index e66c6086e4..cd1430c241 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -140,7 +140,7 @@
 	"Pink labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/pink,
 	"Red labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/red,
 	"Yellow labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/yellow,
-	"Modern labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/modern // CHOMPEdit - Adds modern labcoat
+	"Modern labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/modern
 	)
 	gear_tweaks += new/datum/gear_tweak/path(labcoats)
 
diff --git a/code/modules/clothing/accessories/accessory.dm b/code/modules/clothing/accessories/accessory.dm
index ec25322616..c30d2fcb34 100644
--- a/code/modules/clothing/accessories/accessory.dm
+++ b/code/modules/clothing/accessories/accessory.dm
@@ -615,3 +615,20 @@
 	name = "white ranger poncho"
 	icon_state = "rangerponcho_snow"
 	item_state = "rangerponcho_snow"
+
+// leg warmers
+
+/obj/item/clothing/accessory/legwarmers
+	name = "thigh-length legwarmers"
+	desc = "A comfy pair of legwarmers. These are excessively long."
+	icon_state = "legwarmers_thigh"
+
+/obj/item/clothing/accessory/legwarmersmedium
+	name = "medium-length legwarmers"
+	desc = "A comfy pair of legwarmers. For those unfortunate enough to wear shorts in the cold."
+	icon_state = "legwarmers_medium"
+
+/obj/item/clothing/accessory/legwarmersshort
+	name = "short legwarmers"
+	desc = "A comfy pair of legwarmers. For those better in the cold than others."
+	icon_state = "legwarmers_short"
diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi
index 22eb990a21..768e234e65 100644
Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ
diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi
index 509ea5f1e5..cd832ec41d 100644
Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ