diff --git a/modular_sand/code/modules/client/loadout/shirts.dm b/modular_sand/code/modules/client/loadout/shirts.dm index 36e97f1101..f2040a3c1c 100644 --- a/modular_sand/code/modules/client/loadout/shirts.dm +++ b/modular_sand/code/modules/client/loadout/shirts.dm @@ -6,6 +6,38 @@ path = /obj/item/clothing/underwear/shirt cost = 0 +/datum/gear/shirt/alien + name = "Postal Dude Shirt" + path = /obj/item/clothing/underwear/shirt/alien + +/datum/gear/shirt/band + name = "Band Shirt" + path = /obj/item/clothing/underwear/shirt/band + +/datum/gear/shirt/bee + name = "Bee Shirt" + path = /obj/item/clothing/underwear/shirt/bee + +/datum/gear/shirt/bluejersey + name = "Blue Jersey Shirt" + path = /obj/item/clothing/underwear/shirt/bluejersey + +/datum/gear/shirt/bowlingcyan + name = "Cyan Bowling Shirt" + path = /obj/item/clothing/underwear/shirt/bowling/cyan + +/datum/gear/shirt/bowlinggrey + name = "Grey Bowling Shirt" + path = /obj/item/clothing/underwear/shirt/bowling/grey + +/datum/gear/shirt/bowlingpink + name = "Pink Bowling Shirt" + path = /obj/item/clothing/underwear/shirt/bowling/pink + +/datum/gear/shirt/bowlingred + name = "Red Bowling Shirt" + path = /obj/item/clothing/underwear/shirt/bowling + /datum/gear/shirt/bra name = "Bra" path = /obj/item/clothing/underwear/shirt/bra @@ -14,9 +46,53 @@ name = "Bra (alt)" path = /obj/item/clothing/underwear/shirt/bra/alt -/datum/gear/shirt/bra/thin - name = "Thin Bra" - path = /obj/item/clothing/underwear/shirt/bra/thin +/datum/gear/shirt/bra/babydoll + name = "Babydoll Bra" + path = /obj/item/clothing/underwear/shirt/bra/babydoll + +/datum/gear/shirt/bra/beekini + name = "Beekini Bra" + path = /obj/item/clothing/underwear/shirt/bra/beekini + +/datum/gear/shirt/bra/bikini + name = "Bikini Bra" + path = /obj/item/clothing/underwear/shirt/bra/bikini + +/datum/gear/shirt/bra/bikini/black + name = "Bikini Bra (Black)" + path = /obj/item/clothing/underwear/shirt/bra/bikini/black + +/datum/gear/shirt/bra/bikini/blue + name = "Bikini Bra (Blue)" + path = /obj/item/clothing/underwear/shirt/bra/bikini/blue + +/datum/gear/shirt/bra/commie + name = "Commie Bra" + path = /obj/item/clothing/underwear/shirt/bra/commie + +/datum/gear/shirt/bra/fishnet + name = "Fishnet Bra" + path = /obj/item/clothing/underwear/shirt/bra/fishnet + +/datum/gear/shirt/bra/fishnet/sleeves + name = "Sleeved Fishnet Bra" + path = /obj/item/clothing/underwear/shirt/bra/fishnet/sleeves + +/datum/gear/shirt/bra/fishnet/sleeves/gloves + name = "Sleeved & Gloved Fishnet Bra" + path = /obj/item/clothing/underwear/shirt/bra/fishnet/sleeves/gloves + +/datum/gear/shirt/bra/halterneck + name = "Halterneck Bra" + path = /obj/item/clothing/underwear/shirt/bra/halterneck + +/datum/gear/shirt/bra/kinky + name = "Kinky Bra" + path = /obj/item/clothing/underwear/shirt/bra/kinky + +/datum/gear/shirt/bra/neko + name = "Neko Bra" + path = /obj/item/clothing/underwear/shirt/bra/neko /datum/gear/shirt/bra/sports name = "Sports Bra" @@ -34,13 +110,9 @@ name = "Strapless Bra (alt)" path = /obj/item/clothing/underwear/shirt/bra/strapless/alt -/datum/gear/shirt/bra/halterneck - name = "Halterneck Bra" - path = /obj/item/clothing/underwear/shirt/bra/halterneck - -/datum/gear/shirt/bra/neko - name = "Neko Bra" - path = /obj/item/clothing/underwear/shirt/bra/neko +/datum/gear/shirt/bra/striped + name = "Striped Bra" + path = /obj/item/clothing/underwear/shirt/bra/striped /datum/gear/shirt/bra/swimming name = "Swimming Bra" @@ -50,234 +122,38 @@ name = "Swimming Bra (alt)" path = /obj/item/clothing/underwear/shirt/bra/swimming/alt +/datum/gear/shirt/bra/thin + name = "Thin Bra" + path = /obj/item/clothing/underwear/shirt/bra/thin + /datum/gear/shirt/bra/tubetop name = "Tubetop Bra" path = /obj/item/clothing/underwear/shirt/bra/tubetop -/datum/gear/shirt/bra/babydoll - name = "Babydoll Bra" - path = /obj/item/clothing/underwear/shirt/bra/babydoll - -/datum/gear/shirt/bra/kinky - name = "Kinky Bra" - path = /obj/item/clothing/underwear/shirt/bra/kinky - -/datum/gear/shirt/bra/beekini - name = "Beekini Bra" - path = /obj/item/clothing/underwear/shirt/bra/beekini - -/datum/gear/shirt/bra/usa - name = "USA Bra" - path = /obj/item/clothing/underwear/shirt/bra/usa - -/datum/gear/shirt/bra/commie - name = "Commie Bra" - path = /obj/item/clothing/underwear/shirt/bra/commie - /datum/gear/shirt/bra/uk name = "UK Bra" path = /obj/item/clothing/underwear/shirt/bra/uk -/datum/gear/shirt/bra/striped - name = "Striped Bra" - path = /obj/item/clothing/underwear/shirt/bra/striped - -/datum/gear/shirt/bra/bikini - name = "Bikini Bra" - path = /obj/item/clothing/underwear/shirt/bra/bikini - -/datum/gear/shirt/bra/bikini/blue - name = "Bikini Bra (Blue)" - path = /obj/item/clothing/underwear/shirt/bra/bikini/blue - -/datum/gear/shirt/bra/bikini/black - name = "Bikini Bra (Black)" - path = /obj/item/clothing/underwear/shirt/bra/bikini/black - -/datum/gear/shirt/bra/fishnet - name = "Fishnet Bra" - path = /obj/item/clothing/underwear/shirt/bra/fishnet - -/datum/gear/shirt/bra/fishnet/sleeves - name = "Sleeved Fishnet Bra" - path = /obj/item/clothing/underwear/shirt/bra/fishnet/sleeves - -/datum/gear/shirt/bra/fishnet/sleeves/gloves - name = "Sleeved & Gloved Fishnet Bra" - path = /obj/item/clothing/underwear/shirt/bra/fishnet/sleeves/gloves - -/datum/gear/shirt/bra/bikini - name = "Bikini Bra" - path = /obj/item/clothing/underwear/shirt/bra/bikini - -/datum/gear/shirt/shortsleeve - name = "Shortsleeved Shirt" - path = /obj/item/clothing/underwear/shirt/shortsleeve - -/datum/gear/shirt/polo - name = "Polo Shirt" - path = /obj/item/clothing/underwear/shirt/polo - -/datum/gear/shirt/tanktop - name = "Tanktop Shirt" - path = /obj/item/clothing/underwear/shirt/tanktop - -/datum/gear/shirt/tanktop/alt - name = "Tanktop Shirt (alt)" - path = /obj/item/clothing/underwear/shirt/tanktop/alt - -/datum/gear/shirt/tanktop/striped - name = "Striped Tanktop Shirt" - path = /obj/item/clothing/underwear/shirt/tanktop/striped - -/datum/gear/shirt/tanktop/rainbow - name = "Rainbow Tanktop Shirt" - path = /obj/item/clothing/underwear/shirt/tanktop/rainbow - -/datum/gear/shirt/tanktop/sun - name = "Sun Tanktop Shirt" - path = /obj/item/clothing/underwear/shirt/tanktop/sun - -/datum/gear/shirt/tanktop/midriff - name = "Midriff Tanktop Shirt" - path = /obj/item/clothing/underwear/shirt/tanktop/midriff - -/datum/gear/shirt/tanktop/midriff/alt - name = "Midriff Tanktop Shirt (alt)" - path = /obj/item/clothing/underwear/shirt/tanktop/midriff/alt - -/datum/gear/shirt/lover - name = "Lover Shirt" - path = /obj/item/clothing/underwear/shirt/lover - -/datum/gear/shirt/ian - name = "Ian Shirt" - path = /obj/item/clothing/underwear/shirt/ian - -/datum/gear/shirt/uk - name = "UK Shirt" - path = /obj/item/clothing/underwear/shirt/uk - -/datum/gear/shirt/ilovent - name = "I Love NT Shirt" - path = /obj/item/clothing/underwear/shirt/ilovent - -/datum/gear/shirt/peace - name = "Peace Shirt" - path = /obj/item/clothing/underwear/shirt/peace - -/datum/gear/shirt/band - name = "Band Shirt" - path = /obj/item/clothing/underwear/shirt/band - -/datum/gear/shirt/pogoman - name = "Pogoman Shirt" - path = /obj/item/clothing/underwear/shirt/pogoman - -/datum/gear/shirt/lover - name = "Matroska Shirt" - path = /obj/item/clothing/underwear/shirt/matroska - -/datum/gear/shirt/sportgreen - name = "Green Sport Shirt" - path = /obj/item/clothing/underwear/shirt/sportgreen - -/datum/gear/shirt/sportblue - name = "Blue Sport Shirt" - path = /obj/item/clothing/underwear/shirt/sportblue - -/datum/gear/shirt/sportred - name = "Red Sport Shirt" - path = /obj/item/clothing/underwear/shirt/sportred - -/datum/gear/shirt/ss13 - name = "SS13 Shirt" - path = /obj/item/clothing/underwear/shirt/ss13 - -/datum/gear/shirt/question - name = "Question Mark Shirt" - path = /obj/item/clothing/underwear/shirt/question - -/datum/gear/shirt/skull - name = "Skull Shirt" - path = /obj/item/clothing/underwear/shirt/skull - -/datum/gear/shirt/commie - name = "Commie Shirt" - path = /obj/item/clothing/underwear/shirt/commie - -/datum/gear/shirt/striped - name = "Striped Shirt" - path = /obj/item/clothing/underwear/shirt/striped - -/datum/gear/shirt/meat - name = "Meat Shirt" - path = /obj/item/clothing/underwear/shirt/meat - -/datum/gear/shirt/tiedye - name = "Tie Dye Shirt" - path = /obj/item/clothing/underwear/shirt/tiedye - -/datum/gear/shirt/redjersey - name = "Red Jersey Shirt" - path = /obj/item/clothing/underwear/shirt/redjersey - -/datum/gear/shirt/bluejersey - name = "Blue Jersey Shirt" - path = /obj/item/clothing/underwear/shirt/bluejersey - -/datum/gear/shirt/bowlingred - name = "Red Bowling Shirt" - path = /obj/item/clothing/underwear/shirt/bowling - -/datum/gear/shirt/bowlingpink - name = "Pink Bowling Shirt" - path = /obj/item/clothing/underwear/shirt/bowling/pink - -/datum/gear/shirt/bowlingcyan - name = "Cyan Bowling Shirt" - path = /obj/item/clothing/underwear/shirt/bowling/cyan - -/datum/gear/shirt/bowlinggrey - name = "Grey Bowling Shirt" - path = /obj/item/clothing/underwear/shirt/bowling/grey - -/datum/gear/shirt/alien - name = "Postal Dude Shirt" - path = /obj/item/clothing/underwear/shirt/alien +/datum/gear/shirt/bra/usa + name = "USA Bra" + path = /obj/item/clothing/underwear/shirt/bra/usa /datum/gear/shirt/clown name = "Clown Shirt" path = /obj/item/clothing/underwear/shirt/clown -/datum/gear/shirt/bee - name = "Bee Shirt" - path = /obj/item/clothing/underwear/shirt/bee +/datum/gear/shirt/commie + name = "Commie Shirt" + path = /obj/item/clothing/underwear/shirt/commie -/datum/gear/shirt/long - name = "Longsleeved Shirt" - path = /obj/item/clothing/underwear/shirt/long - -/datum/gear/shirt/long/striped - name = "Striped Longsleeved Shirt" - path = /obj/item/clothing/underwear/shirt/long/striped - -/datum/gear/shirt/long/striped/blue - name = "Blue Striped Longsleeved Shirt" - path = /obj/item/clothing/underwear/shirt/long/striped/blue - -/datum/gear/shirt/usa - name = "USA Shirt" - path = /obj/item/clothing/underwear/shirt/usa +/datum/gear/shirt/corset + name = "Corset" + path = /obj/item/clothing/underwear/shirt/corset /datum/gear/shirt/cowboy name = "Black Cowboy Shirt" path = /obj/item/clothing/underwear/shirt/cowboy -/datum/gear/shirt/cowboy/white - name = "White Cowboy Shirt" - path = /obj/item/clothing/underwear/shirt/cowboy/white - /datum/gear/shirt/cowboy/navy name = "Navy Cowboy Shirt" path = /obj/item/clothing/underwear/shirt/cowboy/navy @@ -290,10 +166,6 @@ name = "Black Shortsleeved Cowboy Shirt" path = /obj/item/clothing/underwear/shirt/cowboy/short -/datum/gear/shirt/cowboy/short/white - name = "White Shortsleeved Cowboy Shirt" - path = /obj/item/clothing/underwear/shirt/cowboy/short/white - /datum/gear/shirt/cowboy/short/navy name = "Navy Shortsleeved Cowboy Shirt" path = /obj/item/clothing/underwear/shirt/cowboy/short/navy @@ -302,6 +174,126 @@ name = "Red Shortsleeved Cowboy Shirt" path = /obj/item/clothing/underwear/shirt/cowboy/short/red +/datum/gear/shirt/cowboy/short/white + name = "White Shortsleeved Cowboy Shirt" + path = /obj/item/clothing/underwear/shirt/cowboy/short/white + +/datum/gear/shirt/cowboy/white + name = "White Cowboy Shirt" + path = /obj/item/clothing/underwear/shirt/cowboy/white + +/datum/gear/shirt/ian + name = "Ian Shirt" + path = /obj/item/clothing/underwear/shirt/ian + +/datum/gear/shirt/ilovent + name = "I Love NT Shirt" + path = /obj/item/clothing/underwear/shirt/ilovent + +/datum/gear/shirt/long + name = "Longsleeved Shirt" + path = /obj/item/clothing/underwear/shirt/long + +/datum/gear/shirt/long/striped + name = "Striped Longsleeved Shirt" + path = /obj/item/clothing/underwear/shirt/long/striped + +/datum/gear/shirt/long/striped/blue + name = "Blue Striped Longsleeved Shirt" + path = /obj/item/clothing/underwear/shirt/long/striped/blue + +/datum/gear/shirt/lover + name = "Lover Shirt" + path = /obj/item/clothing/underwear/shirt/lover + +/datum/gear/shirt/matroska + name = "Matroska Shirt" + path = /obj/item/clothing/underwear/shirt/matroska + +/datum/gear/shirt/meat + name = "Meat Shirt" + path = /obj/item/clothing/underwear/shirt/meat + +/datum/gear/shirt/peace + name = "Peace Shirt" + path = /obj/item/clothing/underwear/shirt/peace + +/datum/gear/shirt/pogoman + name = "Pogoman Shirt" + path = /obj/item/clothing/underwear/shirt/pogoman + +/datum/gear/shirt/polo + name = "Polo Shirt" + path = /obj/item/clothing/underwear/shirt/polo + +/datum/gear/shirt/question + name = "Question Mark Shirt" + path = /obj/item/clothing/underwear/shirt/question + +/datum/gear/shirt/redjersey + name = "Red Jersey Shirt" + path = /obj/item/clothing/underwear/shirt/redjersey + +/datum/gear/shirt/shortsleeve + name = "Shortsleeved Shirt" + path = /obj/item/clothing/underwear/shirt/shortsleeve + +/datum/gear/shirt/skull + name = "Skull Shirt" + path = /obj/item/clothing/underwear/shirt/skull + +/datum/gear/shirt/sportblue + name = "Blue Sport Shirt" + path = /obj/item/clothing/underwear/shirt/sportblue + +/datum/gear/shirt/sportgreen + name = "Green Sport Shirt" + path = /obj/item/clothing/underwear/shirt/sportgreen + +/datum/gear/shirt/sportred + name = "Red Sport Shirt" + path = /obj/item/clothing/underwear/shirt/sportred + +/datum/gear/shirt/ss13 + name = "SS13 Shirt" + path = /obj/item/clothing/underwear/shirt/ss13 + +/datum/gear/shirt/striped + name = "Striped Shirt" + path = /obj/item/clothing/underwear/shirt/striped + +/datum/gear/shirt/tanktop + name = "Tanktop Shirt" + path = /obj/item/clothing/underwear/shirt/tanktop + +/datum/gear/shirt/tanktop/alt + name = "Tanktop Shirt (alt)" + path = /obj/item/clothing/underwear/shirt/tanktop/alt + +/datum/gear/shirt/tanktop/midriff + name = "Midriff Tanktop Shirt" + path = /obj/item/clothing/underwear/shirt/tanktop/midriff + +/datum/gear/shirt/tanktop/midriff/alt + name = "Midriff Tanktop Shirt (alt)" + path = /obj/item/clothing/underwear/shirt/tanktop/midriff/alt + +/datum/gear/shirt/tanktop/rainbow + name = "Rainbow Tanktop Shirt" + path = /obj/item/clothing/underwear/shirt/tanktop/rainbow + +/datum/gear/shirt/tanktop/striped + name = "Striped Tanktop Shirt" + path = /obj/item/clothing/underwear/shirt/tanktop/striped + +/datum/gear/shirt/tanktop/sun + name = "Sun Tanktop Shirt" + path = /obj/item/clothing/underwear/shirt/tanktop/sun + +/datum/gear/shirt/tiedye + name = "Tie Dye Shirt" + path = /obj/item/clothing/underwear/shirt/tiedye + /datum/gear/shirt/top/shibari name = "Shibari Ropes" path = /obj/item/clothing/underwear/shirt/top/shibari @@ -309,3 +301,11 @@ /datum/gear/shirt/top/shibari_sleeved name = "Shibari Ropes - sleeves" path = /obj/item/clothing/underwear/shirt/top/shibari_sleeved + +/datum/gear/shirt/uk + name = "UK Shirt" + path = /obj/item/clothing/underwear/shirt/uk + +/datum/gear/shirt/usa + name = "USA Shirt" + path = /obj/item/clothing/underwear/shirt/usa diff --git a/modular_sand/code/modules/client/loadout/socks.dm b/modular_sand/code/modules/client/loadout/socks.dm index fb3b965f4f..5a315a26ac 100644 --- a/modular_sand/code/modules/client/loadout/socks.dm +++ b/modular_sand/code/modules/client/loadout/socks.dm @@ -14,7 +14,7 @@ name = "Candycane Socks" path = /obj/item/clothing/underwear/socks/candycane -/datum/gear/socks/candycane +/datum/gear/socks/candycane/green name = "Green Candycane Socks" path = /obj/item/clothing/underwear/socks/candycane/green @@ -58,14 +58,63 @@ name = "UK Knee Socks" path = /obj/item/clothing/underwear/socks/knee/uk +/datum/gear/socks/latex + name = "Latex socks" + path = /obj/item/clothing/underwear/socks/latex + /datum/gear/socks/pantyhose name = "Pantyhose" path = /obj/item/clothing/underwear/socks/pantyhose +/datum/gear/socks/pantyhose_ripped + name = "Pantyhose - Ripped" + path = /obj/item/clothing/underwear/socks/pantyhose_ripped + /datum/gear/socks/short name = "Short Socks" path = /obj/item/clothing/underwear/socks/short +/datum/gear/socks/stir + name = "Normal Stirrups (Greyscale)" + description = "A type of close-fitting ladies' pant that tapers at the ankle, similar to leggings, except that the material extends to a band, or strap, that is worn under the arch of the foot to hold the pant leg in place." + path = /obj/item/clothing/underwear/socks/stir + +/datum/gear/socks/stir/knee + name = "Knee-high Stirrups (Greyscale)" + path = /obj/item/clothing/underwear/socks/stir/knee + +/datum/gear/socks/stir/knee/rainbow + name = "Knee-high Rainbow Stirrups" + path = /obj/item/clothing/underwear/socks/stir/knee/rainbow + +/datum/gear/socks/stir/leggings + name = "Leggings Stirrups" + path = /obj/item/clothing/underwear/socks/stir/leggings + +/datum/gear/socks/stir/leggings/pantyhose + name = "Pantyhose Stirrups" + path = /obj/item/clothing/underwear/socks/stir/leggings/pantyhose + +/datum/gear/socks/stir/leggings/pantyhose/ripped + name = "Ripped Pantyhose Stirrups" + path = /obj/item/clothing/underwear/socks/stir/leggings/pantyhose/ripped + +/datum/gear/socks/stir/thigh + name = "Thigh-high Stirrups (Greyscale)" + path = /obj/item/clothing/underwear/socks/stir/thigh + +/datum/gear/socks/stir/thigh/striped + name = "Thigh-high Striped Stirrups" + path = /obj/item/clothing/underwear/socks/stir/thigh/striped + +/datum/gear/socks/stir/thigh/gym + name = "Thigh-high Stirrups (black with stripe)" + path = /obj/item/clothing/underwear/socks/stir/thigh/gym + +/datum/gear/socks/stir/thigh/rainbow + name = "Thigh-high Rainbow Stirrups" + path = /obj/item/clothing/underwear/socks/stir/thigh/rainbow + /datum/gear/socks/thigh name = "Thigh High Socks" path = /obj/item/clothing/underwear/socks/thigh @@ -150,7 +199,3 @@ /datum/gear/socks/thigh/usa name = "Thigh High USA Stockings" path = /obj/item/clothing/underwear/socks/thigh/usa - -/datum/gear/socks/pantyhose_ripped - name = "Pantyhose - Ripped" - path = /obj/item/clothing/underwear/socks/pantyhose_ripped diff --git a/modular_sand/code/modules/clothing/underwear/shirts.dm b/modular_sand/code/modules/clothing/underwear/shirts.dm index 3ce8440148..fcbd7fd598 100644 --- a/modular_sand/code/modules/clothing/underwear/shirts.dm +++ b/modular_sand/code/modules/clothing/underwear/shirts.dm @@ -22,6 +22,12 @@ desc = "Bee yourself!" icon_state = "undershirt_bee" +/obj/item/clothing/underwear/shirt/corset + name = "Corset" + desc = "A support garment commonly worn to hold and train the torso into a desired shape, traditionally a smaller waist or larger bottom, for aesthetic or medical purposes, or support the breasts." + body_parts_covered = CHEST + icon_state = "corset" + /obj/item/clothing/underwear/shirt/bluejersey name = "blue jersey shirt" icon_state = "undershirt_bluejersey" @@ -351,9 +357,3 @@ name = "usa shirt" desc = "Freedom and obesity." icon_state = "undershirt_assblastusa" - -/obj/item/clothing/underwear/shirt/corset - name = "Corset" - desc = "" - body_parts_covered = CHEST - icon_state = "corset" \ No newline at end of file diff --git a/modular_sand/code/modules/clothing/underwear/socks.dm b/modular_sand/code/modules/clothing/underwear/socks.dm index 594f485e6e..7c86e0e62b 100644 --- a/modular_sand/code/modules/clothing/underwear/socks.dm +++ b/modular_sand/code/modules/clothing/underwear/socks.dm @@ -28,11 +28,6 @@ name = "garter" icon_state = "garter" -/obj/item/clothing/underwear/socks/latex - name = "Latex socks" - desc = "A pair of latex socks." - icon_state = "socks_latex" - /obj/item/clothing/underwear/socks/knee name = "knee socks" icon_state = "socks_knee" @@ -84,6 +79,11 @@ desc = "I'm running out of america jokes." icon_state = "socks_knee_assblastusa" +/obj/item/clothing/underwear/socks/latex + name = "Latex socks" + desc = "A pair of latex socks." + icon_state = "socks_latex" + /obj/item/clothing/underwear/socks/pantyhose name = "pantyhose" desc = "Pantyhose." @@ -193,9 +193,9 @@ desc = "McDonald's or something." icon_state = "socks_thigh_assblastusa" -/obj/item/clothing/underwear/socks/stir/ +/obj/item/clothing/underwear/socks/stir name = "Normal Stirrups (Greyscale)" - desc = "" + desc = "A type of close-fitting ladies' pant that tapers at the ankle, similar to leggings, except that the material extends to a band, or strap, that is worn under the arch of the foot to hold the pant leg in place." body_parts_covered = NONE icon_state = "socks_norm-stir" @@ -207,7 +207,21 @@ name = "Knee-high Rainbow Stirrups" icon_state = "rainbow_knee-stir" -/obj/item/clothing/underwear/socks/stir/thigh/ +/obj/item/clothing/underwear/socks/stir/leggings + name = "Leggings Stirrups" + body_parts_covered = LEGS | GROIN + icon_state = "leggings-stir" + +/obj/item/clothing/underwear/socks/stir/leggings/pantyhose + name = "Pantyhose Stirrups" + icon_state = "pantyhose-stir" + +/obj/item/clothing/underwear/socks/stir/leggings/pantyhose/ripped + name = "Ripped Pantyhose Stirrups" + body_parts_covered = NONE + icon_state = "pantyhose_ripped-stir" + +/obj/item/clothing/underwear/socks/stir/thigh name = "Thigh-high Stirrups (Greyscale)" body_parts_covered = LEGS icon_state = "socks_thigh-stir" @@ -223,17 +237,3 @@ /obj/item/clothing/underwear/socks/stir/thigh/rainbow name = "Thigh-high Rainbow Stirrups" icon_state = "rainbow_thigh-stir" - -/obj/item/clothing/underwear/socks/stir/leggings - name = "Leggings Stirrups" - body_parts_covered = LEGS | GROIN - icon_state = "leggings-stir" - -/obj/item/clothing/underwear/socks/stir/leggings/pantyhose - name = "Pantyhose Stirrups" - icon_state = "pantyhose-stir" - -/obj/item/clothing/underwear/socks/stir/leggings/pantyhose/ripped - name = "Ripped Pantyhose Stirrups" - body_parts_covered = NONE - icon_state = "pantyhose_ripped-stir"