Pasta de-toes many a sock (#5917)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Adds stirrup variants to the majority of socks, fixes a missing sprite,
adds a few bodymarkings that make it so I don't slam into the
bodymarking limit AS often. Fixes some capitalization and reorganizes
the sock .dm so the stirrup socks are actually together (was split in 2
from the socks port from main).

## Why It's Good For The Game

A: Gendered sprites B: Gendered sprites for undershirts which means you
can wear more casual drip and it fits the sprite. Bodymarkings p much
cover what I tend to pull off and I got sick of using 7 bodymarkings for
4 pixels. There's also one for the lips since it gets in my way every
now and then---plus can be used for y'know, lipstick that you can
pick/see the colour of within character setup.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: nearly doubles sock count with stirrup-variants.
add: nearly doubles undershirt count with gendered-variants and cut
sprites.
add: added 6 new bodymarkings.
del: removed a cloned outfit.
tweak: adjusted the sprites on a few underclothing items. 
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

Co-authored-by: Captain277 <[email protected]>

code/datums/underwear/socks.dm

@@ -88,57 +88,6 @@
 	name = "Ripped Pantyhose"
 	icon_state = "pantyhose_ripped"
 
-//Stirrup Variants
-/datum/category_item/underwear/socks/pantyhose_stirrup
-	name = "Pantyhose (Stirrup)"
-	icon_state = "pantyhose-stir"
-
-/datum/category_item/underwear/socks/striped_knee_stirrup
-	name = "Knee, striped (Stirrup)"
-	icon_state = "striped_knee-stir"
-	has_color = TRUE
-
-/datum/category_item/underwear/socks/striped_thigh_stirrup
-	name = "Thigh, striped (Stirrup)"
-	icon_state = "striped_thigh-stir"
-	has_color = TRUE
-
-/datum/category_item/underwear/socks/rainbow_knee_stirrup
-	name = "Knee, rainbow (Stirrup)"
-	icon_state = "rainbow_knee-stir"
-
-/datum/category_item/underwear/socks/rainbow_thigh_stirrup
-	name = "Thigh, rainbow (Stirrup)"
-	icon_state = "rainbow_thigh-stir"
-
-/datum/category_item/underwear/socks/knee_stirrup
-	name = "Knee (Stirrup)"
-	icon_state = "socks_knee-stir"
-	has_color = TRUE
-
-/datum/category_item/underwear/socks/thigh_stirrup
-	name = "Thigh (Stirrup)"
-	icon_state = "socks_thigh-stir"
-	has_color = TRUE
-
-/datum/category_item/underwear/socks/thigh_stirrup/shorter
-	name = "Thigh (Stirrup) (Shorter)"
-	icon_state = "socks_thigh_short-stir"
-	has_color = TRUE
-
-/datum/category_item/underwear/socks/thigh_stirrup/shortest
-	name = "Thigh (Stirrup) (Shortest)"
-	icon_state = "socks_thigh_shortest-stir"
-	has_color = TRUE
-
-/datum/category_item/underwear/socks/leggings_stirrup
-	name = "Leggings (Stirrup)"
-	icon_state = "leggings-stir"
-	has_color = TRUE
-/datum/category_item/underwear/socks/pantyhose_rip_stirrup
-	name = "Ripped Pantyhose (Stirrup)"
-	icon_state = "pantyhose_ripped-stir"
-
 /datum/category_item/underwear/socks/commie_thigh
 	name = "Thigh, Communist"
 	icon_state = "commie_thigh"
@@ -262,6 +211,173 @@
 	icon_state = "socks_thigh_stripe_shortest"
 	has_color = TRUE
 
+/datum/category_item/underwear/socks/fishnet_thigh
+	name = "Filled Fishnets"
+	icon_state = "fishnet_thigh"
+	has_color = TRUE
+
+//Stirrup Varients
+
+/datum/category_item/underwear/socks/thin_thigh_shortest_stirrup
+	name = "Thigh, Thin, Shortest, Stirrup"
+	icon_state = "thin_thigh_shortest_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/thin_thigh_short_stirrup
+	name = "Thigh, Thin, Short, Stirrup"
+	icon_state = "thin_thigh_short_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/christmas_thigh_stirrup
+	name = "Thigh, Christmas, Stirrup"
+	icon_state = "christmas_thigh_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stockings_orange_stirrup
+	name = "Orange Stockings, Stirrup"
+	icon_state = "stockings_orange_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stockings_lpink_stirrup
+	name = "Light Pink Stockings, Stirrup"
+	icon_state = "stockings_lpink_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stockings_purple_stirrup
+	name = "Purple Stockings, Stirrup"
+	icon_state = "stockings_purple_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stockings_yellow_stirrup
+	name = "Yellow Stockings, Stirrup"
+	icon_state = "stockings_ywllow_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stockings_blue_stirrup
+	name = "Blue Stockings, Stirrup"
+	icon_state = "stockings_blue_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stockings_cyan_stirrup
+	name = "Cyan Stockings, Stirrup"
+	icon_state = "stockings_cyan_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stockings_dpink_stirrup
+	name = "Dark Pink Stockings, Stirrup"
+	icon_state = "stockings_dpink_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/stockings_green_stirrup
+	name = "Green Stockings, Stirrup"
+	icon_state = "stockings_green_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/christmas_norm_stirrup
+	name = "Normal, Christmas, Stirrup"
+	icon_state = "christmas_norm_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/candycaneg_knee_stirrup
+	name = "Knee, Green Candycane, Stirrup"
+	icon_state = "candycaneg_knee_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/candycaneg_norm_stirrup
+	name = "Normal, Green Candycane, Stirrup"
+	icon_state = "candycaneg_norm_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/candycaneg_thigh_stirrup
+	name = "Thigh, Green Candycane, Stirrup"
+	icon_state = "candycaneg_thigh_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/candycaner_knee_stirrup
+	name = "Knee, Red Candycane, Stirrup"
+	icon_state = "candycaner_knee_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/candycaner_norm_stirrup
+	name = "Normal, Red Candycane, Stirrup"
+	icon_state = "candycaner_norm_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/candycaner_thigh_stirrup
+	name = "Thigh, Red Candycane, Stirrup"
+	icon_state = "candycaner_thigh_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/assblastusa_thigh_stirrup
+	name = "Thigh, USA, Stirrup"
+	icon_state = "assblastusa_thigh_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/assblastusa_knee_stirrup
+	name = "Knee, USA, Stirrup"
+	icon_state = "assblastusa_knee_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/uk_knee_stirrup
+	name = "Knee, UK, Stirrup"
+	icon_state = "uk_knee_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/uk_thigh_stirrup
+	name = "Thigh, UK, Stirrup"
+	icon_state = "uk_thigh_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/garter_stirrup
+	name = "Garters, Stirrup"
+	icon_state = "garter_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/bee_knee_stirrup
+	name = "Knee, Bee, Stirrup"
+	icon_state = "bee_knee_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/bee_norm_stirrup
+	name = "Normal, Bee, Stirrup"
+	icon_state = "bee_norm_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/bee_thigh_stirrup
+	name = "Thigh, Bee, Stirrup"
+	icon_state = "bee_thigh_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/christmas_knee_stirrup
+	name = "Knee, Christmas, Stirrup"
+	icon_state = "christmas_knee_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/commie_knee_stirrup
+	name = "Knee, Communist, Stirrup"
+	icon_state = "commie_knee_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/thin_thigh_stirrup
+	name = "Thigh, Thin, Stirrup"
+	icon_state = "thin_thigh_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/thin_knee_stirrup
+	name = "Knee, Thin, Stirrup"
+	icon_state = "thin_knee_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/rainbow_thigh_stirrup
+	name = "Thigh, Rainbow, Stirrup"
+	icon_state = "rainbow_thigh_stirrup"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/rainbow_knee_stirrup
+	name = "Knee, Rainbow, Stirrup"
+	icon_state = "rainbow_knee_stirrup"
+	has_color = TRUE
+
 /datum/category_item/underwear/socks/thigh_stripe_stirrup
 	name = "Thigh, Stripe, Stirrup"
 	icon_state = "socks_thigh_stripe_stirrup"
@@ -277,7 +393,53 @@
 	icon_state = "socks_thigh_stripe_shortest_stirrup"
 	has_color = TRUE
 
-/datum/category_item/underwear/socks/fishnet_thigh
-	name = "Filled Fishnets"
-	icon_state = "fishnet_thigh"
+/datum/category_item/underwear/socks/pantyhose_stirrup
+	name = "Pantyhose (Stirrup)"
+	icon_state = "pantyhose-stir"
+
+/datum/category_item/underwear/socks/striped_knee_stirrup
+	name = "Knee, striped (Stirrup)"
+	icon_state = "striped_knee-stir"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/striped_thigh_stirrup
+	name = "Thigh, striped (Stirrup)"
+	icon_state = "striped_thigh-stir"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/rainbow_knee_stirrup
+	name = "Knee, rainbow (Stirrup)"
+	icon_state = "rainbow_knee-stir"
+
+/datum/category_item/underwear/socks/rainbow_thigh_stirrup
+	name = "Thigh, rainbow (Stirrup)"
+	icon_state = "rainbow_thigh-stir"
+
+/datum/category_item/underwear/socks/knee_stirrup
+	name = "Knee (Stirrup)"
+	icon_state = "socks_knee-stir"
 	has_color = TRUE
+
+/datum/category_item/underwear/socks/thigh_stirrup
+	name = "Thigh (Stirrup)"
+	icon_state = "socks_thigh-stir"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/thigh_stirrup/shorter
+	name = "Thigh (Stirrup) (Shorter)"
+	icon_state = "socks_thigh_short-stir"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/thigh_stirrup/shortest
+	name = "Thigh (Stirrup) (Shortest)"
+	icon_state = "socks_thigh_shortest-stir"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/leggings_stirrup
+	name = "Leggings (Stirrup)"
+	icon_state = "leggings-stir"
+	has_color = TRUE
+
+/datum/category_item/underwear/socks/pantyhose_rip_stirrup
+	name = "Ripped Pantyhose (Stirrup)"
+	icon_state = "pantyhose_ripped-stir"

code/datums/underwear/top.dm

@@ -150,13 +150,14 @@
 /datum/category_item/underwear/top/bra_neko
 	name = "Neko Bra"
 	icon_state = "bra_neko"
+	has_color = TRUE
 
 /datum/category_item/underwear/top/bra_thin
 	name = "Thin Bra"
 	icon_state = "bra_thin"
 
 /datum/category_item/underwear/top/bra_halter
-	name = "Halterneck bra"
+	name = "Halterneck bra, alt"
 	icon_state = "halter_bra"
 	has_color = TRUE