diff --git a/code/datums/supplypacks/costumes.dm b/code/datums/supplypacks/costumes.dm
index e9a1365b7ba..321c0fde0e4 100644
--- a/code/datums/supplypacks/costumes.dm
+++ b/code/datums/supplypacks/costumes.dm
@@ -156,7 +156,7 @@ datum/supply_packs/costumes/witch
/obj/item/clothing/under/wedding/bride_blue,
/obj/item/clothing/under/wedding/bride_red,
/obj/item/clothing/under/wedding/bride_white,
- /obj/item/clothing/under/dress/sundress,
+ /obj/item/clothing/under/sundress,
/obj/item/clothing/under/dress/dress_green,
/obj/item/clothing/under/dress/dress_pink,
/obj/item/clothing/under/dress/dress_orange,
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index b5c0df71270..3ecb7c7b2db 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -226,7 +226,7 @@
delete_me = 1
/obj/effect/landmark/costume/cutewitch/New()
- new /obj/item/clothing/under/dress/sundress(src.loc)
+ new /obj/item/clothing/under/sundress(src.loc)
new /obj/item/clothing/head/witchwig(src.loc)
new /obj/item/weapon/staff/broom(src.loc)
delete_me = 1
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index a4a1f8d97a3..c93f68a82a0 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -45,7 +45,7 @@
/obj/structure/closet/chefcloset/New()
..()
- new /obj/item/clothing/under/dress/sundress(src)
+ new /obj/item/clothing/under/sundress(src)
new /obj/item/clothing/under/waiter(src)
new /obj/item/clothing/under/waiter(src)
new /obj/item/device/radio/headset/headset_service(src)
diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
index 0b64950f05c..ccc5214b55b 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -273,11 +273,11 @@
/datum/gear/uniform/sundress
display_name = "sundress"
- path = /obj/item/clothing/under/dress/sundress
+ path = /obj/item/clothing/under/sundress
/datum/gear/uniform/sundress/white
display_name = "sundress, white"
- path = /obj/item/clothing/under/dress/sundress/white
+ path = /obj/item/clothing/under/sundress_white
/datum/gear/uniform/dress_fire
display_name = "flame dress"
@@ -446,10 +446,10 @@
display_name = "jumpsuit, hephaestus"
path = /obj/item/clothing/under/hephaestus
-/datum/gear/uniform/yoga
+/datum/gear/uniform/yogapants
display_name = "yoga pants"
- path = /obj/item/clothing/under/pants/yoga
+ path = /obj/item/clothing/under/pants/yogapants
-/datum/gear/uniform/yoga/New()
+/datum/gear/uniform/yogapants/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
\ No newline at end of file
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 1a67a0674c3..0af4a90cb9b 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -525,10 +525,6 @@
var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled
sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/uniform.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/uniform.dmi',
- "Tajaran" = 'icons/mob/species/tajaran/uniforms/uniform.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/uniform.dmi',
"Teshari" = 'icons/mob/species/seromi/uniform.dmi',
"Vox" = 'icons/mob/species/vox/uniform.dmi'
)
@@ -539,6 +535,9 @@
valid_accessory_slots = list("utility","armband","decor","over")
restricted_accessory_slots = list("utility", "armband")
+ var/icon/rolled_down_icon = 'icons/mob/uniform_rolled_down.dmi'
+ var/icon/rolled_down_sleeves_icon = 'icons/mob/uniform_sleeves_rolled.dmi'
+
/obj/item/clothing/under/attack_hand(var/mob/user)
if(accessories && accessories.len)
@@ -558,7 +557,7 @@
//autodetect rollability
if(rolled_down < 0)
- if((worn_state + "_d_s") in icon_states('icons/mob/uniform.dmi'))
+ if(("[worn_state]_d_s" in icon_states(INV_W_UNIFORM_DEF_ICON)) || ("[worn_state]_s" in icon_states(rolled_down_icon)) || ("[worn_state]_d_s" in icon_states(icon_override)))
rolled_down = 0
/obj/item/clothing/under/proc/update_rolldown_status()
@@ -573,11 +572,13 @@
under_icon = sprite_sheets[H.species.get_bodytype(H)]
else if(item_icons && item_icons[slot_w_uniform_str])
under_icon = item_icons[slot_w_uniform_str]
+ else if ("[worn_state]_s" in icon_states(rolled_down_icon))
+ under_icon = rolled_down_icon
else
under_icon = INV_W_UNIFORM_DEF_ICON
// The _s is because the icon update procs append it.
- if(("[worn_state]_d_s") in icon_states(under_icon))
+ if((under_icon == rolled_down_icon && "[worn_state]_s" in icon_states(under_icon)) || ("[worn_state]_d_s" in icon_states(under_icon)))
if(rolled_down != 1)
rolled_down = 0
else
@@ -596,11 +597,13 @@
under_icon = sprite_sheets[H.species.get_bodytype(H)]
else if(item_icons && item_icons[slot_w_uniform_str])
under_icon = item_icons[slot_w_uniform_str]
+ else if ("[worn_state]_s" in icon_states(rolled_down_sleeves_icon))
+ under_icon = rolled_down_sleeves_icon
else
under_icon = INV_W_UNIFORM_DEF_ICON
// The _s is because the icon update procs append it.
- if(("[worn_state]_r_s") in icon_states(under_icon))
+ if((under_icon == rolled_down_sleeves_icon && "[worn_state]_s" in icon_states(under_icon)) || ("[worn_state]_r_s" in icon_states(under_icon)))
if(rolled_sleeves != 1)
rolled_sleeves = 0
else
@@ -682,10 +685,17 @@
if(rolled_down)
body_parts_covered = initial(body_parts_covered)
body_parts_covered &= ~(UPPER_TORSO|ARMS)
- item_state_slots[slot_w_uniform_str] = "[worn_state]_d"
+ if("[worn_state]_s" in icon_states(rolled_down_icon))
+ icon_override = rolled_down_icon
+ item_state_slots[slot_w_uniform_str] = "[worn_state]"
+ else
+ item_state_slots[slot_w_uniform_str] = "[worn_state]_d"
+
usr << "You roll down your [src]."
else
body_parts_covered = initial(body_parts_covered)
+ if(icon_override == rolled_down_icon)
+ icon_override = initial(icon_override)
item_state_slots[slot_w_uniform_str] = "[worn_state]"
usr << "You roll up your [src]."
update_clothing_icon()
@@ -708,10 +718,16 @@
rolled_sleeves = !rolled_sleeves
if(rolled_sleeves)
body_parts_covered &= ~(ARMS)
- item_state_slots[slot_w_uniform_str] = "[worn_state]_r"
+ if("[worn_state]_s" in icon_states(rolled_down_sleeves_icon))
+ icon_override = rolled_down_sleeves_icon
+ item_state_slots[slot_w_uniform_str] = "[worn_state]"
+ else
+ item_state_slots[slot_w_uniform_str] = "[worn_state]_r"
usr << "You roll up your [src]'s sleeves."
else
body_parts_covered = initial(body_parts_covered)
+ if(icon_override == rolled_down_sleeves_icon)
+ icon_override = initial(icon_override)
item_state_slots[slot_w_uniform_str] = "[worn_state]"
usr << "You roll down your [src]'s sleeves."
update_clothing_icon()
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 4a4835f2bcd..7452b35aab6 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -1,11 +1,3 @@
-/obj/item/clothing/under/color
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/color.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/color.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/color.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/color.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/color.dmi'
- )
/obj/item/clothing/under/color/black
name = "black jumpsuit"
icon_state = "black"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 12934b250ee..a6336e3cc51 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -255,13 +255,6 @@
*/
/obj/item/clothing/under/dress
body_parts_covered = UPPER_TORSO|LOWER_TORSO
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/dresses.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
- )
/obj/item/clothing/under/dress/blacktango
name = "black tango dress"
@@ -353,14 +346,6 @@
*/
/obj/item/clothing/under/wedding
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/dresses.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
- )
-
/obj/item/clothing/under/wedding/bride_orange
name = "orange wedding dress"
@@ -393,13 +378,13 @@
flags_inv = HIDESHOES
body_parts_covered = UPPER_TORSO|LOWER_TORSO
-/obj/item/clothing/under/dress/sundress
+/obj/item/clothing/under/sundress
name = "sundress"
desc = "Makes you want to frolic in a field of daisies."
icon_state = "sundress"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
-/obj/item/clothing/under/dress/sundress/white
+/obj/item/clothing/under/sundress_white
name = "white sundress"
desc = "A white sundress decorated with purple lilies."
icon_state = "sundress_white"
@@ -474,13 +459,6 @@
/obj/item/clothing/under/cheongsam
name = "white cheongsam"
desc = "It is a white cheongsam dress."
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/dresses.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
- )
icon_state = "mai_yang"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
@@ -508,13 +486,6 @@
/obj/item/clothing/under/croptop
name = "crop top"
desc = "A shirt that has had the top cropped. This one is NT sponsored."
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/dresses.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
- )
icon_state = "croptop"
item_state_slots = list(slot_r_hand_str = "grey", slot_l_hand_str = "grey")
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index a36e126b144..322115cc0b6 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -2,13 +2,6 @@
/obj/item/clothing/under/pants
name = "jeans"
desc = "A nondescript pair of tough blue jeans."
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/pants.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/pants.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/pants.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/pants.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/pants.dmi'
- )
icon_state = "jeans"
gender = PLURAL
body_parts_covered = LOWER_TORSO|LEGS
@@ -124,10 +117,10 @@
desc = "A pair of sexy, tight black leather chaps."
icon_state = "chapsbl"
-/obj/item/clothing/under/pants/yoga
+/obj/item/clothing/under/pants/yogapants
name = "yoga pants"
desc = "A pair of tight-fitting yoga pants for those lazy days."
- icon_state = "yoga"
+ icon_state = "yogapants"
/*
* Baggy Pants
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index 7df4f018d26..4ac2ad5f2e3 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -2,13 +2,6 @@
/obj/item/clothing/under/shorts
name = "athletic shorts"
desc = "95% Polyester, 5% Spandex!"
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/pants.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/pants.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/pants.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/pants.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/pants.dmi'
- )
gender = PLURAL
body_parts_covered = LOWER_TORSO
@@ -103,13 +96,6 @@
/obj/item/clothing/under/skirt
name = "short black skirt"
desc = "A skirt that is a shiny black."
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/dresses.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/dresses.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/dresses.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/dresses.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/dresses.dmi'
- )
icon_state = "skirt_short_black"
body_parts_covered = LOWER_TORSO
rolled_sleeves = -1
@@ -168,8 +154,6 @@
icon_state = "plaid_purple"
item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
-//Job skirts
-
/obj/item/clothing/under/rank/cargo/skirt
name = "quartermaster's jumpskirt"
desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm
index c40dc146754..114f386b769 100644
--- a/code/modules/clothing/under/solgov.dm
+++ b/code/modules/clothing/under/solgov.dm
@@ -4,12 +4,6 @@
/obj/item/clothing/under/pt
name = "pt uniform"
desc = "Shorts! Shirt! Miami! Sexy!"
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/military.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/military.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/military.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/military.dmi'
- )
icon_state = "miami"
worn_state = "miami"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -40,13 +34,6 @@
/obj/item/clothing/under/utility
name = "utility uniform"
desc = "A comfortable turtleneck and black utility trousers."
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/military.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/military.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/military.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/military.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/military.dmi'
- )
icon_state = "blackutility"
worn_state = "blackutility"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -107,6 +94,7 @@
icon_state = "blackutility_com"
worn_state = "blackutility_com"
+
/obj/item/clothing/under/utility/fleet
name = "fleet coveralls"
desc = "The utility uniform of the SCG Fleet, made from an insulated material."
@@ -145,6 +133,7 @@
icon_state = "navyutility_com"
worn_state = "navyutility_com"
+
/obj/item/clothing/under/utility/marine
name = "marine fatigues"
desc = "The utility uniform of the SCG Marine Corps, made from durable material."
@@ -199,13 +188,6 @@
/obj/item/clothing/under/service
name = "service uniform"
desc = "A service uniform of some kind."
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/military.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/military.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/military.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/military.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/military.dmi'
- )
icon_state = "whiteservice"
worn_state = "whiteservice"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -233,13 +215,6 @@
/obj/item/clothing/under/mildress
name = "dress uniform"
desc = "A dress uniform of some kind."
- sprite_sheets = list(
- "Human" = 'icons/mob/uniforms/military.dmi',
- "Skrell" = 'icons/mob/species/skrell/uniforms/military.dmi',
- "Tajara" = 'icons/mob/species/tajaran/uniforms/military.dmi',
- "Unathi" = 'icons/mob/species/unathi/uniforms/military.dmi',
- "Diona" = 'icons/mob/species/diona/uniforms/military.dmi'
- )
icon_state = "greydress"
worn_state = "greydress"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
diff --git a/icons/mob/species/diona/uniforms/color.dmi b/icons/mob/species/diona/uniforms/color.dmi
deleted file mode 100644
index 9f282d8d7dc..00000000000
Binary files a/icons/mob/species/diona/uniforms/color.dmi and /dev/null differ
diff --git a/icons/mob/species/diona/uniforms/dresses.dmi b/icons/mob/species/diona/uniforms/dresses.dmi
deleted file mode 100644
index 0c49112a123..00000000000
Binary files a/icons/mob/species/diona/uniforms/dresses.dmi and /dev/null differ
diff --git a/icons/mob/species/diona/uniforms/military.dmi b/icons/mob/species/diona/uniforms/military.dmi
deleted file mode 100644
index a11c0618bf8..00000000000
Binary files a/icons/mob/species/diona/uniforms/military.dmi and /dev/null differ
diff --git a/icons/mob/species/diona/uniforms/pants.dmi b/icons/mob/species/diona/uniforms/pants.dmi
deleted file mode 100644
index 9de1e499252..00000000000
Binary files a/icons/mob/species/diona/uniforms/pants.dmi and /dev/null differ
diff --git a/icons/mob/species/diona/uniforms/uniform.dmi b/icons/mob/species/diona/uniforms/uniform.dmi
deleted file mode 100644
index 0af5703cbaa..00000000000
Binary files a/icons/mob/species/diona/uniforms/uniform.dmi and /dev/null differ
diff --git a/icons/mob/species/diona/uniforms/uniform_fat.dmi b/icons/mob/species/diona/uniforms/uniform_fat.dmi
deleted file mode 100644
index c887239f1ff..00000000000
Binary files a/icons/mob/species/diona/uniforms/uniform_fat.dmi and /dev/null differ
diff --git a/icons/mob/species/skrell/uniforms/color.dmi b/icons/mob/species/skrell/uniforms/color.dmi
deleted file mode 100644
index 9f282d8d7dc..00000000000
Binary files a/icons/mob/species/skrell/uniforms/color.dmi and /dev/null differ
diff --git a/icons/mob/species/skrell/uniforms/dresses.dmi b/icons/mob/species/skrell/uniforms/dresses.dmi
deleted file mode 100644
index 0c49112a123..00000000000
Binary files a/icons/mob/species/skrell/uniforms/dresses.dmi and /dev/null differ
diff --git a/icons/mob/species/skrell/uniforms/military.dmi b/icons/mob/species/skrell/uniforms/military.dmi
deleted file mode 100644
index a11c0618bf8..00000000000
Binary files a/icons/mob/species/skrell/uniforms/military.dmi and /dev/null differ
diff --git a/icons/mob/species/skrell/uniforms/pants.dmi b/icons/mob/species/skrell/uniforms/pants.dmi
deleted file mode 100644
index 9de1e499252..00000000000
Binary files a/icons/mob/species/skrell/uniforms/pants.dmi and /dev/null differ
diff --git a/icons/mob/species/skrell/uniforms/uniform.dmi b/icons/mob/species/skrell/uniforms/uniform.dmi
deleted file mode 100644
index 0af5703cbaa..00000000000
Binary files a/icons/mob/species/skrell/uniforms/uniform.dmi and /dev/null differ
diff --git a/icons/mob/species/skrell/uniforms/uniform_fat.dmi b/icons/mob/species/skrell/uniforms/uniform_fat.dmi
deleted file mode 100644
index c887239f1ff..00000000000
Binary files a/icons/mob/species/skrell/uniforms/uniform_fat.dmi and /dev/null differ
diff --git a/icons/mob/species/tajaran/uniforms/color.dmi b/icons/mob/species/tajaran/uniforms/color.dmi
deleted file mode 100644
index 9f282d8d7dc..00000000000
Binary files a/icons/mob/species/tajaran/uniforms/color.dmi and /dev/null differ
diff --git a/icons/mob/species/tajaran/uniforms/dresses.dmi b/icons/mob/species/tajaran/uniforms/dresses.dmi
deleted file mode 100644
index 0c49112a123..00000000000
Binary files a/icons/mob/species/tajaran/uniforms/dresses.dmi and /dev/null differ
diff --git a/icons/mob/species/tajaran/uniforms/military.dmi b/icons/mob/species/tajaran/uniforms/military.dmi
deleted file mode 100644
index a11c0618bf8..00000000000
Binary files a/icons/mob/species/tajaran/uniforms/military.dmi and /dev/null differ
diff --git a/icons/mob/species/tajaran/uniforms/pants.dmi b/icons/mob/species/tajaran/uniforms/pants.dmi
deleted file mode 100644
index 9de1e499252..00000000000
Binary files a/icons/mob/species/tajaran/uniforms/pants.dmi and /dev/null differ
diff --git a/icons/mob/species/tajaran/uniforms/uniform.dmi b/icons/mob/species/tajaran/uniforms/uniform.dmi
deleted file mode 100644
index 0af5703cbaa..00000000000
Binary files a/icons/mob/species/tajaran/uniforms/uniform.dmi and /dev/null differ
diff --git a/icons/mob/species/tajaran/uniforms/uniform_fat.dmi b/icons/mob/species/tajaran/uniforms/uniform_fat.dmi
deleted file mode 100644
index c887239f1ff..00000000000
Binary files a/icons/mob/species/tajaran/uniforms/uniform_fat.dmi and /dev/null differ
diff --git a/icons/mob/species/unathi/uniforms/color.dmi b/icons/mob/species/unathi/uniforms/color.dmi
deleted file mode 100644
index 9f282d8d7dc..00000000000
Binary files a/icons/mob/species/unathi/uniforms/color.dmi and /dev/null differ
diff --git a/icons/mob/species/unathi/uniforms/dresses.dmi b/icons/mob/species/unathi/uniforms/dresses.dmi
deleted file mode 100644
index 0c49112a123..00000000000
Binary files a/icons/mob/species/unathi/uniforms/dresses.dmi and /dev/null differ
diff --git a/icons/mob/species/unathi/uniforms/military.dmi b/icons/mob/species/unathi/uniforms/military.dmi
deleted file mode 100644
index a11c0618bf8..00000000000
Binary files a/icons/mob/species/unathi/uniforms/military.dmi and /dev/null differ
diff --git a/icons/mob/species/unathi/uniforms/pants.dmi b/icons/mob/species/unathi/uniforms/pants.dmi
deleted file mode 100644
index 9de1e499252..00000000000
Binary files a/icons/mob/species/unathi/uniforms/pants.dmi and /dev/null differ
diff --git a/icons/mob/species/unathi/uniforms/uniform.dmi b/icons/mob/species/unathi/uniforms/uniform.dmi
deleted file mode 100644
index 0af5703cbaa..00000000000
Binary files a/icons/mob/species/unathi/uniforms/uniform.dmi and /dev/null differ
diff --git a/icons/mob/species/unathi/uniforms/uniform_fat.dmi b/icons/mob/species/unathi/uniforms/uniform_fat.dmi
deleted file mode 100644
index c887239f1ff..00000000000
Binary files a/icons/mob/species/unathi/uniforms/uniform_fat.dmi and /dev/null differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 3bac93b933a..cad42f3b4f5 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/mob/uniform_huge_old.dmi b/icons/mob/uniform_huge_old.dmi
new file mode 100644
index 00000000000..3bac93b933a
Binary files /dev/null and b/icons/mob/uniform_huge_old.dmi differ
diff --git a/icons/mob/uniform_rolled_down.dmi b/icons/mob/uniform_rolled_down.dmi
new file mode 100644
index 00000000000..e3799468510
Binary files /dev/null and b/icons/mob/uniform_rolled_down.dmi differ
diff --git a/icons/mob/uniform_sleeves_rolled.dmi b/icons/mob/uniform_sleeves_rolled.dmi
new file mode 100644
index 00000000000..83a759ff80e
Binary files /dev/null and b/icons/mob/uniform_sleeves_rolled.dmi differ
diff --git a/icons/mob/uniforms/color.dmi b/icons/mob/uniforms/color.dmi
deleted file mode 100644
index 9f282d8d7dc..00000000000
Binary files a/icons/mob/uniforms/color.dmi and /dev/null differ
diff --git a/icons/mob/uniforms/dresses.dmi b/icons/mob/uniforms/dresses.dmi
deleted file mode 100644
index 0c49112a123..00000000000
Binary files a/icons/mob/uniforms/dresses.dmi and /dev/null differ
diff --git a/icons/mob/uniforms/military.dmi b/icons/mob/uniforms/military.dmi
deleted file mode 100644
index a11c0618bf8..00000000000
Binary files a/icons/mob/uniforms/military.dmi and /dev/null differ
diff --git a/icons/mob/uniforms/pants.dmi b/icons/mob/uniforms/pants.dmi
deleted file mode 100644
index 9de1e499252..00000000000
Binary files a/icons/mob/uniforms/pants.dmi and /dev/null differ
diff --git a/icons/mob/uniforms/uniform.dmi b/icons/mob/uniforms/uniform.dmi
deleted file mode 100644
index 341d6775938..00000000000
Binary files a/icons/mob/uniforms/uniform.dmi and /dev/null differ
diff --git a/icons/mob/uniforms/uniform_fat.dmi b/icons/mob/uniforms/uniform_fat.dmi
deleted file mode 100644
index c887239f1ff..00000000000
Binary files a/icons/mob/uniforms/uniform_fat.dmi and /dev/null differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 948af3f9e14..3669a4702ea 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/tools/IconSplitter/!README.txt b/tools/IconSplitter/!README.txt
new file mode 100644
index 00000000000..c4c8c35b1c2
--- /dev/null
+++ b/tools/IconSplitter/!README.txt
@@ -0,0 +1,5 @@
+This Byond program takes all the icons in DmiToSplit along with input from the user and
+splits the icons from the original file into a new file based on the user's provided criteria.
+It also produces a file that is the original file minus the icons split into the new file.
+
+-- Yoshax
\ No newline at end of file
diff --git a/tools/IconSplitter/DmiToSplit.dmi b/tools/IconSplitter/DmiToSplit.dmi
new file mode 100644
index 00000000000..cf74d73796c
Binary files /dev/null and b/tools/IconSplitter/DmiToSplit.dmi differ
diff --git a/tools/IconSplitter/IconSplitter.dm b/tools/IconSplitter/IconSplitter.dm
new file mode 100644
index 00000000000..a13aad9b730
--- /dev/null
+++ b/tools/IconSplitter/IconSplitter.dm
@@ -0,0 +1,49 @@
+/*
+ These are simple defaults for your project.
+ */
+
+world
+ fps = 25 // 25 frames per second
+ icon_size = 32 // 32x32 icon size by default
+
+ view = 6 // show up to 6 tiles outward from center (13x13 view)
+
+
+// Make objects move 8 pixels per tick when walking
+
+mob
+ step_size = 8
+
+obj
+ step_size = 8
+
+
+
+
+client/verb/split_dmi()
+ set name = "Split Dmi"
+ set desc = "Loads DmiToSplit.dmi and removes the icon_states of user provided input into another .dmi."
+ set category = "Here"
+
+ var/icon/DMIToSplit = icon('DmiToSplit.dmi')
+
+ var/icon/RunningOutputCut = new()
+ var/icon/RunningOutput = new()
+
+ var/user_input
+ while(!user_input)
+ user_input = input(usr, "Enter the criteria for the icon_states you wish to be split. For example, doing _d_s will remove all rolled down jumpsuits.","Split Criteria", "")
+ world << "Your split criteria is [user_input]"
+
+ for(var/OriginalState in icon_states(DMIToSplit))
+ if(findtext(OriginalState, user_input))
+ var/icon/ToAdd = icon(DMIToSplit, OriginalState)
+ var/good_name = replacetext(OriginalState, user_input, "")
+ good_name = "[good_name]_s"
+ RunningOutputCut.Insert(ToAdd, good_name)
+ else
+ var/icon/ToAdd = icon(DMIToSplit, OriginalState)
+ RunningOutput.Insert(ToAdd, OriginalState)
+
+ usr << ftp(RunningOutput,"CutUpDmi.dmi")
+ usr << ftp(RunningOutputCut, "CutUpDmiWithCriteria.dmi")
\ No newline at end of file
diff --git a/tools/IconSplitter/IconSplitter.dme b/tools/IconSplitter/IconSplitter.dme
new file mode 100644
index 00000000000..2c3171b1944
--- /dev/null
+++ b/tools/IconSplitter/IconSplitter.dme
@@ -0,0 +1,18 @@
+// DM Environment file for IconSplitter.dme.
+// All manual changes should be made outside the BEGIN_ and END_ blocks.
+// New source code should be placed in .dm files: choose File/New --> Code File.
+
+// BEGIN_INTERNALS
+// END_INTERNALS
+
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+// END_FILE_DIR
+
+// BEGIN_PREFERENCES
+// END_PREFERENCES
+
+// BEGIN_INCLUDE
+#include "IconSplitter.dm"
+// END_INCLUDE
+