diff --git a/citadel.dme b/citadel.dme
index f60efa1f7d6..a1600d48f89 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -2706,11 +2706,32 @@
#include "code\modules\clothing\head\misc.dm"
#include "code\modules\clothing\head\misc_special.dm"
#include "code\modules\clothing\head\misc_vr.dm"
+#include "code\modules\clothing\head\nanotrasen_vr.dm"
#include "code\modules\clothing\head\oricon.dm"
#include "code\modules\clothing\head\pilot_helmet.dm"
#include "code\modules\clothing\head\soft_caps.dm"
#include "code\modules\clothing\head\misc\cakehat.dm"
#include "code\modules\clothing\head\xeno\tajara.dm"
+#include "code\modules\clothing\legacy_accessories\accessory.dm"
+#include "code\modules\clothing\legacy_accessories\armband.dm"
+#include "code\modules\clothing\legacy_accessories\armor.dm"
+#include "code\modules\clothing\legacy_accessories\badges.dm"
+#include "code\modules\clothing\legacy_accessories\clothing.dm"
+#include "code\modules\clothing\legacy_accessories\clothing_cit.dm"
+#include "code\modules\clothing\legacy_accessories\holster.dm"
+#include "code\modules\clothing\legacy_accessories\lockets.dm"
+#include "code\modules\clothing\legacy_accessories\medals.dm"
+#include "code\modules\clothing\legacy_accessories\oricon.dm"
+#include "code\modules\clothing\legacy_accessories\permits.dm"
+#include "code\modules\clothing\legacy_accessories\plasman.dm"
+#include "code\modules\clothing\legacy_accessories\shiny_vr.dm"
+#include "code\modules\clothing\legacy_accessories\storage.dm"
+#include "code\modules\clothing\legacy_accessories\torch.dm"
+#include "code\modules\clothing\legacy_accessories\bracelets\_bracelets.dm"
+#include "code\modules\clothing\legacy_accessories\bracelets\material.dm"
+#include "code\modules\clothing\legacy_accessories\xeno\moth_accessories.dm"
+#include "code\modules\clothing\legacy_accessories\xeno\tajara.dm"
+#include "code\modules\clothing\legacy_accessories\xeno\vox.dm"
#include "code\modules\clothing\masks\_mask.dm"
#include "code\modules\clothing\masks\boxing.dm"
#include "code\modules\clothing\masks\breath.dm"
@@ -2755,7 +2776,6 @@
#include "code\modules\clothing\suits\_suit.dm"
#include "code\modules\clothing\suits\armor.dm"
#include "code\modules\clothing\suits\bio.dm"
-#include "code\modules\clothing\suits\eventclothing.dm"
#include "code\modules\clothing\suits\hooded.dm"
#include "code\modules\clothing\suits\hooded_vr.dm"
#include "code\modules\clothing\suits\jobs.dm"
@@ -2773,51 +2793,71 @@
#include "code\modules\clothing\suits\aliens\unathi.dm"
#include "code\modules\clothing\suits\aliens\vox.dm"
#include "code\modules\clothing\under\_under.dm"
-#include "code\modules\clothing\under\color.dm"
-#include "code\modules\clothing\under\gear_harness.dm"
-#include "code\modules\clothing\under\imperial_vr.dm"
-#include "code\modules\clothing\under\misc.dm"
-#include "code\modules\clothing\under\miscellaneous.dm"
-#include "code\modules\clothing\under\nanotrasen_vr.dm"
-#include "code\modules\clothing\under\pants.dm"
-#include "code\modules\clothing\under\shiny_vr.dm"
-#include "code\modules\clothing\under\shorts.dm"
-#include "code\modules\clothing\under\syndicate.dm"
-#include "code\modules\clothing\under\accessories\accessory.dm"
-#include "code\modules\clothing\under\accessories\armband.dm"
-#include "code\modules\clothing\under\accessories\armor.dm"
-#include "code\modules\clothing\under\accessories\badges.dm"
-#include "code\modules\clothing\under\accessories\clothing.dm"
-#include "code\modules\clothing\under\accessories\clothing_cit.dm"
-#include "code\modules\clothing\under\accessories\holster.dm"
-#include "code\modules\clothing\under\accessories\lockets.dm"
-#include "code\modules\clothing\under\accessories\medals.dm"
-#include "code\modules\clothing\under\accessories\oricon.dm"
-#include "code\modules\clothing\under\accessories\permits.dm"
-#include "code\modules\clothing\under\accessories\plasman.dm"
-#include "code\modules\clothing\under\accessories\shiny_vr.dm"
-#include "code\modules\clothing\under\accessories\storage.dm"
-#include "code\modules\clothing\under\accessories\torch.dm"
-#include "code\modules\clothing\under\accessories\bracelets\_bracelets.dm"
-#include "code\modules\clothing\under\accessories\bracelets\material.dm"
-#include "code\modules\clothing\under\accessories\xeno\tajara.dm"
-#include "code\modules\clothing\under\jobs\centcom.dm"
-#include "code\modules\clothing\under\jobs\civilian.dm"
-#include "code\modules\clothing\under\jobs\engineering.dm"
-#include "code\modules\clothing\under\jobs\medsci.dm"
-#include "code\modules\clothing\under\jobs\miscellaneous_vr.dm"
-#include "code\modules\clothing\under\jobs\security.dm"
-#include "code\modules\clothing\under\oricon\_oricon.dm"
-#include "code\modules\clothing\under\oricon\crew.dm"
-#include "code\modules\clothing\under\oricon\dress.dm"
-#include "code\modules\clothing\under\oricon\pt.dm"
-#include "code\modules\clothing\under\oricon\service.dm"
-#include "code\modules\clothing\under\oricon\utility.dm"
-#include "code\modules\clothing\under\utility\utility.dm"
-#include "code\modules\clothing\under\xenos\moth.dm"
-#include "code\modules\clothing\under\xenos\tajaran.dm"
-#include "code\modules\clothing\under\xenos\teshari.dm"
-#include "code\modules\clothing\under\xenos\vox.dm"
+#include "code\modules\clothing\under\eventclothing.dm"
+#include "code\modules\clothing\under\casual\bluespace.dm"
+#include "code\modules\clothing\under\casual\leotard.dm"
+#include "code\modules\clothing\under\casual\lindenoak.dm"
+#include "code\modules\clothing\under\casual\miscellaneous.dm"
+#include "code\modules\clothing\under\casual\moth_casual.dm"
+#include "code\modules\clothing\under\casual\pants.dm"
+#include "code\modules\clothing\under\casual\shorts.dm"
+#include "code\modules\clothing\under\casual\sleepwear.dm"
+#include "code\modules\clothing\under\casual\swimwear.dm"
+#include "code\modules\clothing\under\casual\teshari_casual.dm"
+#include "code\modules\clothing\under\casual\tribal.dm"
+#include "code\modules\clothing\under\casual\turtlenecks.dm"
+#include "code\modules\clothing\under\casual\vox.dm"
+#include "code\modules\clothing\under\casual\women.dm"
+#include "code\modules\clothing\under\costumes\animeschool.dm"
+#include "code\modules\clothing\under\costumes\armor.dm"
+#include "code\modules\clothing\under\costumes\historical.dm"
+#include "code\modules\clothing\under\costumes\maid.dm"
+#include "code\modules\clothing\under\costumes\miscellaneous.dm"
+#include "code\modules\clothing\under\costumes\nt_fake.dm"
+#include "code\modules\clothing\under\costumes\rangers.dm"
+#include "code\modules\clothing\under\costumes\shiny.dm"
+#include "code\modules\clothing\under\costumes\trek.dm"
+#include "code\modules\clothing\under\formal\antediluvian.dm"
+#include "code\modules\clothing\under\formal\chinese.dm"
+#include "code\modules\clothing\under\formal\dress.dm"
+#include "code\modules\clothing\under\formal\japanese.dm"
+#include "code\modules\clothing\under\formal\lawyer_suits.dm"
+#include "code\modules\clothing\under\formal\miscellaneous.dm"
+#include "code\modules\clothing\under\formal\suits.dm"
+#include "code\modules\clothing\under\formal\tajaran_formal.dm"
+#include "code\modules\clothing\under\formal\wedding.dm"
+#include "code\modules\clothing\under\workwear\bodysuits.dm"
+#include "code\modules\clothing\under\workwear\centcom.dm"
+#include "code\modules\clothing\under\workwear\color_jumpskirt.dm"
+#include "code\modules\clothing\under\workwear\color_jumpsuit.dm"
+#include "code\modules\clothing\under\workwear\dept_cargo.dm"
+#include "code\modules\clothing\under\workwear\dept_command.dm"
+#include "code\modules\clothing\under\workwear\dept_engineering.dm"
+#include "code\modules\clothing\under\workwear\dept_medical.dm"
+#include "code\modules\clothing\under\workwear\dept_science.dm"
+#include "code\modules\clothing\under\workwear\dept_security.dm"
+#include "code\modules\clothing\under\workwear\future_jumpsuit.dm"
+#include "code\modules\clothing\under\workwear\laborer.dm"
+#include "code\modules\clothing\under\workwear\military.dm"
+#include "code\modules\clothing\under\workwear\misc_corporations.dm"
+#include "code\modules\clothing\under\workwear\miscellaneous.dm"
+#include "code\modules\clothing\under\workwear\promethean_cohesion_suits.dm"
+#include "code\modules\clothing\under\workwear\replika.dm"
+#include "code\modules\clothing\under\workwear\syndicate.dm"
+#include "code\modules\clothing\under\workwear\tajaran_workwear.dm"
+#include "code\modules\clothing\under\workwear\teshari_workwear.dm"
+#include "code\modules\clothing\under\workwear\vox_pressuresuit.dm"
+#include "code\modules\clothing\under\workwear\dept_civilian\dept_civilian.dm"
+#include "code\modules\clothing\under\workwear\dept_civilian\janitor.dm"
+#include "code\modules\clothing\under\workwear\dept_civilian\service_clerical.dm"
+#include "code\modules\clothing\under\workwear\dept_civilian\service_food.dm"
+#include "code\modules\clothing\under\workwear\dept_civilian\theatre.dm"
+#include "code\modules\clothing\under\workwear\oricon\_oricon.dm"
+#include "code\modules\clothing\under\workwear\oricon\crew.dm"
+#include "code\modules\clothing\under\workwear\oricon\dress.dm"
+#include "code\modules\clothing\under\workwear\oricon\pt.dm"
+#include "code\modules\clothing\under\workwear\oricon\service.dm"
+#include "code\modules\clothing\under\workwear\oricon\utility.dm"
#include "code\modules\customitems\item_spawning.dm"
#include "code\modules\detectivework\forensics.dm"
#include "code\modules\detectivework\microscope\dnascanner.dm"
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 82bab698adf..9617971f57a 100644
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -2122,7 +2122,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/solar/aft
name = "\improper Aft Solar Array"
- icon_state = "aft"
+ icon_state = "panelsAft"
/area/solar/starboard
name = "\improper Aft Starboard Solar Array"
@@ -2980,7 +2980,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/solar/derelict_aft
name = "\improper Derelict Aft Solar Array"
- icon_state = "aft"
+ icon_state = "panelsAft"
/area/derelict/singularity_engine
name = "\improper Derelict Singularity Engine"
@@ -3043,7 +3043,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/solar/constructionsite
name = "\improper Construction Site Solars"
- icon_state = "aft"
+ icon_state = "panelsAft"
/area/constructionsite/teleporter
name = "Construction Site Teleporter"
diff --git a/code/game/content/factions/orion/iwl/uniform.dm b/code/game/content/factions/orion/iwl/uniform.dm
index cc00fb0beca..59c253f26a9 100644
--- a/code/game/content/factions/orion/iwl/uniform.dm
+++ b/code/game/content/factions/orion/iwl/uniform.dm
@@ -4,6 +4,9 @@
icon = 'icons/content/factions/orion/iwl/iwluni.dmi'
icon_state = "iwl_comm_uniform"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/iwlofficer
name = "officer's uniform"
@@ -11,6 +14,9 @@
icon = 'icons/content/factions/orion/iwl/iwluni.dmi'
icon_state = "iwl_off_uniform"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/iwluniform
name = "soldiery uniform"
@@ -18,3 +24,6 @@
icon = 'icons/content/factions/orion/iwl/iwluni.dmi'
icon_state = "iwl_uniform"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/game/gamemodes/technomancer/clothing.dm b/code/game/gamemodes/technomancer/clothing.dm
index 4da7aa138b8..fc615b831cc 100644
--- a/code/game/gamemodes/technomancer/clothing.dm
+++ b/code/game/gamemodes/technomancer/clothing.dm
@@ -11,21 +11,33 @@
name = "initiate's jumpsuit"
desc = "It's a blue colored jumpsuit. There appears to be light-weight armor padding underneath, providing some protection. \
There is also a healthy amount of insulation underneath."
+ icon = 'icons/clothing/uniform/workwear/technomancer/initiate.dmi'
icon_state = "initiate"
armor_type = /datum/armor/technomancer/jumpsuit
siemens_coefficient = 0.3
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/technomancer/apprentice
name = "apprentice's jumpsuit"
desc = "It's a blue colored jumpsuit with some silver markings. There appears to be light-weight armor padding \
underneath, providing some protection. There is also a healthy amount of insulation underneath."
+ icon = 'icons/clothing/uniform/workwear/technomancer/apprentice.dmi'
icon_state = "apprentice"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/technomancer/master
name = "master's jumpsuit"
desc = "It's a blue colored jumpsuit with some gold markings. There appears to be light-weight armor padding \
underneath, providing some protection. There is also a healthy amount of insulation underneath."
+ icon = 'icons/clothing/uniform/workwear/technomancer/technomancer.dmi'
icon_state = "technomancer"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/head/technomancer
name = "initiate's hat"
diff --git a/code/game/machinery/vending/loadout.dm b/code/game/machinery/vending/loadout.dm
index e944aad93c3..8f8cd016c11 100644
--- a/code/game/machinery/vending/loadout.dm
+++ b/code/game/machinery/vending/loadout.dm
@@ -701,10 +701,10 @@
/obj/item/storage/box/fluff/swimsuit/highclass = 3,
/obj/item/storage/box/fluff/swimsuit/latex = 3,
/obj/item/storage/box/rainponcho = 5,
- /obj/item/clothing/under/redpyjamas = 5,
- /obj/item/clothing/under/redpyjamas_fem = 5,
- /obj/item/clothing/under/bluepyjamas = 5,
- /obj/item/clothing/under/bluepyjamas_fem = 5,
+ /obj/item/clothing/under/pj/red = 5,
+ /obj/item/clothing/under/pj/red_fem = 5,
+ /obj/item/clothing/under/pj/blue = 5,
+ /obj/item/clothing/under/pj/blue_fem = 5,
/obj/item/clothing/under/utility = 5,
/obj/item/clothing/under/utility/grey = 5,
/obj/item/clothing/under/utility/blue = 5,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 43483378786..bf30b90cf11 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -405,7 +405,6 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/item/flashlight/maglight,
/obj/item/clothing/head/soft/nanotrasen,
/obj/item/clothing/head/beret/nanotrasen,
- /obj/item/clothing/under/nanotrasen/security,
/obj/item/clothing/gloves/black,
/obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/shoes/boots/jackboots/toeless)
@@ -458,8 +457,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/item/flashlight/maglight,
/obj/item/clothing/gloves/black,
/obj/item/clothing/shoes/boots/jackboots,
- /obj/item/clothing/shoes/boots/jackboots/toeless,
- /obj/item/clothing/under/nanotrasen/security/commander)
+ /obj/item/clothing/shoes/boots/jackboots/toeless)
/obj/structure/closet/secure_closet/nanotrasen_commander/Initialize(mapload)
if(prob(25))
@@ -479,7 +477,6 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
starts_with = list(
/obj/item/clothing/suit/storage/vest/warden,
- /obj/item/clothing/under/nanotrasen/security/warden,
/obj/item/clothing/suit/storage/vest/wardencoat/alt,
/obj/item/clothing/head/helmet/warden,
/obj/item/cartridge/security,
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index d341d8958f1..c49840c9689 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -90,16 +90,16 @@
/obj/item/clothing/under/chameleon
//starts off as black
name = "black jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
icon_state = "black"
- snowflake_worn_state = "black"
desc = "It's a plain jumpsuit. It seems to have a small dial on the wrist."
origin_tech = list(TECH_ILLEGAL = 3)
/obj/item/clothing/under/chameleon/emp_act(severity)
name = "psychedelic"
desc = "Groovy!"
+ icon = 'icons/clothing/uniform/casual/psyche.dmi'
icon_state = "psyche"
- item_state_slots[SLOT_ID_UNIFORM] = "psyche"
update_icon()
update_worn_icon()
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index e31766d8d85..233e9bec06e 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -396,7 +396,7 @@
/obj/item/clothing/head/helmet/aquiline
name = "aquiline enforcer helmet"
desc = "Prior to the Final War, issues with law enforcement on Old Earth became so bad that in many countries the police became little more than roving executioners. This striking helmet was designed to help law enforcement officers easily identify themselves in crowds."
- icon = 'icons/clothing/uniform/costume/aquiline.dmi'
+ icon = 'icons/clothing/head/aquiline.dmi'
icon_state = "dreddhelm"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
diff --git a/code/modules/clothing/head/nanotrasen_vr.dm b/code/modules/clothing/head/nanotrasen_vr.dm
new file mode 100644
index 00000000000..d90a52bc1dc
--- /dev/null
+++ b/code/modules/clothing/head/nanotrasen_vr.dm
@@ -0,0 +1,26 @@
+//Head Gear
+
+/obj/item/clothing/head/soft/nanotrasen
+ name = "Nanotrasen security cap"
+ desc = "It's a NT blue ballcap with a Nanotrasen crest. It looks surprisingly sturdy."
+ icon_state = "fleetsoft"
+ item_state_slots = list(
+ SLOT_ID_LEFT_HAND = "darkbluesoft",
+ SLOT_ID_RIGHT_HAND = "darkbluesoft",
+ )
+ armor_type = /datum/armor/station/padded
+
+/obj/item/clothing/head/beret/nanotrasen
+ name = "Nanotrasen security beret"
+ desc = "A NT blue beret belonging to the Nanotrasen security forces. For personnel that are more inclined towards style than safety."
+ icon_state = "beret_navy"
+
+//Armor
+
+/obj/item/clothing/suit/storage/vest/nanotrasen
+ name = "security armor vest"
+ desc = "A Sturdy kevlar plate carrier with webbing attached."
+ icon_state = "webvest"
+ item_state_slots = list(SLOT_ID_RIGHT_HAND = "swat", SLOT_ID_LEFT_HAND = "swat")
+ armor_type = /datum/armor/station/tactical
+ weight = ITEM_WEIGHT_ARMOR_LIGHT
diff --git a/code/modules/clothing/legacy_accessories/README.md b/code/modules/clothing/legacy_accessories/README.md
new file mode 100644
index 00000000000..796e57408d9
--- /dev/null
+++ b/code/modules/clothing/legacy_accessories/README.md
@@ -0,0 +1,4 @@
+# Legacy Accessories folder
+- This was removed from the old modules/clothing/under folder.
+- Do not add anything new in here; use the new icon render system and add it to the modules/clothing/accessories folder.
+- Consider cleaning this up if you get to it first :D
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/legacy_accessories/accessory.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/accessory.dm
rename to code/modules/clothing/legacy_accessories/accessory.dm
diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/legacy_accessories/armband.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/armband.dm
rename to code/modules/clothing/legacy_accessories/armband.dm
diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/legacy_accessories/armor.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/armor.dm
rename to code/modules/clothing/legacy_accessories/armor.dm
diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/legacy_accessories/badges.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/badges.dm
rename to code/modules/clothing/legacy_accessories/badges.dm
diff --git a/code/modules/clothing/under/accessories/bracelets/_bracelets.dm b/code/modules/clothing/legacy_accessories/bracelets/_bracelets.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/bracelets/_bracelets.dm
rename to code/modules/clothing/legacy_accessories/bracelets/_bracelets.dm
diff --git a/code/modules/clothing/under/accessories/bracelets/material.dm b/code/modules/clothing/legacy_accessories/bracelets/material.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/bracelets/material.dm
rename to code/modules/clothing/legacy_accessories/bracelets/material.dm
diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/legacy_accessories/clothing.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/clothing.dm
rename to code/modules/clothing/legacy_accessories/clothing.dm
diff --git a/code/modules/clothing/under/accessories/clothing_cit.dm b/code/modules/clothing/legacy_accessories/clothing_cit.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/clothing_cit.dm
rename to code/modules/clothing/legacy_accessories/clothing_cit.dm
diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/legacy_accessories/holster.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/holster.dm
rename to code/modules/clothing/legacy_accessories/holster.dm
diff --git a/code/modules/clothing/under/accessories/lockets.dm b/code/modules/clothing/legacy_accessories/lockets.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/lockets.dm
rename to code/modules/clothing/legacy_accessories/lockets.dm
diff --git a/code/modules/clothing/under/accessories/medals.dm b/code/modules/clothing/legacy_accessories/medals.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/medals.dm
rename to code/modules/clothing/legacy_accessories/medals.dm
diff --git a/code/modules/clothing/under/accessories/oricon.dm b/code/modules/clothing/legacy_accessories/oricon.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/oricon.dm
rename to code/modules/clothing/legacy_accessories/oricon.dm
diff --git a/code/modules/clothing/under/accessories/permits.dm b/code/modules/clothing/legacy_accessories/permits.dm
old mode 100755
new mode 100644
similarity index 100%
rename from code/modules/clothing/under/accessories/permits.dm
rename to code/modules/clothing/legacy_accessories/permits.dm
diff --git a/code/modules/clothing/under/accessories/plasman.dm b/code/modules/clothing/legacy_accessories/plasman.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/plasman.dm
rename to code/modules/clothing/legacy_accessories/plasman.dm
diff --git a/code/modules/clothing/under/accessories/shiny_vr.dm b/code/modules/clothing/legacy_accessories/shiny_vr.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/shiny_vr.dm
rename to code/modules/clothing/legacy_accessories/shiny_vr.dm
diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/legacy_accessories/storage.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/storage.dm
rename to code/modules/clothing/legacy_accessories/storage.dm
diff --git a/code/modules/clothing/under/accessories/torch.dm b/code/modules/clothing/legacy_accessories/torch.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/torch.dm
rename to code/modules/clothing/legacy_accessories/torch.dm
diff --git a/code/modules/clothing/under/xenos/moth.dm b/code/modules/clothing/legacy_accessories/xeno/moth_accessories.dm
similarity index 72%
rename from code/modules/clothing/under/xenos/moth.dm
rename to code/modules/clothing/legacy_accessories/xeno/moth_accessories.dm
index 9cfbc93f92c..80cff835a74 100644
--- a/code/modules/clothing/under/xenos/moth.dm
+++ b/code/modules/clothing/legacy_accessories/xeno/moth_accessories.dm
@@ -1,183 +1,8 @@
-// Lowers
-
-/obj/item/clothing/under/moth
- icon = 'icons/mob/clothing/species/moth/moth_uniforms.dmi'
- icon_override = 'icons/mob/clothing/species/moth/moth_uniforms.dmi'
- icon_state = "gray_puffy_pants"
- item_state = "gray_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants
- name = "puffy pants"
- desc = "A pair of puffy pants. The holes are too small for human proportions."
- body_cover_flags = LEGS
-
-/obj/item/clothing/under/moth/puffy_pants/red
- name = "red puffy pants"
- icon_state = "red_puffy_pants"
- item_state = "red_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants/bright_blue
- name = "bright blue puffy pants"
- icon_state = "bright_blue_puffy_pants"
- item_state = "bright_blue_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants/dull_blue
- name = "dull blue puffy pants"
- icon_state = "dull_blue_puffy_pants"
- item_state = "dull_blue_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants/light_orange
- name = "light orange puffy pants"
- icon_state = "light_orange_puffy_pants"
- item_state = "light_orange_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants/dark_orange
- name = "dark orange puffy pants"
- icon_state = "dark_orange_puffy_pants"
- item_state = "dark_orange_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants/purple
- name = "purple puffy pants"
- icon_state = "purple_puffy_pants"
- item_state = "purple_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants/green
- name = "green puffy pants"
- icon_state = "green_puffy_pants"
- item_state = "green_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants/dark
- name = "dark puffy pants"
- icon_state = "dark_puffy_pants"
- item_state = "dark_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants/brown
- name = "brown puffy pants"
- icon_state = "brown_puffy_pants"
- item_state = "brown_puffy_pants"
-
-/obj/item/clothing/under/moth/puffy_pants/white
- name = "white puffy pants"
- icon_state = "white_puffy_pants"
- item_state = "white_puffy_pants"
-
-/obj/item/clothing/under/moth/tight_pants
- name = "pants"
- desc = "A pair of pants. The holes are too small for human proportions."
- icon_state = "gray_tight_pants"
- item_state = "gray_tight_pants"
- body_cover_flags = LEGS
-
-/obj/item/clothing/under/moth/tight_pants/red
- name = "red pants"
- icon_state = "red_tight_pants"
- item_state = "red_tight_pants"
-
-/obj/item/clothing/under/moth/tight_pants/bright_blue
- name = "bright blue pants"
- icon_state = "bright_blue_tight_pants"
- item_state = "bright_blue_tight_pants"
-
-/obj/item/clothing/under/moth/tight_pants/dull_blue
- name = "dull blue pants"
- icon_state = "dull_blue_tight_pants"
- item_state = "dull_blue_tight_pants"
-
-/obj/item/clothing/under/moth/tight_pants/light_orange
- name = "light orange pants"
- icon_state = "light_orange_tight_pants"
- item_state = "light_orange_tight_pants"
-
-/obj/item/clothing/under/moth/tight_pants/dark_orange
- name = "dark orange pants"
- icon_state = "dark_orange_tight_pants"
- item_state = "dark_orange_tight_pants"
-
-/obj/item/clothing/under/moth/tight_pants/purple
- name = "purple pants"
- icon_state = "purple_tight_pants"
- item_state = "purple_tight_pants"
-
-/obj/item/clothing/under/moth/tight_pants/green
- name = "green pants"
- icon_state = "green_tight_pants"
- item_state = "green_tight_pants"
-
-/obj/item/clothing/under/moth/tight_pants/dark
- name = "dark pants"
- icon_state = "dark_tight_pants"
- item_state = "dark_tight_pants"
-
-/obj/item/clothing/under/moth/tight_pants/brown
- name = "brown pants"
- icon_state = "brown_tight_pants"
- item_state = "brown_tight_pants"
-
-/obj/item/clothing/under/moth/tight_pants/white
- name = "white pants"
- icon_state = "white_tight_pants"
- item_state = "white_tight_pants"
-
-/obj/item/clothing/under/moth/moth_skirt
- name = "skirt"
- desc = "A long skirt. The holes are too small for human proportions."
- icon_state = "gray_moth_skirt"
- item_state = "gray_moth_skirt"
- body_cover_flags = LEGS
-
-/obj/item/clothing/under/moth/moth_skirt/red
- name = "red skirt"
- icon_state = "red_moth_skirt"
- item_state = "red_moth_skirt"
-
-/obj/item/clothing/under/moth/moth_skirt/bright_blue
- name = "bright blue skirt"
- icon_state = "bright_blue_moth_skirt"
- item_state = "bright_blue_moth_skirt"
-
-/obj/item/clothing/under/moth/moth_skirt/dull_blue
- name = "dull blue skirt"
- icon_state = "dull_blue_moth_skirt"
- item_state = "dull_blue_moth_skirt"
-
-/obj/item/clothing/under/moth/moth_skirt/light_orange
- name = "light orange skirt"
- icon_state = "light_orange_moth_skirt"
- item_state = "light_orange_moth_skirt"
-
-/obj/item/clothing/under/moth/moth_skirt/dark_orange
- name = "dark orange skirt"
- icon_state = "dark_orange_moth_skirt"
- item_state = "dark_orange_moth_skirt"
-
-/obj/item/clothing/under/moth/moth_skirt/purple
- name = "purple skirt"
- icon_state = "purple_moth_skirt"
- item_state = "purple_moth_skirt"
-
-/obj/item/clothing/under/moth/moth_skirt/green
- name = "green skirt"
- icon_state = "green_moth_skirt"
- item_state = "green_moth_skirt"
-
-/obj/item/clothing/under/moth/moth_skirt/dark
- name = "dark skirt"
- icon_state = "dark_moth_skirt"
- item_state = "dark_moth_skirt"
-
-/obj/item/clothing/under/moth/moth_skirt/brown
- name = "brown skirt"
- icon_state = "brown_moth_skirt"
- item_state = "brown_moth_skirt"
-
-/obj/item/clothing/under/moth/moth_skirt/white
- name = "white skirt"
- icon_state = "white_moth_skirt"
- item_state = "white_moth_skirt"
-
-
-// Uppers
-
+/**
+ * Moth accessories
+ * Can accessories even be species locked?
+ * Judiciously destroy this file later when accessories gets cleaned up.
+ */
/obj/item/clothing/accessory/vest/moth
icon = 'icons/mob/clothing/species/moth/moth_uniforms.dmi'
icon_override = 'icons/mob/clothing/species/moth/moth_uniforms.dmi'
diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/legacy_accessories/xeno/tajara.dm
similarity index 100%
rename from code/modules/clothing/under/accessories/xeno/tajara.dm
rename to code/modules/clothing/legacy_accessories/xeno/tajara.dm
diff --git a/code/modules/clothing/legacy_accessories/xeno/vox.dm b/code/modules/clothing/legacy_accessories/xeno/vox.dm
new file mode 100644
index 00000000000..5cbb35427e5
--- /dev/null
+++ b/code/modules/clothing/legacy_accessories/xeno/vox.dm
@@ -0,0 +1,11 @@
+//Vox Accessories
+/obj/item/clothing/accessory/storage/vox
+ name = "alien mesh"
+ desc = "An alien mesh. Seems to be made up mostly of pockets and writhing flesh."
+ icon_state = "webbing-vox"
+
+ atom_flags = PHORONGUARD
+
+ max_items = 3
+ max_combined_volume = 3 * WEIGHT_VOLUME_NORMAL
+ max_single_weight_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 13165d57188..6ea8a874056 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -305,6 +305,6 @@
/obj/item/clothing/shoes/socksandals
name = "socks and sandals"
desc = "These broken in leather sandals go great with a brand new pair of white socks. The ultimate in comfort for a wandering sightseer."
- icon = 'icons/clothing/uniform/misc/tourist.dmi'
+ icon = 'icons/clothing/shoes/tourist.dmi'
icon_state = "touristsandal"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
diff --git a/code/modules/clothing/shoes/moth_boots.dm b/code/modules/clothing/shoes/moth_boots.dm
index a8d3bd32856..f43cfdc05d0 100644
--- a/code/modules/clothing/shoes/moth_boots.dm
+++ b/code/modules/clothing/shoes/moth_boots.dm
@@ -21,7 +21,7 @@
icon_override = 'icons/mob/clothing/species/moth/moth_shoes.dmi'
icon_state = "leg_wraps"
item_state = "leg_wraps_s"
-
+
/obj/item/clothing/shoes/moth/legwrap/black
name = "black cloth legwraps"
diff --git a/code/modules/clothing/suits/eventclothing.dm b/code/modules/clothing/suits/eventclothing.dm
deleted file mode 100644
index e669e8e239b..00000000000
--- a/code/modules/clothing/suits/eventclothing.dm
+++ /dev/null
@@ -1,111 +0,0 @@
-/obj/item/clothing/under/event_reward/foxmiko
- name = "Miko Garb"
- desc = "The creative reinterpretation of Shinto miko attire."
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
- icon = 'icons/obj/clothing/eventclothing.dmi'
- icon_override = 'icons/mob/eventclothing.dmi'
- icon_state = "foxmiko"
- item_state = "foxmiko"
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL //Don't want to try and roll sleeves like you can with a normal jumpsuit
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- var/kimono = 0 //Custom vars for tracking kimono and skirt state
- var/skirt = 0
-
-
-/obj/item/clothing/under/event_reward/foxmiko/verb/partkimono() //Verb for parting kimono - kinky. User reporting, flips state, and updates icon
- set name = "Adjust Kimono"
- set category = VERB_CATEGORY_OBJECT
- set src in usr
- if(!istype(usr, /mob/living)) //Standard checks for clothing verbs
- return
- if(usr.stat)
- return
-
- if(kimono) //User reporting
- to_chat(usr, "You correct your kimono.")
- else
- to_chat(usr, "You part your kimono.")
-
- kimono = !kimono //Switch state parted -> unparted, or unparted -> parted
- switchsprite() //Proc call - handles the two states of kimono and skirt
-
- var/mob/M = src.loc //And finally update the icon
- M.update_inv_w_uniform()
- update_worn_icon()
-
-/obj/item/clothing/under/event_reward/foxmiko/verb/liftskirt() //Verb for parting skirt - lewd. User reporting, flips state, and updates icon
- set name = "Adjust Skirt"
- set category = VERB_CATEGORY_OBJECT
- set src in usr
- if(!istype(usr, /mob/living)) //Standard checks for clothing verbs
- return
- if(usr.stat)
- return
-
- if(skirt) //User reporting
- to_chat(usr, "You drop your skirt.")
- else
- to_chat(usr, "You lift your skirt.")
-
- skirt = !skirt //Switch state lifted -> unlifeted, or unlifted -> lifted
- switchsprite() //Proc call - handles the two states of kimono and skirt
-
- var/mob/M = src.loc //And finally update the icon
- M.update_inv_w_uniform()
- update_worn_icon()
-
-
-/obj/item/clothing/under/event_reward/foxmiko/proc/switchsprite() //Handles the ultimate state of the icon as well as what parts of body the attire covers
- body_cover_flags = initial(body_cover_flags) //Resets to default coverage for this uniform - upper and lower body
- LAZYINITLIST(item_state_slots)
- if(kimono) //If the kimono is parted
- if(skirt) //If the skirt is parted too
- item_state_slots[SLOT_ID_UNIFORM] = "[snowflake_worn_state]_ks" //Then we want the assosiated mob icon - denoted with _ks
- icon_state = "foxmiko_ks" //This is for item icon - NOT WORN ICON
- body_cover_flags &= ~(UPPER_TORSO|LOWER_TORSO) //If kimono is open and skirt lifted uncover both upper and lower body
- else //But skirt is not lifted too
- item_state_slots[SLOT_ID_UNIFORM] = "[snowflake_worn_state]_k" //We use [snowflake_worn_state] rather than an explicit declaration because the game appends a _s to icon states
- icon_state = "foxmiko_k"
- body_cover_flags &= ~(UPPER_TORSO)
- else //If kimono is not parted
- if(skirt) //If skirt is lifted
- item_state_slots[SLOT_ID_UNIFORM] = "[snowflake_worn_state]_s" //Meaning in the icon sprite files this is foxmiko_s_s
- icon_state = "foxmiko_s"
- body_cover_flags &= ~(LOWER_TORSO)
- else //But skirt is not lifted too - default state
- item_state_slots[SLOT_ID_UNIFORM] = "[snowflake_worn_state]"
- icon_state = "foxmiko"
-
-
-/obj/item/clothing/under/event_reward/foxmiko/proc/hide_accessory(mob/user, obj/item/clothing/accessory/A) //Proc, handles hiding and concealing accessories and user reporting
- if(!LAZYLEN(accessories) || !(A in accessories)) //Double check - if there's no accessories, break it now.
- return
-
- if(A.icon_state == "") //If the icon has already been hidden
- A.icon_state = initial(A.icon_state) //Revert the icon to the original state, making it visible again
- A.overlay_state = initial(A.overlay_state) //As well as the overlay_state - certain accessories use both
- to_chat(usr, "You reveal [A] from among your [src].") //And reports to user
- else //If the icon hasn't already been hidden
- A.icon_state = "" //Hide icon state
- A.overlay_state = "" //Hide overlay state - certain accessories use both
- to_chat(usr, "You hide [A] among your [src].") //And reports to user
-
- var/mob/M = src.loc //And updates the icon
- M.update_inv_w_uniform()
- update_worn_icon()
-
-
-/obj/item/clothing/under/event_reward/foxmiko/verb/hidetie() //Verb for concealing assessory icons on mob spirt - this is a hack of the original code to remove accessories
- set name = "Hide Accessory"
- set category = VERB_CATEGORY_OBJECT
- set src in usr
- if(!istype(usr, /mob/living)) return //Standard checks for clothing verbs
- if(usr.stat) return
- var/obj/item/clothing/accessory/A //obj for accessory we are targeting
- if(LAZYLEN(accessories)) //If the list contains accessories - it is valid
- A = input("Select an accessory to hide on [src]") as null|anything in accessories
- if(A) //If a selection is made, call the other proc
- hide_accessory(usr,A)
- if(!LAZYLEN(accessories)) //But if there are no accessories, list will be empty, meaning we ought to remove access to verb
- remove_obj_verb(src, /obj/item/clothing/under/event_reward/foxmiko/verb/hidetie) //Removes access to verb
- accessories = null
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 721e2b95402..82027723b1d 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -1583,7 +1583,7 @@
/obj/item/clothing/suit/storage/kamina
name = "spiral hero cloak"
desc = "Don't believe in yourself. Believe in the me that believes in you."
- icon = 'icons/clothing/uniform/costume/spiral.dmi'
+ icon = 'icons/clothing/suit/costume/spiral.dmi'
icon_state = "kaminacape"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 535a95181e4..bc80d12e8cc 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -12,6 +12,9 @@
show_messages = 1
blood_sprite_state = "uniformblood"
attack_hand_auto_unequip = FALSE
+ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
//! Suit Sensors
/// do we have suit sensors?
@@ -27,13 +30,13 @@
//? If you are using new rendering, you must NOT use autodetection.
//? Read the procs for these in the rendering section to know why.
/// if true, we assume *all* bodytypes have rolldown states, and to use the new system.
- var/worn_has_rolldown = UNIFORM_AUTODETECT_ROLL
+ var/worn_has_rolldown = UNIFORM_HAS_ROLL
/// if true, we assume *all* bodytypes have rollsleeve states, and to use the new system.
- var/worn_has_rollsleeve = UNIFORM_AUTODETECT_ROLL
+ var/worn_has_rollsleeve = UNIFORM_HAS_ROLL
/// these bodytypes have rolldown if not autodetecting
- var/datum/bodytypes/worn_rolldown_bodytypes = BODYTYPES_ALL
+ var/datum/bodytypes/worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/// these bodytypes have rollsleeve if not autodetecting
- var/datum/bodytypes/worn_rollsleeve_bodytypes = BODYTYPES_ALL
+ var/datum/bodytypes/worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/// rolldown status
var/worn_rolled_down = UNIFORM_ROLL_NULLED
/// rollsleeve status
diff --git a/code/modules/clothing/under/casual/bluespace.dm b/code/modules/clothing/under/casual/bluespace.dm
new file mode 100644
index 00000000000..50a6a8a6c9d
--- /dev/null
+++ b/code/modules/clothing/under/casual/bluespace.dm
@@ -0,0 +1,93 @@
+/**
+ * I hate this thing -Shadow
+ */
+
+//Eurgh
+/obj/item/clothing/var/hides_bulges = FALSE
+
+/obj/item/clothing/under/bluespace
+ name = "bluespace jumpsuit"
+ icon = 'icons/clothing/uniform/casual/bluespace.dmi'
+ icon_state = "bluespace"
+ desc = "Do you feel like warping spacetime today? Because it seems like that's on the agenda, now. \
+ Allows one to resize themselves at will, and conceals their true weight."
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+ hides_bulges = TRUE
+ var/original_size
+
+/obj/item/clothing/under/bluespace/verb/toggle_fibers()
+ set category = VERB_CATEGORY_OBJECT
+ set name = "Adjust fibers"
+ set desc = "Adjust your suit fibers. This makes it so your stomach(s) will show or not."
+ set src in usr
+
+ adjust_fibers(usr)
+
+/obj/item/clothing/under/bluespace/proc/adjust_fibers(mob/user)
+ if(hides_bulges == FALSE)
+ hides_bulges = TRUE
+ to_chat(user, "You tense the suit fibers, hiding your stomach(s).")
+ else
+ hides_bulges = FALSE
+ to_chat(user, "You relax the suit fibers, showing your stomach(s).")
+
+/obj/item/clothing/under/bluespace/verb/resize()
+ set name = "Adjust Size"
+ set category = VERB_CATEGORY_OBJECT
+ set src in usr
+ bluespace_size(usr)
+
+/obj/item/clothing/under/bluespace/proc/bluespace_size(mob/usr as mob)
+ if (!ishuman(usr))
+ return
+
+ var/mob/living/carbon/human/H = usr
+
+ if (H.stat || H.restrained())
+ return
+
+ if (src != H.w_uniform)
+ to_chat(H,"You must be WEARING the uniform to change your size.")
+ return
+
+ var/new_size = input("Put the desired size (25-200%)", "Set Size", 200) as num|null
+
+ //Check AGAIN because we accepted user input which is blocking.
+ if (src != H.w_uniform)
+ to_chat(H,"You must be WEARING the uniform to change your size.")
+ return
+
+ if (H.stat || H.restrained())
+ return
+
+ if (isnull(H.size_multiplier))
+ to_chat(H,"The uniform panics and corrects your apparently microscopic size.")
+ H.resize(RESIZE_NORMAL)
+ H.update_icons() //Just want the matrix transform
+ return
+
+ if (!ISINRANGE(new_size,25,200))
+ to_chat(H,"The safety features of the uniform prevent you from choosing this size.")
+ return
+
+ else if(new_size)
+ if(new_size != H.size_multiplier)
+ if(!original_size)
+ original_size = H.size_multiplier
+ H.resize(new_size/100)
+ H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!")
+ else //They chose their current size.
+ return
+
+/obj/item/clothing/under/bluespace/unequipped(mob/user, slot, flags)
+ . = ..()
+ if(. && ishuman(user) && original_size)
+ var/mob/living/carbon/human/H = user
+ H.resize(original_size)
+ original_size = null
+ H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!")
diff --git a/code/modules/clothing/under/casual/leotard.dm b/code/modules/clothing/under/casual/leotard.dm
new file mode 100644
index 00000000000..9884871bd6e
--- /dev/null
+++ b/code/modules/clothing/under/casual/leotard.dm
@@ -0,0 +1,58 @@
+/**
+ * Leotard clothing
+ */
+
+/obj/item/clothing/under/leotard
+ name = "black leotard"
+ desc = "A black leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included."
+ icon = 'icons/clothing/uniform/casual/leotard/leotard.dmi'
+ icon_state = "leotard"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/leotardcolor
+ name = "colored leotard"
+ desc = "A colorable leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included."
+ icon = 'icons/clothing/uniform/casual/leotard/leotard_color.dmi'
+ icon_state = "leotard_color"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/leotardwindow
+ name = "side-window leotard"
+ desc = "A revealing leotard with a window that exposes your sides."
+ icon = 'icons/clothing/uniform/casual/leotard/leotard_window.dmi'
+ icon_state = "leotard_window"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bunnysuit_f
+ name = "bunny leotard (f)"
+ desc = "A black leotard, commonly used by casino workers to drive up tips. Bunny ears and tail sold separately."
+ icon = 'icons/clothing/uniform/casual/leotard/bunny_f.dmi'
+ icon_state = "bunny_f"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bunnysuit_m
+ name = "bunny leotard (m)"
+ desc = "A black leotard, commonly used by casino workers to drive up tips. Bunny ears and tail sold separately."
+ icon = 'icons/clothing/uniform/casual/leotard/bunny_m.dmi'
+ icon_state = "bunny_m"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/casual/lindenoak.dm b/code/modules/clothing/under/casual/lindenoak.dm
new file mode 100644
index 00000000000..169a1f9e112
--- /dev/null
+++ b/code/modules/clothing/under/casual/lindenoak.dm
@@ -0,0 +1,47 @@
+/**
+ * Lindenoak Line
+ */
+
+/obj/item/clothing/under/sitri
+ name = "Sitri striped sweater"
+ desc = "A comfortable, fashionable pair of high waisted shorts paired with a striped grey and white turtleneck. The Goetic seal of Sitri is embroidered on the left breast pocket in soft grey thread. A tag on the inside of the sweater bears the name 'Lindenoak' in both Common and Daemonic."
+ icon = 'icons/clothing/uniform/casual/lindenoak/sitri.dmi'
+ icon_state = "sitri"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/belial
+ name = "Belial striped shirt and shorts"
+ desc = "A comfortable cotton shirt in a mix of blazing red, white and blue hues, combined with a pair of white shorts and accompanying, crisscrossing black lace along it's sides. Its tag marks it as belonging to the Lindenoak clothing line."
+ icon = 'icons/clothing/uniform/casual/lindenoak/belial.dmi'
+ icon_state = "belial"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/asmodai
+ name = "Asmodai laced blouse"
+ desc = "An open chest blouse held together by black lacing and coupled with a pair side pre-ripped jeans. It's an outfit that's as much comfortable as it is fashionable. A small tag marks it as belonging to the Lindenoak line."
+ icon = 'icons/clothing/uniform/casual/lindenoak/asmodai.dmi'
+ icon_state = "asmodai"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skirt/highwaisted
+ name = "high-waisted business skirt"
+ desc = "A well tailored skirt matched with a form fitting blouse, perfect for all those paper pushing needs."
+ icon = 'icons/clothing/uniform/casual/lindenoak/hueyskirt.dmi'
+ icon_state = "hueyskirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/casual/miscellaneous.dm b/code/modules/clothing/under/casual/miscellaneous.dm
new file mode 100644
index 00000000000..e023fe39acb
--- /dev/null
+++ b/code/modules/clothing/under/casual/miscellaneous.dm
@@ -0,0 +1,113 @@
+/**
+ * This file is for anything tha does not fit elsewhere.
+ * If you add 3 or more of something that groups together remove it from here and put it
+ * in its own file please.
+ */
+
+/obj/item/clothing/under/kilt
+ name = "kilt"
+ desc = "Includes shoes and plaid"
+ icon = 'icons/clothing/uniform/casual/kilt.dmi'
+ icon_state = "kilt"
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|FEET
+
+/obj/item/clothing/under/skirt/loincloth
+ name = "loincloth"
+ desc = "A piece of cloth wrapped around the waist."
+ icon = 'icons/clothing/uniform/casual/loincloth.dmi'
+ icon_state = "loincloth"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/psyche
+ name = "psychedelic jumpsuit"
+ desc = "Groovy!"
+ icon = 'icons/clothing/uniform/casual/psyche.dmi'
+ icon_state = "psyche"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/rainbow
+ name = "rainbow jumpsuit"
+ desc = "A multi-colored jumpsuit."
+ icon = 'icons/clothing/uniform/casual/rainbow_jumpsuit.dmi'
+ icon_state = "rainbow"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/rainbow_skirt
+ name = "rainbow pleated skirt"
+ icon = 'icons/clothing/uniform/casual/rainbow_skirt.dmi'
+ icon_state = "rainbow_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/ascetic
+ name = "plain ascetic garb"
+ desc = "Popular with freshly grown vatborn and new age cultists alike."
+ icon = 'icons/clothing/uniform/casual/ascetic.dmi'
+ icon_state = "ascetic"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/ascetic_fem
+ name = "plain ascetic garb"
+ desc = "Popular with freshly grown vatborn and new age cultists alike."
+ icon = 'icons/clothing/uniform/casual/ascetic_fem.dmi'
+ icon_state = "ascetic_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/bathrobe
+ name = "bathrobe"
+ desc = "A fluffy robe to keep you from showing off to the world."
+ icon = 'icons/clothing/uniform/casual/bathrobe.dmi'
+ icon_state = "bathrobe"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tourist
+ name = "tourist liesurewear"
+ desc = "This loud shirt is made of mid-grade cashmere. This premier liesurewear pairs well with a nice pair of khaki shorts that stop uncomfortably above the knee."
+ icon = 'icons/clothing/uniform/casual/tourist.dmi'
+ icon_state = "tourist"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/moderncoat
+ name = "modern wrapped coat"
+ desc = "The cutting edge of fashion."
+ icon = 'icons/clothing/uniform/casual/moderncoat.dmi'
+ icon_state = "moderncoat"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/fluff/v_nanovest
+ name = "Varmacorp nanovest"
+ desc = "A nifty little vest optimized for nanite contact."
+ icon = 'icons/clothing/uniform/casual/nanovest.dmi'
+ icon_state = "nanovest"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/casual/moth_casual.dm b/code/modules/clothing/under/casual/moth_casual.dm
new file mode 100644
index 00000000000..b044b7b0fdb
--- /dev/null
+++ b/code/modules/clothing/under/casual/moth_casual.dm
@@ -0,0 +1,286 @@
+/**
+ * Moth casual clothing. Consider getting a job fluffy.
+ */
+
+//* Puffy Pants *//
+
+/obj/item/clothing/under/moth
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/moth/puffy_pants
+ name = "puffy pants"
+ desc = "A pair of puffy pants. The holes are too small for human proportions."
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "gray_puffy_pants"
+ body_cover_flags = LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/red
+ name = "red puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "red_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/bright_blue
+ name = "bright blue puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "bright_blue_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/dull_blue
+ name = "dull blue puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "dull_blue_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/light_orange
+ name = "light orange puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "light_orange_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/dark_orange
+ name = "dark orange puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "dark_orange_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/purple
+ name = "purple puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "purple_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/green
+ name = "green puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "green_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/dark
+ name = "dark puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "dark_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/brown
+ name = "brown puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "brown_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/puffy_pants/white
+ name = "white puffy pants"
+ icon = 'icons/clothing/uniform/casual/moth/puffy_pants.dmi'
+ icon_state = "white_puffy_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//* Tight Pants *//
+
+/obj/item/clothing/under/moth/tight_pants
+ name = "pants"
+ desc = "A pair of pants. The holes are too small for human proportions."
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "gray_tight_pants"
+ body_cover_flags = LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/red
+ name = "red pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "red_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/bright_blue
+ name = "bright blue pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "bright_blue_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/dull_blue
+ name = "dull blue pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "dull_blue_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/light_orange
+ name = "light orange pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "light_orange_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/dark_orange
+ name = "dark orange pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "dark_orange_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/purple
+ name = "purple pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "purple_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/green
+ name = "green pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "green_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/dark
+ name = "dark pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "dark_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/brown
+ name = "brown pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "brown_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/tight_pants/white
+ name = "white pants"
+ icon = 'icons/clothing/uniform/casual/moth/tight_pants.dmi'
+ icon_state = "white_tight_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//* Skirts *//
+
+/obj/item/clothing/under/moth/moth_skirt
+ name = "skirt"
+ desc = "A long skirt. The holes are too small for human proportions."
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "gray_moth_skirt"
+ body_cover_flags = LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/red
+ name = "red skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "red_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/bright_blue
+ name = "bright blue skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "bright_blue_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/dull_blue
+ name = "dull blue skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "dull_blue_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/light_orange
+ name = "light orange skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "light_orange_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/dark_orange
+ name = "dark orange skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "dark_orange_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/purple
+ name = "purple skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "purple_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/green
+ name = "green skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "green_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/dark
+ name = "dark skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "dark_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/brown
+ name = "brown skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "brown_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/moth/moth_skirt/white
+ name = "white skirt"
+ icon = 'icons/clothing/uniform/casual/moth/skirt.dmi'
+ icon_state = "white_moth_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/casual/pants.dm b/code/modules/clothing/under/casual/pants.dm
new file mode 100644
index 00000000000..a07173daf45
--- /dev/null
+++ b/code/modules/clothing/under/casual/pants.dm
@@ -0,0 +1,485 @@
+/**
+ * Pants, Jeans, Long legged shorts
+ */
+
+/obj/item/clothing/under/pants/white
+ name = "white pants"
+ desc = "Plain white pants. Boring."
+ icon = 'icons/clothing/uniform/casual/jeans/whitepants.dmi'
+ icon_state = "whitepants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/red
+ name = "red pants"
+ desc = "Bright red pants. Overflowing with personality."
+ icon = 'icons/clothing/uniform/casual/jeans/redpants.dmi'
+ icon_state = "redpants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/black
+ name = "black pants"
+ desc = "These pants are dark, like your soul."
+ icon = 'icons/clothing/uniform/casual/jeans/blackpants.dmi'
+ icon_state = "blackpants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/tan
+ name = "tan pants"
+ desc = "Some tan pants. You look like a white collar worker with these on."
+ icon = 'icons/clothing/uniform/casual/jeans/tanpants.dmi'
+ icon_state = "tanpants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/khaki
+ name = "khaki pants"
+ desc = "A pair of dust beige khaki pants."
+ icon = 'icons/clothing/uniform/casual/jeans/khaki.dmi'
+ icon_state = "khaki"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/camo
+ name = "camo pants"
+ desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
+ icon = 'icons/clothing/uniform/casual/jeans/camopants.dmi'
+ icon_state = "camopants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/chaps
+ name = "sexy brown chaps"
+ desc = "A pair of sexy, tight brown leather chaps."
+ icon = 'icons/clothing/uniform/casual/jeans/chapsb.dmi'
+ icon_state = "chapsb"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/chaps/black
+ name = "sexy black chaps"
+ desc = "A pair of sexy, tight black leather chaps."
+ icon = 'icons/clothing/uniform/casual/jeans/chapsbl.dmi'
+ icon_state = "chapsbl"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/yogapants
+ name = "yoga pants"
+ desc = "A pair of tight-fitting yoga pants for those lazy days."
+ icon = 'icons/clothing/uniform/casual/jeans/yogapants.dmi'
+ icon_state = "yogapants"
+ addblends = "yogapants_a"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//* Jeans *//
+
+/obj/item/clothing/under/pants
+ name = "jeans"
+ desc = "A nondescript pair of tough blue jeans."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeans"
+ gender = PLURAL
+ body_cover_flags = LOWER_TORSO|LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/ripped
+ name = "ripped jeans"
+ desc = "A nondescript pair of tough blue jeans with holes in them."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansripped"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/classicjeans
+ name = "classic jeans"
+ desc = "You feel cooler already."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansclassic"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/classicjeans/ripped
+ name = "ripped classic jeans"
+ desc = "You feel cooler already. These have holes in them."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansclassicripped"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/mustangjeans
+ name = "must hang jeans"
+ desc = "Made in the finest space jeans factory this side of Alpha Centauri."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansmustang"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/mustangjeans/ripped
+ name = "ripped must hang jeans"
+ desc = "Made in the finest space jeans factory this side of Alpha Centauri. These have holes in them."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansmustangripped"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/blackjeans
+ name = "black jeans"
+ desc = "Only for those who can pull it off."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansblack"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/blackjeans/ripped
+ name = "ripped black jeans"
+ desc = "Only for those who can pull it off. These have holes in them."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansblackripped"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/greyjeans
+ name = "grey jeans"
+ desc = "Only for those who can pull it off."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansgrey"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/greyjeans/ripped
+ name = "ripped grey jeans"
+ desc = "Only for those who can pull it off. These have holes in them."
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansgreyripped"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/youngfolksjeans
+ name = "young folks jeans"
+ desc = "For those tired of boring old jeans. Relive the passion of your youth!"
+ icon = 'icons/clothing/uniform/casual/jeans/jeans.dmi'
+ icon_state = "jeansyoungfolks"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//* Track Pants *//
+
+/obj/item/clothing/under/pants/track
+ name = "track pants"
+ desc = "A pair of track pants, for the athletic."
+ icon = 'icons/clothing/uniform/casual/jeans/trackpants.dmi'
+ icon_state = "trackpants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/track/blue
+ name = "blue track pants"
+ icon = 'icons/clothing/uniform/casual/jeans/trackpants.dmi'
+ icon_state = "trackpantsblue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/track/green
+ name = "green track pants"
+ icon = 'icons/clothing/uniform/casual/jeans/trackpants.dmi'
+ icon_state = "trackpantsgreen"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/track/white
+ name = "white track pants"
+ icon = 'icons/clothing/uniform/casual/jeans/trackpants.dmi'
+ icon_state = "trackpantswhite"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/track/red
+ name = "red track pants"
+ icon = 'icons/clothing/uniform/casual/jeans/trackpants.dmi'
+ icon_state = "trackpantsred"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//* Baggy Jeans *//
+
+/obj/item/clothing/under/pants/baggy
+ name = "baggy jeans"
+ desc = "A nondescript pair of tough baggy blue jeans."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_jeans.dmi'
+ icon_state = "baggy_jeans"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/classicjeans
+ name = "baggy classic jeans"
+ desc = "You feel cooler already."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_jeans.dmi'
+ icon_state = "baggy_jeansclassic"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/mustangjeans
+ name = "maggy must hang jeans"
+ desc = "Made in the finest space jeans factory this side of Alpha Centauri."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_jeans.dmi'
+ icon_state = "baggy_jeansmustang"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/blackjeans
+ name = "baggy black jeans"
+ desc = "Only for those who can pull it off."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_jeans.dmi'
+ icon_state = "baggy_jeansblack"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/greyjeans
+ name = "baggy grey jeans"
+ desc = "Only for those who can pull it off."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_jeans.dmi'
+ icon_state = "baggy_jeansgrey"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/youngfolksjeans
+ name = "baggy young folks jeans"
+ desc = "For those tired of boring old jeans. Relive the passion of your youth!"
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_jeans.dmi'
+ icon_state = "baggy_jeansyoungfolks"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//* Baggy Pants *//
+
+/obj/item/clothing/under/pants/baggy/white
+ name = "baggy white pants"
+ desc = "Plain white pants. Boring."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_pants.dmi'
+ icon_state = "baggy_whitepants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/red
+ name = "baggy red pants"
+ desc = "Bright red pants. Overflowing with personality."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_pants.dmi'
+ icon_state = "baggy_redpants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/black
+ name = "baggy black pants"
+ desc = "These pants are dark, like your soul."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_pants.dmi'
+ icon_state = "baggy_blackpants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/tan
+ name = "baggy tan pants"
+ desc = "Some tan pants. You look like a white collar worker with these on."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_pants.dmi'
+ icon_state = "baggy_tanpants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/track
+ name = "baggy track pants"
+ desc = "A pair of track pants, for the athletic."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_pants.dmi'
+ icon_state = "baggy_trackpants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/khaki
+ name = "baggy khaki pants"
+ desc = "A pair of dust beige khaki pants."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_pants.dmi'
+ icon_state = "baggy_khaki"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/baggy/camo
+ name = "baggy camo pants"
+ desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
+ icon = 'icons/clothing/uniform/casual/jeans/baggy_pants.dmi'
+ icon_state = "baggy_camopants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//* Utility Pants *//
+
+/obj/item/clothing/under/pants/utility
+ name = "green utility pants"
+ desc = "A pair of pleather reinforced green work pants."
+ icon = 'icons/clothing/uniform/casual/jeans/workpants.dmi'
+ icon_state = "workpants_green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/utility/orange
+ name = "orange utility pants"
+ desc = "A pair of pleather reinforced orange work pants."
+ icon = 'icons/clothing/uniform/casual/jeans/workpants.dmi'
+ icon_state = "workpants_orange"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/utility/blue
+ name = "blue utility pants"
+ desc = "A pair of pleather reinforced blue work pants."
+ icon = 'icons/clothing/uniform/casual/jeans/workpants.dmi'
+ icon_state = "workpants_blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/utility/white
+ name = "white utility pants"
+ desc = "A pair of pleather reinforced white work pants."
+ icon = 'icons/clothing/uniform/casual/jeans/workpants.dmi'
+ icon_state = "workpants_white"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pants/utility/red
+ name = "red utility pants"
+ desc = "A pair of pleather reinforced red work pants."
+ icon = 'icons/clothing/uniform/casual/jeans/workpants.dmi'
+ icon_state = "workpants_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/casual/shorts.dm b/code/modules/clothing/under/casual/shorts.dm
new file mode 100644
index 00000000000..77e361674ef
--- /dev/null
+++ b/code/modules/clothing/under/casual/shorts.dm
@@ -0,0 +1,492 @@
+/**
+ * Shorts, Short legged pants, skirts etc
+ */
+
+/obj/item/clothing/under/shorts
+ name = "athletic shorts"
+ desc = "95% Polyester, 5% Spandex!"
+ gender = PLURAL
+ body_cover_flags = LOWER_TORSO
+
+/obj/item/clothing/under/shorts/red
+ name = "red athletic shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/redshorts.dmi'
+ icon_state = "redshorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/green
+ name = "green athletic shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/greenshorts.dmi'
+ icon_state = "greenshorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/blue
+ name = "blue athletic shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/blueshorts.dmi'
+ icon_state = "blueshorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/black
+ name = "black athletic shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/blackshorts.dmi'
+ icon_state = "blackshorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/grey
+ name = "grey athletic shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/greyshorts.dmi'
+ icon_state = "greyshorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/white
+ name = "white shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/whiteshorts.dmi'
+ icon_state = "whiteshorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/white/female
+ name = "white short shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/whiteshorts_f.dmi'
+ icon_state = "whiteshorts_f"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/khaki
+ name = "khaki shorts"
+ desc = "For that island getaway. It's five o'clock somewhere, right?"
+ icon = 'icons/clothing/uniform/casual/shorts/tanpants_shorts.dmi'
+ icon_state = "tanpants_shorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/khaki/female
+ name = "khaki short shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/khaki_shorts_f.dmi'
+ icon_state = "khaki_shorts_f"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/fluff/gnshorts
+ name = "GN shorts"
+ desc = "Stylish white shorts with pockets, stripes, and even a belt."
+ icon = 'icons/clothing/uniform/casual/shorts/gnshorts.dmi'
+ icon_state = "gnshorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//Argh, skirts be below this line -> ------------------------------
+
+/obj/item/clothing/under/skirt
+ name = "short black skirt"
+ desc = "A skirt that is a shiny black."
+ icon = 'icons/clothing/uniform/casual/shorts/skirt_short_black.dmi'
+ icon_state = "skirt_short_black"
+ body_cover_flags = LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skirt/khaki
+ name = "khaki skirt"
+ desc = "A skirt that is a khaki color."
+ icon = 'icons/clothing/uniform/casual/shorts/skirt_khaki.dmi'
+ icon_state = "skirt_khaki"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/skirt/blue
+ name = "short blue skirt"
+ desc = "A skirt that is a shiny blue."
+ icon = 'icons/clothing/uniform/casual/shorts/skirt_short_blue.dmi'
+ icon_state = "skirt_short_blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skirt/red
+ name = "short red skirt"
+ desc = "A skirt that is a shiny red."
+ icon = 'icons/clothing/uniform/casual/shorts/skirt_short_red.dmi'
+ icon_state = "skirt_short_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skirt/denim
+ name = "short denim skirt"
+ desc = "A skirt that is made of denim."
+ icon = 'icons/clothing/uniform/casual/shorts/skirt_short_denim.dmi'
+ icon_state = "skirt_short_denim"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skirt/swept
+ name = "swept skirt"
+ desc = "A skirt that is swept to one side."
+ icon = 'icons/clothing/uniform/casual/shorts/skirt_swept.dmi'
+ icon_state = "skirt_swept"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skirt/pleated
+ name = "pleated skirt"
+ desc = "A simple pleated skirt. It's like high school all over again."
+ icon = 'icons/clothing/uniform/casual/shorts/pleated.dmi'
+ icon_state = "pleated"
+ addblends = "pleated_a"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skirt/outfit
+ name = "black skirt"
+ desc = "A black skirt, very fancy!"
+ icon = 'icons/clothing/uniform/casual/shorts/blackskirt.dmi'
+ icon_state = "blackskirt"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skirt/outfit/plaid_blue
+ name = "blue plaid skirt"
+ desc = "A preppy blue skirt with a white blouse."
+ icon = 'icons/clothing/uniform/casual/shorts/plaid_blue.dmi'
+ icon_state = "plaid_blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/skirt/outfit/plaid_red
+ name = "red plaid skirt"
+ desc = "A preppy red skirt with a white blouse."
+ icon = 'icons/clothing/uniform/casual/shorts/plaid_red.dmi'
+ icon_state = "plaid_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/skirt/outfit/plaid_purple
+ name = "purple plaid skirt"
+ desc = "A preppy purple skirt with a white blouse."
+ icon = 'icons/clothing/uniform/casual/shorts/plaid_purple.dmi'
+ icon_state = "plaid_purple"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/skirt/outfit/plaid_green
+ name = "green plaid skirt"
+ desc = "A preppy purple skirt with a white blouse."
+ icon = 'icons/clothing/uniform/casual/shorts/plaid_green.dmi'
+ icon_state = "plaid_green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/blackshortsripped
+ name = "ripped black shorts"
+ desc = "A pair of torn up black shorts, for those who know better."
+ icon = 'icons/clothing/uniform/casual/shorts/black_shorts_ripped.dmi'
+ icon_state = "black_shorts_ripped"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/fashionminiskirt
+ name = "fashionable miniskirt"
+ desc = "An impractically short miniskirt allegedly making waves through the local fashion scene."
+ icon = 'icons/clothing/uniform/casual/shorts/miniskirt_fashion.dmi'
+ icon_state = "miniskirt_fashion"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/blueskirt
+ name = "blue skirt"
+ desc = "A comfy blue sweater paired with a stylish charcoal skirt!"
+ icon = 'icons/clothing/uniform/casual/shorts/blueskirt.dmi'
+ icon_state = "blueskirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/redskirt
+ name = "red skirt"
+ desc = "A comfy red sweater paired with a stylish charcoal skirt!"
+ icon = 'icons/clothing/uniform/casual/shorts/redskirt.dmi'
+ icon_state = "redskirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/blueshortskirt
+ name = "Short Skirt"
+ desc = "A light blue sweater with a black skirt."
+ icon = 'icons/clothing/uniform/casual/shorts/blueshortskirt_female.dmi'
+ icon_state = "blueshortskirt_female"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/greyskirt_female
+ name = "Grey Skirt"
+ desc = "A medium length, grey skirt with a long-sleeve, black sweater on top."
+ icon = 'icons/clothing/uniform/casual/shorts/greyskirt_female.dmi'
+ icon_state = "greyskirt_female"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/croptop
+ name = "crop top"
+ desc = "A shirt that has had the top cropped. This one is NT sponsored."
+ icon = 'icons/clothing/uniform/casual/shorts/croptop.dmi'
+ icon_state = "croptop"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/croptop/red
+ name = "red crop top"
+ desc = "A red shirt that has had the top cropped."
+ icon = 'icons/clothing/uniform/casual/shorts/croptop_red.dmi'
+ icon_state = "croptop_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/croptop/grey
+ name = "grey crop top"
+ desc = "A grey shirt that has had the top cropped."
+ icon = 'icons/clothing/uniform/casual/shorts/croptop_grey.dmi'
+ icon_state = "croptop_grey"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/cuttop
+ name = "grey cut top"
+ desc = "A grey shirt that has had the top cut low."
+ icon = 'icons/clothing/uniform/casual/shorts/cuttop.dmi'
+ icon_state = "cuttop"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/cuttop/red
+ name = "red cut top"
+ desc = "A red shirt that has had the top cut low."
+ icon = 'icons/clothing/uniform/casual/shorts/cuttop_red.dmi'
+ icon_state = "cuttop_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+//* Jean Shorts *//
+
+/obj/item/clothing/under/shorts/jeans
+ name = "jeans shorts"
+ desc = "Some jeans! Just in short form!"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "jeans_shorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/female
+ name = "jeans short shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "jeans_shorts_f"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/classic
+ name = "classic jeans shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "jeansclassic_shorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/classic/female
+ name = "classic jeans short shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "jeansclassic_shorts_f"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/mustang
+ name = "mustang jeans shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "jeansmustang_shorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/mustang/female
+ name = "mustang jeans short shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "jeansmustang_shorts_f"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/youngfolks
+ name = "young folks jeans shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "jeansyoungfolks_shorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/youngfolks/female
+ name = "young folks jeans short shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "jeansyoungfolks_shorts_f"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/black
+ name = "black jeans shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "blackpants_shorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/black/female
+ name = "black jeans short shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "black_shorts_f"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/grey
+ name = "grey jeans shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "greypants_shorts"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shorts/jeans/grey/female
+ name = "grey jeans short shorts"
+ icon = 'icons/clothing/uniform/casual/shorts/jean_shorts.dmi'
+ icon_state = "grey_shorts_f"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/casual/sleepwear.dm b/code/modules/clothing/under/casual/sleepwear.dm
new file mode 100644
index 00000000000..7e05c6252b8
--- /dev/null
+++ b/code/modules/clothing/under/casual/sleepwear.dm
@@ -0,0 +1,39 @@
+/**
+ * Pajamas, sleepwear, etc
+ */
+
+/obj/item/clothing/under/pj/red
+ name = "red pajamas"
+ desc = "Slightly old-fashioned sleepwear."
+ icon = 'icons/clothing/uniform/casual/sleepwear/red_pajamas.dmi'
+ icon_state = "red_pajamas"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/pj/red_fem
+ name = "red pajamas"
+ desc = "Slightly old-fashioned sleepwear."
+ icon = 'icons/clothing/uniform/casual/sleepwear/red_pajamas_fem.dmi'
+ icon_state = "red_pajamas_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/pj/blue
+ name = "blue pajamas"
+ desc = "Slightly old-fashioned sleepwear."
+ icon = 'icons/clothing/uniform/casual/sleepwear/blue_pajamas.dmi'
+ icon_state = "blue_pajamas"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/pj/blue_fem
+ name = "blue pajamas"
+ desc = "Slightly old-fashioned sleepwear."
+ icon = 'icons/clothing/uniform/casual/sleepwear/blue_pajamas_fem.dmi'
+ icon_state = "blue_pajamas_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/casual/swimwear.dm b/code/modules/clothing/under/casual/swimwear.dm
new file mode 100644
index 00000000000..6834249f520
--- /dev/null
+++ b/code/modules/clothing/under/casual/swimwear.dm
@@ -0,0 +1,208 @@
+/**
+ * Swimwear, bikinis, swimsuits, waterwear
+ */
+
+/obj/item/clothing/under/swimsuit
+ name = "primitive swimsuit"
+ desc = "In all reality, this is just a simple loincloth."
+ icon = 'icons/clothing/uniform/casual/loincloth.dmi'
+ icon_state = "loincloth"
+ siemens_coefficient = 1
+ body_cover_flags = 0
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/swimsuit/black
+ name = "black swimsuit"
+ desc = "An oldfashioned black swimsuit."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_black"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+
+/obj/item/clothing/under/swimsuit/blue
+ name = "blue swimsuit"
+ desc = "An oldfashioned blue swimsuit."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/purple
+ name = "purple swimsuit"
+ desc = "An oldfashioned purple swimsuit."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_purp"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/green
+ name = "green swimsuit"
+ desc = "An oldfashioned green swimsuit."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/red
+ name = "red swimsuit"
+ desc = "An oldfashioned red swimsuit."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/striped
+ name = "striped swimsuit"
+ desc = "A more revealing striped swimsuit."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_striped"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/white
+ name = "white swimsuit"
+ desc = "A classic one piece."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_white"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = null
+ inhand_state = null
+
+/obj/item/clothing/under/swimsuit/earth
+ name = "earthen swimsuit"
+ desc = "A design more popular on Earth these days."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_earth"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/stripper/cowbikini
+ name = "cow print bikini"
+ desc = "A rather skimpy cow patterned swimsuit."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_cow"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/highclass
+ name = "high class swimsuit"
+ desc = "An elegant swimsuit with a white bikini top and black bikini bottom. Thin black silk drapes down the back and goes to the upper thighs, and authentic gold rings hold the top together at the bust and back."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_highclass"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/latex
+ name = "latex swimsuit"
+ desc = "A tight latex one piece. It clings tightly to the flesh, leaving very little to the imagination."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_latex"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/streamlined
+ name = "streamlined swimsuit"
+ desc = "An all white one-piece that maintains modesty without sacrificing class."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit.dmi'
+ icon_state = "swim_stream"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/risque
+ name = "risque swimsuit"
+ desc = "This fits a bit too snug in all the right places. Comes with a collar, for inscrutable reasons."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit_skimpy.dmi'
+ icon_state = "swim_risque"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/stripper/stripper_pink
+ name = "pink swimsuit"
+ desc = "A rather skimpy pink swimsuit."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit_skimpy.dmi'
+ icon_state = "stripper_p"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/stripper/stripper_green
+ name = "green swimsuit"
+ desc = "A rather skimpy green swimsuit."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit_skimpy.dmi'
+ icon_state = "stripper_g"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/stripper/mankini
+ name = "mankini"
+ desc = "No honest man would wear this abomination."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit_skimpy.dmi'
+ icon_state = "mankini"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/stripper/captain
+ name = "sexy captain swimsuit"
+ desc = "A revealing stripper's costume patterned after the Captain's uniform."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit_dept.dmi'
+ icon_state = "lewdcap"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/fluff/engineering
+ name = "Engineering Swimsuit"
+ desc = "It's an orange high visibility swimsuit worn by engineers. It lacks radiation, or any, shielding."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit_dept.dmi'
+ icon_state = "swimsuit_engineering"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/fluff/science
+ name = "Science Swimsuit"
+ desc = "It's made of a special fiber that provides no protection whatsoever, but its hydrophobic. It has markings that denote the wearer as a scientist."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit_dept.dmi'
+ icon_state = "swimsuit_science"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/fluff/security
+ name = "Security Swimsuit"
+ desc = "It's made of a slightly sturdier material than standard swimsuits, to allow for a more robust appearance."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit_dept.dmi'
+ icon_state = "swimsuit_security"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/swimsuit/fluff/medical
+ name = "Medical Swimsuit"
+ desc = "It's made of a special fiber that provides no protection whatsoever, but its elastic. It has a cross on the back denoting that the wearer is trained medical personnel."
+ icon = 'icons/clothing/uniform/casual/swimwear/swimsuit_dept.dmi'
+ icon_state = "swimsuit_medical"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/casual/teshari_casual.dm b/code/modules/clothing/under/casual/teshari_casual.dm
new file mode 100644
index 00000000000..129941ac9f5
--- /dev/null
+++ b/code/modules/clothing/under/casual/teshari_casual.dm
@@ -0,0 +1,233 @@
+/**
+ * Teshari casual clothing
+ */
+
+//Smocks casual
+/obj/item/clothing/under/teshari/smock
+ name = "small grey smock"
+ desc = "It looks fitted to nonhuman proportions."
+ body_cover_flags = 0 // It's a thin piece of cloth with a neck hole.
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_smock.dmi'
+ icon_state = "tesh_smock_grey"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/red
+ name = "small red smock"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_smock.dmi'
+ icon_state = "tesh_smock_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/smock/yellow
+ name = "small yellow smock"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_smock.dmi'
+ icon_state = "tesh_smock_yellow"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/smock/white
+ name = "small white smock"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_smock.dmi'
+ icon_state = "tesh_smock_white"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//* Undercoats *//
+
+/obj/item/clothing/under/teshari/undercoat
+ name = "Undercoat"
+ desc = "A Teshari traditional garb, with a modern twist! Made of micro and nanofibres to make it light and billowy, perfect for going fast and stylishly!"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_orange
+ name = "black and orange undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_bo"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_grey
+ name = "black and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_bg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_white
+ name = "black and white undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_bw"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_red
+ name = "black and red undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_br"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black
+ name = "black undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_bn"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_yellow
+ name = "black and yellow undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_by"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_green
+ name = "black and green undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_bgr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_blue
+ name = "black and blue undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_bbl"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_purple
+ name = "black and purple undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_bp"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_pink
+ name = "black and pink undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_bpi"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/black_brown
+ name = "black and brown undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_bbr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/orange_grey
+ name = "orange and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_og"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/rainbow
+ name = "rainbow undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_rainbow"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/lightgrey_grey
+ name = "light grey and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_lgg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/white_grey
+ name = "white and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_wg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/red_grey
+ name = "red and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_rg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/orange
+ name = "orange undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_on"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/yellow_grey
+ name = "yellow and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_yg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/green_grey
+ name = "green and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_gg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/blue_grey
+ name = "blue and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_blug"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/purple_grey
+ name = "purple and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_pg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/pink_grey
+ name = "pink and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_pig"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/teshari/undercoat/standard/brown_grey
+ name = "brown and grey undercoat"
+ icon = 'icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi'
+ icon_state = "tesh_uniform_brg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/casual/tribal.dm b/code/modules/clothing/under/casual/tribal.dm
new file mode 100644
index 00000000000..36601ba13dc
--- /dev/null
+++ b/code/modules/clothing/under/casual/tribal.dm
@@ -0,0 +1,169 @@
+/**
+ * Tribalwear
+ * An odd one to categorize. These aren't meant to be costumes but they aren't really workwear either considering they're just pieces of cloth.
+ * tl;dr casual tribal fridays
+ */
+
+/obj/item/clothing/under/druidic_gown
+ name = "flowery tunic"
+ desc = "A simple linen tunic with a half-skirt of flowers covering one side."
+ icon = 'icons/clothing/uniform/casual/tribal/druidic_gown.dmi'
+ icon_state = "druidic_gown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/druidic_gown_fem
+ name = "flowery tunic"
+ desc = "A simple linen tunic with a half-skirt of flowers covering one side."
+ icon = 'icons/clothing/uniform/casual/tribal/druidic_gown_fem.dmi'
+ icon_state = "druidic_gown_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tribal_tunic
+ name = "simple tunic"
+ desc = "A simple linen tunic. Smells faintly of earth and flowers"
+ icon = 'icons/clothing/uniform/casual/tribal/tribal_tunic.dmi'
+ icon_state = "tribal_tunic"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tribal_tunic/ashlander
+ name = "coarse tunic"
+ desc = "A simple, coarse tunic. Smells faintly of ash and charred wood."
+ has_sensors = UNIFORM_HAS_NO_SENSORS
+
+/obj/item/clothing/under/tribal_tunic_fem
+ name = "simple tunic"
+ desc = "A simple linen tunic. Smells faintly of earth and flowers."
+ icon = 'icons/clothing/uniform/casual/tribal/tribal_tunic_fem.dmi'
+ icon_state = "tribal_tunic_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tribal_tunic_fem/ashlander
+ name = "coarse tunic"
+ desc = "A simple, coarse tunic. Smells faintly of ash and charred wood."
+ has_sensors = UNIFORM_HAS_NO_SENSORS
+
+/obj/item/clothing/under/acolyte_hunter
+ name = "acolyte's garbs"
+ desc = "Hand-woven cotton ornated with pieces of turquoise form little more than loincloth, which can be adjusted depending on the wearer's preferences. Well suited for a simpler life."
+ icon = 'icons/clothing/uniform/casual/tribal/acolyte_hunter.dmi'
+ icon_state = "acolyte_hunter"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/acolyte_hunter_fem
+ name = "acolyte's garbs"
+ desc = "Hand-woven cotton ornated with pieces of turquoise form little more than loincloth, which can be adjusted depending on the wearer's preferences. Well suited for a simpler life."
+ icon = 'icons/clothing/uniform/casual/tribal/acolyte_hunter_fem.dmi'
+ icon_state = "acolyte_hunter_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shamanblue
+ name = "blue shaman garbs"
+ desc = "Finely crafted cotton clothing, dyed blue with anil. The care and craftsmanship put into such an outfit indicates high status in a tribe. Can be adjusted to suit the wearer's preferences."
+ icon = 'icons/clothing/uniform/casual/tribal/shamanblue.dmi'
+ icon_state = "shamanblue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shamanblue_fem
+ name = "blue shaman garbs"
+ desc = "Finely crafted cotton clothing, dyed blue with anil. The care and craftsmanship put into such an outfit indicates high status in a tribe. Can be adjusted to suit the wearer's preferences."
+ icon = 'icons/clothing/uniform/casual/tribal/shamanblue_fem.dmi'
+ icon_state = "shamanblue_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shamanred
+ name = "red shaman garbs"
+ desc = "Finely crafted cotton clothing, dyed red with madder root. The care and craftsmanship put into such an outfit indicates high status in a tribe. Can be adjusted to suit the wearer's preferences."
+ icon = 'icons/clothing/uniform/casual/tribal/shamanred.dmi'
+ icon_state = "shamanred"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shamanred_fem
+ name = "red shaman garbs"
+ desc = "Finely crafted cotton clothing, dyed red with madder root. The care and craftsmanship put into such an outfit indicates high status in a tribe. Can be adjusted to suit the wearer's preferences."
+ icon = 'icons/clothing/uniform/casual/tribal/shamanred_fem.dmi'
+ icon_state = "shamanred_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/hunter
+ name = "rugged loincloth"
+ desc = "Minimal yet hardy clothing padded in places by leather which can be taken off if need be, covering no more than it needs to. Ideal for those who spend their time away from the tribe in pursuit of the hunt."
+ icon = 'icons/clothing/uniform/casual/tribal/hunter.dmi'
+ icon_state = "hunter"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/hunter_fem
+ name = "rugged loincloth"
+ desc = "Minimal yet hardy clothing padded in places by leather which can be taken off if need be, covering no more than it needs to. Ideal for those who spend their time away from the tribe in pursuit of the hunt."
+ icon = 'icons/clothing/uniform/casual/tribal/hunter_fem.dmi'
+ icon_state = "hunter_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/gatherer
+ name = "loincloth"
+ desc = "Hand-woven cotton ornated with pieces of turquoise form covering the groin, which can also be adjusted to cover the breasts as well. Well suited for a simpler life."
+ icon = 'icons/clothing/uniform/casual/tribal/gatherer.dmi'
+ icon_state = "gatherer"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/gatherer_fem
+ name = "loincloth"
+ desc = "Hand-woven cotton ornated with pieces of turquoise form covering the groin, which can also be adjusted to cover the breasts as well. Well suited for a simpler life."
+ icon = 'icons/clothing/uniform/casual/tribal/gatherer_fem.dmi'
+ icon_state = "gatherer_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/casual/turtlenecks.dm b/code/modules/clothing/under/casual/turtlenecks.dm
new file mode 100644
index 00000000000..8e52776fb03
--- /dev/null
+++ b/code/modules/clothing/under/casual/turtlenecks.dm
@@ -0,0 +1,162 @@
+/**
+ * Turtlenecks
+ * Notably not made of turtles
+ */
+
+//* Baggy Turtlenecks *//
+
+/obj/item/clothing/under/turtlebaggy
+ name = "baggy turtleneck (cream)"
+ desc = "A cozy knit turtleneck. It's too baggy and comfortable to be tactical."
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtle"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/cream_fem
+ name = "baggy turtleneck (cream)(female)"
+ desc = "A cozy knit turtleneck. It's too baggy and comfortable to be tactical."
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtle_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/purple
+ name = "baggy turtleneck (purple)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtlepur"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/purple_fem
+ name = "baggy turtleneck (purple)(female)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtlepur_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/red
+ name = "baggy turtleneck (red)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtlered"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/red_fem
+ name = "baggy turtleneck (red)(female)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtlered_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/blue
+ name = "baggy turtleneck (blue)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtleblu"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/blue_fem
+ name = "baggy turtleneck (blue)(female)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtleblu_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/green
+ name = "baggy turtleneck (green)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtlegrn"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/green_fem
+ name = "baggy turtleneck (green)(female)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtlegrn_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/black
+ name = "baggy turtleneck (black)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtleblk"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/turtlebaggy/black_fem
+ name = "baggy turtleneck (black)(female)"
+ icon = 'icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi'
+ icon_state = "bb_turtleblk_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//* Turtlenecks *//
+
+/obj/item/clothing/under/rank/psych/turtleneck/sweater
+ desc = "A warm looking sweater and a pair of dark blue slacks."
+ name = "sweater"
+ icon = 'icons/clothing/uniform/casual/turtleneck/turtleneck.dmi'
+ icon_state = "turtleneck"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/psych/turtleneck/sweater
+ desc = "A warm looking sweater and a pair of dark blue slacks."
+ name = "sweater"
+ icon = 'icons/clothing/uniform/casual/turtleneck/turtleneck.dmi'
+ icon_state = "turtleneck_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/laconic
+ name = "laconic field suit"
+ desc = "A lightweight black turtleneck with padded gray slacks. It seems comfortable, but practical."
+ icon = 'icons/clothing/uniform/casual/turtleneck/turtleneck.dmi'
+ icon_state = "laconic"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/casual/vox.dm b/code/modules/clothing/under/casual/vox.dm
new file mode 100644
index 00000000000..f3438a2d01a
--- /dev/null
+++ b/code/modules/clothing/under/casual/vox.dm
@@ -0,0 +1,44 @@
+/**
+ * Vox ONLY clothing
+ * I think this should not exist. We should consider putting these under the regular clothing files and not a /vox path if the new render icon system supports non-human exclusivity.
+ */
+
+/obj/item/clothing/under/vox
+ has_sensors = UNIFORM_HAS_NO_SENSORS
+ species_restricted = list(SPECIES_VOX)
+ starting_accessories = list(/obj/item/clothing/accessory/storage/vox) // Dont' start with a backback, so free webbing
+ atom_flags = PHORONGUARD
+
+/obj/item/clothing/under/vox/vox_casual
+ name = "alien clothing"
+ desc = "This doesn't look very comfortable."
+ icon = 'icons/clothing/uniform/casual/vox/vox-casual-1.dmi'
+ icon_state = "vox-casual-1"
+ body_cover_flags = LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/vox/vox_robes
+ name = "alien robes"
+ desc = "Weird and flowing!"
+ icon = 'icons/clothing/uniform/casual/vox/vox-casual-2.dmi'
+ icon_state = "vox-casual-2"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/vox/simonpants
+ name = "simon pants"
+ desc = "Based off the clothing of a hero so famous, even the Vox had to emulate his style."
+ icon = 'icons/clothing/uniform/casual/vox/simonpants.dmi'
+ icon_state = "simonpants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/casual/women.dm b/code/modules/clothing/under/casual/women.dm
new file mode 100644
index 00000000000..3053d5fa251
--- /dev/null
+++ b/code/modules/clothing/under/casual/women.dm
@@ -0,0 +1,47 @@
+/**
+ * Grabbag of womens wear.
+ */
+
+/obj/item/clothing/under/dress/black_corset
+ name = "black corset and skirt"
+ desc = "A black corset and skirt for those fancy nights out."
+ icon = 'icons/clothing/uniform/casual/women/black_corset.dmi'
+ icon_state = "black_corset"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/haltertop
+ name = "halter top"
+ desc = "A black halter top with denim jean shorts."
+ icon = 'icons/clothing/uniform/casual/women/haltertop.dmi'
+ icon_state = "haltertop"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/hasie
+ name = "Hasie skirt"
+ desc = "A daring combination of dark charcoals and vibrant reds and whites, the Hasie skirt/vest combo knows what it's doing. Sporting a low cut charcoal miniskirt and matching midriff button-up, this ensemble wows with the incredible color contrast of its two-tone vest."
+ icon = 'icons/clothing/uniform/casual/women/hasie.dmi'
+ icon_state = "hasie"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/half_moon
+ name = "Half Moon outfit"
+ desc = "This eminently fashionable outfit evokes memories of Luna. It consists of a tailored latex leotard and daringly cut white shorts. Paired with plunging off-color stockings, it's to die for."
+ icon = 'icons/clothing/uniform/casual/women/half_moon.dmi'
+ icon_state = "half_moon"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
deleted file mode 100644
index 315fb7439e8..00000000000
--- a/code/modules/clothing/under/color.dm
+++ /dev/null
@@ -1,201 +0,0 @@
-/obj/item/clothing/under/color/black
- name = "black jumpsuit"
- icon_state = "black"
-
-/obj/item/clothing/under/color/blackf
- name = "feminine black jumpsuit"
- desc = "It's very smart and in a ladies size!"
- icon_state = "black"
- snowflake_worn_state = "blackf"
-
-/obj/item/clothing/under/color/blackjumpskirt
- name = "black jumpskirt"
- desc = "A slimming black jumpskirt."
- icon_state = "blackjumpskirt"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
-
-/obj/item/clothing/under/color/blue
- name = "blue jumpsuit"
- icon_state = "blue"
-
-/obj/item/clothing/under/color/green
- name = "green jumpsuit"
- icon_state = "green"
-
-/obj/item/clothing/under/color/grey
- name = "grey jumpsuit"
- icon_state = "grey"
-
-//TFF 5/8/19 - add a non perma-set orange jumpsuit, splits prison into its own obj with override var settings.
-//TFF 5/9/19 - add a different icon_state to both jumpsuits, orange and prison. Refactors orange and prison jumpsuit slightly.
-/obj/item/clothing/under/color/orange
- name = "orange jumpsuit"
- icon_state = "orange"
-
-/obj/item/clothing/under/color/prison
- name = "prison jumpsuit"
- desc = "It's standardized prisoner-wear. Its suit sensors are permanently set to the \"Tracking\" position."
- icon_state = "orange"
- has_sensors = UNIFORM_HAS_LOCKED_SENSORS
- sensor_mode = 3
-
-/obj/item/clothing/under/color/prison/skirt
- name = "prison pleated skirt"
- icon_state = "prisoner_skirt"
- icon_state = "orange"
-
-/obj/item/clothing/under/color/pink
- name = "pink jumpsuit"
- icon_state = "pink"
-
-/obj/item/clothing/under/color/red
- name = "red jumpsuit"
- icon_state = "red"
-
-/obj/item/clothing/under/color/white
- name = "white jumpsuit"
- icon_state = "white"
-
-/obj/item/clothing/under/color/yellow
- name = "yellow jumpsuit"
- icon_state = "yellow"
-
-/obj/item/clothing/under/psyche
- name = "psychedelic jumpsuit"
- desc = "Groovy!"
- icon_state = "psyche"
-
-/obj/item/clothing/under/color/lightblue
- name = "lightblue jumpsuit"
- desc = "A light blue jumpsuit."
- icon_state = "lightblue"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
-
-/obj/item/clothing/under/color/aqua
- name = "aqua jumpsuit"
- desc = "An aqua jumpsuit."
- icon_state = "aqua"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
-
-/obj/item/clothing/under/color
- name = "purple jumpsuit"
- desc = "The latest in space fashion."
- icon_state = "purple"
-
-/obj/item/clothing/under/color/lightpurple
- name = "lightpurple jumpsuit"
- desc = "A light purple jumpsuit."
- icon_state = "lightpurple"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "purple", SLOT_ID_LEFT_HAND = "purple")
-
-/obj/item/clothing/under/color/lightgreen
- name = "lightgreen jumpsuit"
- desc = "A light green jumpsuit."
- icon_state = "lightgreen"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "green", SLOT_ID_LEFT_HAND = "green")
-
-/obj/item/clothing/under/color/lightbrown
- name = "lightbrown jumpsuit"
- desc = "A light brown jumpsuit."
- icon_state = "lightbrown"
-
-/obj/item/clothing/under/color/brown
- name = "brown jumpsuit"
- desc = "A brown jumpsuit."
- icon_state = "brown"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lightbrown", SLOT_ID_LEFT_HAND = "lightbrown")
-
-/obj/item/clothing/under/color/yellowgreen
- name = "yellowgreen jumpsuit"
- desc = "A... yellow green jumpsuit?"
- icon_state = "yellowgreen"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "yellow", SLOT_ID_LEFT_HAND = "yellow")
-
-/obj/item/clothing/under/color/darkblue
- name = "darkblue jumpsuit"
- desc = "A dark blue jumpsuit."
- icon_state = "darkblue"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
-
-/obj/item/clothing/under/color/lightred
- name = "lightred jumpsuit"
- desc = "A light red jumpsuit."
- icon_state = "lightred"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
-
-/obj/item/clothing/under/color/darkred
- name = "darkred jumpsuit"
- desc = "A dark red jumpsuit."
- icon_state = "darkred"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
-
-//Colored Skirts
-/obj/item/clothing/under/color/black_skirt
- name = "black pleated skirt"
- desc = "A pleated skirt, available in a variety of colors."
- icon_state = "black_skirt"
-
-/obj/item/clothing/under/color/grey_skirt
- name = "grey pleated skirt"
- icon_state = "grey_skirt"
-
-/obj/item/clothing/under/color/white_skirt
- name = "white pleated skirt"
- icon_state = "white_skirt"
-
-/obj/item/clothing/under/color/lbrown_skirt
- name = "light brown pleated skirt"
- icon_state = "lightbrown_skirt"
-
-/obj/item/clothing/under/color/brown_skirt
- name = "brown pleated skirt"
- icon_state = "brown_skirt"
-
-/obj/item/clothing/under/color/red_skirt
- name = "red pleated skirt"
- icon_state = "red_skirt"
-
-/obj/item/clothing/under/color/orange_skirt
- name = "orange pleated skirt"
- icon_state = "orange_skirt"
-
-/obj/item/clothing/under/color/yellow_skirt
- name = "yellow pleated skirt"
- icon_state = "yellow_skirt"
-
-/obj/item/clothing/under/color/lgreen_skirt
- name = "light green pleated skirt"
- icon_state = "lightgreen_skirt"
-
-/obj/item/clothing/under/color/green_skirt
- name = "green pleated skirt"
- icon_state = "green_skirt"
-
-/obj/item/clothing/under/color/teal_skirt
- name = "teal pleated skirt"
- icon_state = "teal_skirt"
-
-/obj/item/clothing/under/color/lblue_skirt
- name = "light blue pleated skirt"
- icon_state = "lightblue_skirt"
-
-/obj/item/clothing/under/color/blue_skirt
- name = "blue pleated skirt"
- icon_state = "blue_skirt"
-
-/obj/item/clothing/under/color/lpurple_skirt
- name = "light purple pleated skirt"
- icon_state = "lightpurple_skirt"
-
-/obj/item/clothing/under/color/maroon_skirt
- name = "maroon pleated skirt"
- icon_state = "maroon_skirt"
-
-/obj/item/clothing/under/color/pink_skirt
- name = "pink pleated skirt"
- icon_state = "pink_skirt"
-
-/obj/item/clothing/under/color/rainbow_skirt
- name = "rainbow pleated skirt"
- icon_state = "rainbow_skirt"
-
diff --git a/code/modules/clothing/under/costumes/animeschool.dm b/code/modules/clothing/under/costumes/animeschool.dm
new file mode 100644
index 00000000000..d05691dbe53
--- /dev/null
+++ b/code/modules/clothing/under/costumes/animeschool.dm
@@ -0,0 +1,49 @@
+/**
+ * For the hit 2467 classic anime LunarMarine
+ */
+
+/obj/item/clothing/under/schoolgirl
+ name = "frilly blue skirt"
+ desc = "A clean white shirt with a blue collar and skirt. Looks like something out of an anime."
+ icon = 'icons/clothing/uniform/costume/animeschool/schoolgirl.dmi'
+ icon_state = "schoolgirl"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/schoolgirl/red
+ name = "frilly red skirt"
+ desc = "A clean white shirt with a red collar and skirt. Looks like something out of an anime."
+ icon = 'icons/clothing/uniform/costume/animeschool/schoolgirlred.dmi'
+ icon_state = "schoolgirlred"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/schoolgirl/green
+ name = "frilly green skirt"
+ desc = "A clean white shirt with a green collar and skirt. Looks like something out of an anime."
+ icon = 'icons/clothing/uniform/costume/animeschool/schoolgirlgreen.dmi'
+ icon_state = "schoolgirlgreen"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/schoolgirl/orange
+ name = "frilly orange skirt"
+ desc = "A clean white shirt with a orange collar and skirt. Looks like something out of an anime."
+ icon = 'icons/clothing/uniform/costume/animeschool/schoolgirlorange.dmi'
+ icon_state = "schoolgirlorange"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/schoolgirl/pink
+ name = "frilly pink skirt"
+ desc = "A clean white shirt with a pink collar and skirt. Looks like something out of an anime."
+ icon = 'icons/clothing/uniform/costume/animeschool/schoolgirlpink.dmi'
+ icon_state = "schoolgirlpink"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/costumes/armor.dm b/code/modules/clothing/under/costumes/armor.dm
new file mode 100644
index 00000000000..b58072a4e1e
--- /dev/null
+++ b/code/modules/clothing/under/costumes/armor.dm
@@ -0,0 +1,14 @@
+/**
+ * This file is for armor style costumes
+ */
+
+/obj/item/clothing/under/darkcleric
+ name = "dark cleric armor"
+ desc = "A chainmail tunic layered with a leather cuirass and religious iconography. Worn in veneration of a forgotten god."
+ icon = 'icons/clothing/uniform/costume/darkcleric.dmi'
+ icon_state = "darkcleric"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/costumes/historical.dm b/code/modules/clothing/under/costumes/historical.dm
new file mode 100644
index 00000000000..3b98eae34b7
--- /dev/null
+++ b/code/modules/clothing/under/costumes/historical.dm
@@ -0,0 +1,111 @@
+/**
+ * This file is for historical costumes e.g togas, old-earth "police", etc.
+ */
+
+/obj/item/clothing/under/aquiline_enforcer
+ name = "aquiline enforcer uniform"
+ desc = "Prior to the Final War issues with law enforcement on Old Earth became so bad that in many countries the police became little more than roving executioners. Ornate uniforms such as this one purport to be based on accounts of those times."
+ icon = 'icons/clothing/uniform/costume/historical/aquiline.dmi'
+ icon_state = "dredd"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/toga
+ name = "toga"
+ desc = "A length of white wool, wrapped carefully around the wearer. Sometimes bound by a belt or sash, in some cultures the way the toga was wrapped and worn denoted social status."
+ icon = 'icons/clothing/uniform/costume/historical/toga.dmi'
+ icon_state = "toga"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/imperial
+ desc = "imperial military jumpsuit"
+ icon = 'icons/clothing/uniform/costume/historical/crimson.dmi'
+ icon_state = "crimson"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/roman
+ name = "Roman Lorica"
+ desc = "Replica lorica segmentata. It doesn't feel like it would actually afford much protection against modern weaponry."
+ icon = 'icons/clothing/uniform/costume/historical/roman.dmi'
+ icon_state = "roman"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/gladiator
+ name = "gladiator uniform"
+ desc = "Are you not entertained? Is that not why you are here?"
+ icon = 'icons/clothing/uniform/costume/historical/gladiator.dmi'
+ icon_state = "gladiator"
+ body_cover_flags = LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/redcoat
+ name = "redcoat uniform"
+ desc = "Looks old."
+ icon = 'icons/clothing/uniform/costume/historical/redcoatformal.dmi'
+ icon_state = "redcoatformal"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/general
+ name = "despotic general uniform"
+ desc = "Looks old."
+ icon = 'icons/clothing/uniform/costume/historical/general.dmi'
+ icon_state = "general"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/american
+ name = "post-revolutionary american uniform"
+ desc = "Looks old."
+ icon = 'icons/clothing/uniform/costume/historical/american.dmi'
+ icon_state = "american"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/prussian
+ name = "prussian uniform"
+ desc = "Looks old."
+ icon = 'icons/clothing/uniform/costume/historical/prussian.dmi'
+ icon_state = "prussian"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/soviet
+ name = "soviet uniform"
+ desc = "For the Motherland!"
+ icon = 'icons/clothing/uniform/costume/historical/soviet.dmi'
+ icon_state = "soviet"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/pirate
+ name = "pirate outfit"
+ desc = "Yarr."
+ icon = 'icons/clothing/uniform/costume/historical/pirate.dmi'
+ icon_state = "pirate"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/costumes/maid.dm b/code/modules/clothing/under/costumes/maid.dm
new file mode 100644
index 00000000000..b4dd51378d1
--- /dev/null
+++ b/code/modules/clothing/under/costumes/maid.dm
@@ -0,0 +1,42 @@
+/**
+ * This file is for maid outfits that are costumes. Maid outfits that are uniforms go in workwear.
+ */
+/obj/item/clothing/under/dress/maid
+ name = "maid costume"
+ desc = "Maid in China."
+ icon = 'icons/clothing/uniform/costume/maid/maid.dmi'
+ icon_state = "maid"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/maid/sexy
+ name = "sexy maid costume"
+ desc = "You must be a bit risque teasing all of them in a maid uniform!"
+ icon = 'icons/clothing/uniform/costume/maid/maid_sexy.dmi'
+ icon_state = "sexymaid"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/maid/neko
+ name = "neko maid uniform"
+ desc = "A tailored maid uniform that takes many cues from Old Earth Bavarian commonwear. It seems airy and breathable."
+ icon = 'icons/clothing/uniform/costume/maid/maid_neko.dmi'
+ icon_state = "neko"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//KotetsuRedwood:Latex Maid Dresses, for everyone to 'enjoy'. :3c
+/obj/item/clothing/under/fluff/latexmaid
+ name = "latex maid dress"
+ desc = "Squeak! A shiny outfit for cleaning, made by people with dirty minds."
+ icon = 'icons/clothing/uniform/costume/maid/maid_latex.dmi'
+ icon_state = "latex"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/costumes/miscellaneous.dm b/code/modules/clothing/under/costumes/miscellaneous.dm
new file mode 100644
index 00000000000..2856ada7d8f
--- /dev/null
+++ b/code/modules/clothing/under/costumes/miscellaneous.dm
@@ -0,0 +1,403 @@
+/**
+ * This file is for anything that does not fit elsewhere.
+ * If you add 3 or more of something that groups together remove it from here and put it
+ * in its own file.
+ */
+
+/obj/item/clothing/under/kamina
+ name = "spiral hero outfit"
+ desc = "An outfit that radiates pure authority. Yours is the drill that will pierce the heavens."
+ icon = 'icons/clothing/uniform/costume/kamina.dmi'
+ icon_state = "kamina"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/yoko
+ name = "scavenging sniper set"
+ desc = "This outfit seems to favor tight materials and lots of open skin. It's likely that its previous owner hailed from an arid environment. It remains stylish, regardless of climate."
+ icon = 'icons/clothing/uniform/costume/yoko.dmi'
+ icon_state = "yoko"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/onestar
+ name = "one star jumpsuit"
+ desc = "A jumpsuit in One Star colours."
+ icon = 'icons/clothing/uniform/costume/onestar.dmi'
+ icon_state = "os_jumpsuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/captain_fly
+ name = "rogue's uniform"
+ desc = "For the man who doesn't care because he's still free."
+ icon = 'icons/clothing/uniform/costume/captain_fly.dmi'
+ icon_state = "captain_fly"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/mailman
+ name = "mailman's jumpsuit"
+ desc = "'Special delivery!'"
+ icon = 'icons/clothing/uniform/costume/mailman.dmi'
+ icon_state = "mailman"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/sexyclown
+ name = "sexy-clown suit"
+ desc = "It makes you look HONKable!"
+ icon = 'icons/clothing/uniform/costume/sexyclown.dmi'
+ icon_state = "sexyclown"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/vice
+ name = "vice officer's jumpsuit"
+ desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
+ icon = 'icons/clothing/uniform/costume/vice.dmi'
+ icon_state = "vice"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/owl
+ name = "owl uniform"
+ desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
+ icon = 'icons/clothing/uniform/costume/owl.dmi'
+ icon_state = "owl"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/johnny
+ name = "johnny~~ jumpsuit"
+ desc = "Johnny~~"
+ icon = 'icons/clothing/uniform/costume/johnny.dmi'
+ icon_state = "johnny"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/sexymime
+ name = "sexy mime outfit"
+ desc = "The only time when you DON'T enjoy looking at someone's rack."
+ icon = 'icons/clothing/uniform/costume/sexymime.dmi'
+ icon_state = "sexymime"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/highwayman_clothes
+ name = "Highwayman Clothes"
+ desc = "For the dungeon crawling, adventurous robber."
+ icon = 'icons/clothing/uniform/costume/highwayman_clothes.dmi'
+ icon_state = "highwayman_clothes"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/highwayman_clothes_fem
+ name = "Highwayman Clothes"
+ desc = "For the dungeon crawling, adventurous robber."
+ icon = 'icons/clothing/uniform/costume/highwayman_clothes_fem.dmi'
+ icon_state = "highwayman_clothes_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/safari
+ name = "safari uniform"
+ desc = "A sturdy canvas button-up and shorts, designed to provide protection without retaining heat."
+ icon = 'icons/clothing/uniform/costume/safari.dmi'
+ icon_state = "safari"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bountyskin
+ name = "bounty hunter skinsuit"
+ desc = "A skintight bodysuit meant to be worn under powered armor. Popularized by a famous bounty hunter."
+ icon = 'icons/clothing/uniform/costume/bountyskin.dmi'
+ icon_state = "bountyskin"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tape
+ name = "body tape wrapping"
+ desc = "Several layers of flexible body tape may be placed in a skintight arrangement that protects the user's modesty while still allowing them to dazzle. Odds of winning a Multipass increase when wearing this attire."
+ icon = 'icons/clothing/uniform/costume/tape.dmi'
+ icon_state = "tape"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/lobster
+ name = "lobster costume"
+ desc = "If you can dance, you've got a career in Law ahead."
+ icon = 'icons/clothing/uniform/costume/lobster.dmi'
+ icon_state = "lobster"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/mummy
+ name = "mummy bandages"
+ desc = "This aged and dirty wrap bears the dust of countless aeons. Keep away from water."
+ icon = 'icons/clothing/uniform/costume/mummy.dmi'
+ icon_state = "mummy"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skeleton
+ name = "skeleton costume"
+ desc = "Too spooky, too scary. Those who don this costume are haunted by xylophones."
+ icon = 'icons/clothing/uniform/costume/skeleton.dmi'
+ icon_state = "skeleton"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/scarecrow
+ name = "scarecrow costume"
+ desc = "Ideal for stalking someone through a field of hay. This suit is less practical on a space station."
+ icon = 'icons/clothing/uniform/costume/scarecrow.dmi'
+ icon_state = "scarecrow"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/darkholme
+ name = "leather harness costume"
+ desc = "The outfit of a dungeon master, and we're not talking about tabletop."
+ icon = 'icons/clothing/uniform/costume/darkholme.dmi'
+ icon_state = "darkholme"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/geisha
+ name = "geisha outfit"
+ desc = "These silk robes are commonly associated with Old World courtesans and radiate a delicate femininity."
+ icon = 'icons/clothing/uniform/costume/geisha.dmi'
+ icon_state = "geisha"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/drfreeze
+ name = "cryogenic scientist costume"
+ desc = "Themed puns aren't required, but they do make you seem cooler."
+ icon = 'icons/clothing/uniform/costume/drfreeze.dmi'
+ icon_state = "drfreeze"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/red_mech
+ name = "red plug suit"
+ desc = "The ideal outfit for a psychotic bitch. Knowledge of German not required."
+ icon = 'icons/clothing/uniform/costume/red_mech_suit.dmi'
+ icon_state = "red_mech_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/white_mech
+ name = "white plug suit"
+ desc = "For pilots whose color palettes match their personalities."
+ icon = 'icons/clothing/uniform/costume/white_mech_suit.dmi'
+ icon_state = "white_mech_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/blue_mech
+ name = "blue plug suit"
+ desc = "If you want to sit in your bedroom and cry, this is the suit to do it in."
+ icon = 'icons/clothing/uniform/costume/blue_mech_suit.dmi'
+ icon_state = "blue_mech_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/christmas
+ name = "holiday suit"
+ desc = "This costume hearkens back to Old Earth solstice traditions representing community interaction and an emphemeral concept known as 'holiday cheer'."
+ icon = 'icons/clothing/uniform/costume/christmasmaler.dmi'
+ icon_state = "christmasmaler"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/christmas/green
+ name = "green holiday suit"
+ desc = "Commonly associated with faerie-like 'helpers', the color green represents vitality and the coming spring."
+ icon = 'icons/clothing/uniform/costume/christmasmaleg.dmi'
+ icon_state = "christmasmaleg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/christmasfem
+ name = "sexy holiday suit"
+ desc = "Appreciation of more physical forms of comfort is important during the holidays. Even when it's cold out."
+ icon = 'icons/clothing/uniform/costume/christmasfemaler.dmi'
+ icon_state = "christmasfemaler"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/christmasfem/green
+ name = "sexy green holiday suit"
+ desc = "Something special for Santa's little helper."
+ icon = 'icons/clothing/uniform/costume/christmasfemaleg.dmi'
+ icon_state = "christmasfemaleg"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/telegram
+ name = "singing courier"
+ desc = "Living telegram operators experience one of the largest on the job fatality rates of all courier-based occupations."
+ icon = 'icons/clothing/uniform/costume/telegram.dmi'
+ icon_state = "telegram"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bsing
+ name = "blue performer's outfit"
+ desc = "A truly iconic outfit, still worn by enthusiasts and fans of Old Earth digital media."
+ icon = 'icons/clothing/uniform/costume/bsing.dmi'
+ icon_state = "bsing"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/ysing
+ name = "yellow performer's outfit"
+ desc = "Inspired by the original, this outfit is still stylish, although derivative."
+ icon = 'icons/clothing/uniform/costume/ysing.dmi'
+ icon_state = "ysing"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/psysuit
+ name = "dark undersuit"
+ desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm."
+ icon = 'icons/clothing/uniform/costume/psysuit.dmi'
+ icon_state = "psysuit"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/ballet
+ name = "\improper Antheia tutu"
+ desc = "A gossamer thin tutu from the boutique Antheia line. Famed for their flexibility and ease of motion, these outfits originate from Old Earth dance traditions."
+ icon = 'icons/clothing/uniform/costume/tutu.dmi'
+ icon_state = "tutu"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+///Natje: Awen Henry
+/obj/item/clothing/under/fluff/wolfgirl
+ name = "Wolfgirl Clothes"
+ desc = "A set of clothes almost identical to those Wolf Girls always wear..."
+ icon = 'icons/clothing/uniform/costume/wolfgirluni.dmi'
+ icon_state = "wolfgirluni"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/batter //I guess we're going OFF limits.
+ name = "Worn baseball outfit"
+ desc = "Purification in progress..."
+ icon = 'icons/clothing/uniform/costume/batter.dmi'
+ icon_state = "batter"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//Aztectornado:Tron inspired Siren outfit
+/obj/item/clothing/under/fluff/siren
+ name = "Siren Jumpsuit"
+ desc = "An advanced jumpsuit with inlaid neon highlighting, and a port on the back."
+ description_fluff = "Unlike other competitor suits, the Ward Takahashi Siren jumpsuit features a whole host of extra sensors for augmented reality use, and features a non-invasive neural sensor/stimulator for a fully immersive experience."
+ icon = 'icons/clothing/uniform/costume/tronsiren.dmi'
+ icon_state = "tronsiren"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/costumes/nt_fake.dm b/code/modules/clothing/under/costumes/nt_fake.dm
new file mode 100644
index 00000000000..3f5dc71fd55
--- /dev/null
+++ b/code/modules/clothing/under/costumes/nt_fake.dm
@@ -0,0 +1,11 @@
+/**
+ * Illegally branded copies of leigitmate NT workwear.
+ */
+
+/obj/item/clothing/under/rank/centcom/green/officer/replica
+ name = "\improper CentCom turtleneck replica"
+ desc = "A cheap copy of the CentCom turtleneck! A Donk Co. logo can be seen on the collar."
+
+/obj/item/clothing/under/rank/centcom/green/officer_skirt/replica
+ name = "\improper CentCom turtleneck skirt replica"
+ desc = "A cheap copy of the CentCom turtleneck skirt! A Donk Co. logo can be seen on the collar."
diff --git a/code/modules/clothing/under/costumes/rangers.dm b/code/modules/clothing/under/costumes/rangers.dm
new file mode 100644
index 00000000000..d4dc206cc28
--- /dev/null
+++ b/code/modules/clothing/under/costumes/rangers.dm
@@ -0,0 +1,65 @@
+/obj/item/clothing/under/color/ranger
+ name = "ranger uniform"
+ desc = "Made from a space-proof fibre and tight fitting, this uniform usually gives the agile Rangers all kinds of protection while not inhibiting their movement. \
+ This costume is instead made from genuine cotton fibre and is based on the season three uniform."
+ icon = 'icons/clothing/uniform/costume/ranger/white_ranger.dmi'
+ icon_state = "white_ranger"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/color/ranger/black
+ icon = 'icons/clothing/uniform/costume/ranger/black_ranger.dmi'
+ icon_state = "black_ranger"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/color/ranger/pink
+ icon = 'icons/clothing/uniform/costume/ranger/pink_ranger.dmi'
+ icon_state = "pink_ranger"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/color/ranger/green
+ icon = 'icons/clothing/uniform/costume/ranger/green_ranger.dmi'
+ icon_state = "green_ranger"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/color/ranger/cyan
+ icon = 'icons/clothing/uniform/costume/ranger/cyan_ranger.dmi'
+ icon_state = "cyan_ranger"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/color/ranger/orange
+ icon = 'icons/clothing/uniform/costume/ranger/orange_ranger.dmi'
+ icon_state = "orange_ranger"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/color/ranger/yellow
+ icon = 'icons/clothing/uniform/costume/ranger/yellow_ranger.dmi'
+ icon_state = "yellow_ranger"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/costumes/shiny.dm b/code/modules/clothing/under/costumes/shiny.dm
new file mode 100644
index 00000000000..0f7936f46e5
--- /dev/null
+++ b/code/modules/clothing/under/costumes/shiny.dm
@@ -0,0 +1,46 @@
+/**
+ * "Shiny" clothing •⩊•
+ */
+
+/obj/item/clothing/under/shiny
+ desc = "You can be a super-hero in this! Just don't forget your mask!"
+
+/obj/item/clothing/under/shiny/catsuit
+ name = "shiny suit"
+ icon = 'icons/clothing/uniform/costume/shiny/suit.dmi'
+ icon_state = "suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shiny/catsuit/poly
+ name = "polychromic shiny suit"
+ icon = 'icons/clothing/uniform/costume/shiny/suit_col.dmi'
+ icon_state = "suit_col"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shiny/leotard
+ name = "shiny leotard"
+ icon = 'icons/clothing/uniform/costume/shiny/leotard.dmi'
+ icon_state = "leotard"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/shiny/leotard/poly
+ name = "polychromic shiny leotard"
+ icon = 'icons/clothing/uniform/costume/shiny/leotard_col.dmi'
+ icon_state = "leotard_col"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/costumes/trek.dm b/code/modules/clothing/under/costumes/trek.dm
new file mode 100644
index 00000000000..8c5f5ab3da9
--- /dev/null
+++ b/code/modules/clothing/under/costumes/trek.dm
@@ -0,0 +1,165 @@
+/**
+ * Trek Clothes
+ */
+
+//TOS
+/obj/item/clothing/under/rank/trek/command
+ name = "Command Uniform"
+ desc = "The uniform worn by command officers in the mid 2260s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_command.dmi'
+ icon_state = "trek_command"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/engsec
+ name = "Operations Uniform"
+ desc = "The uniform worn by operations officers of the mid 2260s. You feel strangely vulnerable just seeing this..."
+ icon = 'icons/clothing/uniform/costume/trek/trek_engsec.dmi'
+ icon_state = "trek_engsec"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/medsci
+ name = "MedSci Uniform"
+ desc = "The uniform worn by medsci officers in the mid 2260s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_medsci.dmi'
+ icon_state = "trek_medsci"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//TNG
+/obj/item/clothing/under/rank/trek/command/next
+ desc = "The uniform worn by command officers. This one's from the mid 2360s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_next_command.dmi'
+ icon_state = "trek_next_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/engsec/next
+ desc = "The uniform worn by operation officers. This one's from the mid 2360s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_next_engsec.dmi'
+ icon_state = "trek_next_engsec"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/medsci/next
+ desc = "The uniform worn by medsci officers. This one's from the mid 2360s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_next_medsci.dmi'
+ icon_state = "trek_next_medsci"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//ENT
+/obj/item/clothing/under/rank/trek/command/ent
+ desc = "The uniform worn by command officers of the 2140s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_ent_command.dmi'
+ icon_state = "trek_ent_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/engsec/ent
+ desc = "The uniform worn by operations officers of the 2140s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_ent_engsec.dmi'
+ icon_state = "trek_ent_engsec"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/medsci/ent
+ desc = "The uniform worn by medsci officers of the 2140s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_ent_medsci.dmi'
+ icon_state = "trek_ent_medsci"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//VOY
+/obj/item/clothing/under/rank/trek/command/voy
+ desc = "The uniform worn by command officers of the 2370s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_voy_command.dmi'
+ icon_state = "trek_voy_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/engsec/voy
+ desc = "The uniform worn by operations officers of the 2370s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_voy_engsec.dmi'
+ icon_state = "trek_voy_engsec"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/medsci/voy
+ desc = "The uniform worn by medsci officers of the 2370s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_voy_medsci.dmi'
+ icon_state = "trek_voy_medsci"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/command/ds9
+ desc = "The uniform worn by command officers of the 2380s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_ds9_command.dmi'
+ icon_state = "trek_ds9_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/engsec/ds9
+ desc = "The uniform worn by operations officers of the 2380s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_ds9_engsec.dmi'
+ icon_state = "trek_ds9_engsec"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/trek/medsci/ds9
+ desc = "The uniform undershit worn by medsci officers of the 2380s."
+ icon = 'icons/clothing/uniform/costume/trek/trek_ds9_medsci.dmi'
+ icon_state = "trek_ds9_medsci"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
diff --git a/code/modules/clothing/under/eventclothing.dm b/code/modules/clothing/under/eventclothing.dm
new file mode 100644
index 00000000000..8bb44fa6682
--- /dev/null
+++ b/code/modules/clothing/under/eventclothing.dm
@@ -0,0 +1,34 @@
+/obj/item/clothing/under/event_reward/foxmiko
+ name = "Miko Garb"
+ desc = "The creative reinterpretation of Shinto miko attire."
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ icon = 'icons/clothing/event/foxmiko.dmi'
+ icon_state = "foxmiko"
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ worn_has_rolldown = UNIFORM_HAS_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+ var/skirt_rolled = 0 //Custom vars for tracking skirt state
+
+//Reduced to a single function. Parting the kimono is now under rolldown.
+/obj/item/clothing/under/event_reward/foxmiko/verb/liftskirt() //Verb for parting skirt - lewd. User reporting, flips state, and updates icon
+ set name = "Adjust Skirt"
+ set category = VERB_CATEGORY_OBJECT
+ set src in usr
+ if(!istype(usr, /mob/living)) //Standard checks for clothing verbs
+ return
+ if(usr.stat)
+ return
+
+ if(skirt_rolled) //User reporting
+ to_chat(usr, "You drop your skirt.")
+ body_cover_flags = body_cover_flags | LOWER_TORSO
+ icon = "foxmiko"
+ skirt_rolled = FALSE
+ else
+ to_chat(usr, "You lift your skirt.")
+ body_cover_flags &= ~LOWER_TORSO
+ icon = "foxmiko_skirt"
+ skirt_rolled = TRUE
+
+ update_worn_icon()
diff --git a/code/modules/clothing/under/formal/antediluvian.dm b/code/modules/clothing/under/formal/antediluvian.dm
new file mode 100644
index 00000000000..4dcdabfc8f5
--- /dev/null
+++ b/code/modules/clothing/under/formal/antediluvian.dm
@@ -0,0 +1,48 @@
+/**
+ * Ante stuff
+ */
+
+//Antediluvian
+
+/obj/item/clothing/under/antediluvian
+ name = "Antediluvian corset"
+ desc = "This metallic corset and sturdy cloth bustier provide very little coverage. A dismountable sheer bodystocking integrated into the clothing retains some modesty. It is unknown whether it serveed ceremonial or official purpose."
+ icon = 'icons/clothing/uniform/formal/antediluvian/antediluvian.dmi'
+ icon_state = "antediluvian"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/antediluvian/dress
+ name = "Antediluvian dress"
+ desc = "A metalic dress with inner padding, following a similar, scantily-clad fashion trend. It is unknown whether it served ceremonial or official purpose."
+ icon = 'icons/clothing/uniform/formal/antediluvian/ante.dmi'
+ icon_state = "ante"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/antediluvian/dress/aziru
+ name = "Antediluvian Wrap"
+ desc = "A dress made out of an elegantly wrapped single piece of cloth, with golden embellishments of unknown origin. It seems to have purposefully exposed arms."
+ icon = 'icons/clothing/uniform/formal/antediluvian/aziru_dress.dmi'
+ icon_state = "aziru_dress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/antediluvian/dress/ante_boobflap
+ name = "Antediluvian Chest Flaps"
+ desc = "A comfortable collar with two trailing flaps going down onto the chest area, meeting the bare minimum requirements for decency, should they stay in place in motion."
+ icon = 'icons/clothing/uniform/formal/antediluvian/ante_boobflap.dmi'
+ icon_state = "ante_boobflap"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/formal/chinese.dm b/code/modules/clothing/under/formal/chinese.dm
new file mode 100644
index 00000000000..a1b21a0ecc0
--- /dev/null
+++ b/code/modules/clothing/under/formal/chinese.dm
@@ -0,0 +1,176 @@
+/**
+ * Chinese Traditional
+ * Funfact: cheongsam and qipao are cantonese and mandarain for the same dress type
+ * cheong is korean for syrup
+ */
+
+//* Cheongsam *//
+
+/obj/item/clothing/under/cheongsam
+ name = "white cheongsam"
+ desc = "It is a white cheongsam dress."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongsam-white"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/cheongsam/red
+ name = "red cheongsam"
+ desc = "It is a red cheongsam dress."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongsam-red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/cheongsam/blue
+ name = "blue cheongsam"
+ desc = "It is a blue cheongsam dress."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongsam-blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/cheongsam/black
+ name = "black cheongsam"
+ desc = "It is a black cheongsam dress."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongsam-black"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/cheongsam/darkred
+ name = "dark red cheongsam"
+ desc = "It is a dark red cheongsam dress."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongsam-darkred"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cheongsam/darkgreen
+ name = "dark green cheongsam"
+ desc = "It is a dark green cheongsam dress."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongsam-darkgreen"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cheongsam/green
+ name = "green cheongsam"
+ desc = "It is a green cheongsam dress."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongsam-green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cheongsam/purple
+ name = "purple cheongsam"
+ desc = "It is a purple cheongsam dress."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongsam-purple"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cheongsam/darkblue
+ name = "dark blue cheongsam"
+ desc = "It is a dark blue cheongsam dress."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongsam-darkblue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cheong
+ name = "black cheongsam"
+ desc = "Popular among the men of Old Earth China during festivals. Embroidered and crafted out of fine silk, this is suitable as formal or casual wear."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheong"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cheong/white
+ name = "white cheongsam"
+ desc = "Popular among the men of Old Earth China during festivals. Embroidered and crafted out of fine silk, this is suitable as formal or casual wear."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongw"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cheong/red
+ name = "red cheongsam"
+ desc = "Popular among the men of Old Earth China during festivals. Embroidered and crafted out of fine silk, this is suitable as formal or casual wear."
+ icon = 'icons/clothing/uniform/formal/dress/cheongsam.dmi'
+ icon_state = "cheongr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//* Qipao *//
+
+/obj/item/clothing/under/qipao
+ name = "black qipao"
+ desc = "A popular dress from Old Earth China, commonly worn to festivals. Easily recognizable thanks to its intricate embroidery and bold side slits."
+ icon = 'icons/clothing/uniform/formal/dress/qipao.dmi'
+ icon_state = "qipao"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/sleeveless_qipao
+ name = "sleeveless black qipao"
+ desc = "A popular dress from Old Earth China, commonly worn to festivals. Easily recognizable thanks to its intricate embroidery and bold side slits."
+ icon = 'icons/clothing/uniform/formal/dress/qipao.dmi'
+ icon_state = "sleevelessqipao"
+ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/qipao/white
+ name = "white qipao"
+ desc = "A popular dress from Old Earth China, commonly worn to festivals. Easily recognizable thanks to its intricate embroidery and bold side slits."
+ icon = 'icons/clothing/uniform/formal/dress/qipao.dmi'
+ icon_state = "qipao_white"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/qipao/red
+ name = "red qipao"
+ desc = "A popular dress from Old Earth China, commonly worn to festivals. Easily recognizable thanks to its intricate embroidery and bold side slits."
+ icon = 'icons/clothing/uniform/formal/dress/qipao.dmi'
+ icon_state = "qipao_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/formal/dress.dm b/code/modules/clothing/under/formal/dress.dm
new file mode 100644
index 00000000000..10e865e4e0e
--- /dev/null
+++ b/code/modules/clothing/under/formal/dress.dm
@@ -0,0 +1,483 @@
+/**
+ * Dresses
+ * Theres probably a better way to seperate these but I'm not knowledgable enough in
+ * fashion.
+ */
+
+/obj/item/clothing/under/dress
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/under/dress/cropdress
+ name = "cropped dress"
+ desc = "A cropped dress to keep you cool, but fashionable."
+ icon = 'icons/clothing/uniform/formal/dress/cropdress.dmi'
+ icon_state = "cropdress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/twistdress
+ name = "twisted dress"
+ desc = "A new take on twisted coffee, this top and skirt keep your robustness at an all-time high."
+ icon = 'icons/clothing/uniform/formal/dress/twistfront.dmi'
+ icon_state = "twistfront"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/blacktango
+ name = "black tango dress"
+ desc = "Filled with Latin fire."
+ icon = 'icons/clothing/uniform/formal/dress/blacktango.dmi'
+ icon_state = "black_tango"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/blacktango/alt
+ name = "black tango dress"
+ desc = "Filled with Latin fire."
+ icon = 'icons/clothing/uniform/formal/dress/blacktango_alt.dmi'
+ icon_state = "black_tango_alt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/stripeddress
+ name = "striped dress"
+ desc = "Fashion in space."
+ icon = 'icons/clothing/uniform/formal/dress/striped_dress.dmi'
+ icon_state = "striped_dress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/sailordress
+ name = "sailor dress"
+ desc = "Formal wear for a leading lady."
+ icon = 'icons/clothing/uniform/formal/dress/sailor_dress.dmi'
+ icon_state = "sailor_dress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/redeveninggown
+ name = "red evening gown"
+ desc = "Fancy dress for space bar singers."
+ icon = 'icons/clothing/uniform/formal/dress/red_evening_gown.dmi'
+ icon_state = "red_evening_gown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/dress_fire
+ name = "flame dress"
+ desc = "A small black dress with blue flames print on it."
+ icon = 'icons/clothing/uniform/formal/dress/dress_fire.dmi'
+ icon_state = "dress_fire"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/dress_green
+ name = "green dress"
+ desc = "A simple, tight fitting green dress."
+ icon = 'icons/clothing/uniform/formal/dress/dress_green.dmi'
+ icon_state = "dress_green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/dress_orange
+ name = "orange dress"
+ desc = "A fancy orange gown for those who like to show leg."
+ icon = 'icons/clothing/uniform/formal/dress/dress_orange.dmi'
+ icon_state = "dress_orange"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/dress_pink
+ name = "pink dress"
+ desc = "A simple, tight fitting pink dress."
+ icon = 'icons/clothing/uniform/formal/dress/dress_pink.dmi'
+ icon_state = "dress_pink"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/dress_yellow
+ name = "yellow dress"
+ desc = "A flirty, little yellow dress."
+ icon = 'icons/clothing/uniform/formal/dress/dress_yellow.dmi'
+ icon_state = "dress_yellow"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/dress_saloon
+ name = "saloon girl dress"
+ desc = "A old western inspired gown for the girl who likes to drink."
+ icon = 'icons/clothing/uniform/formal/dress/dress_saloon.dmi'
+ icon_state = "dress_saloon"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/flower_dress
+ name = "flower dress"
+ desc = "A beautiful dress with a skirt of flowers."
+ icon = 'icons/clothing/uniform/formal/dress/flower_dress.dmi'
+ icon_state = "flower_dress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/red_swept_dress
+ name = "red swept dress"
+ desc = "A red dress that sweeps to the side."
+ icon = 'icons/clothing/uniform/formal/dress/red_swept_dress.dmi'
+ icon_state = "red_swept_dress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/flamenco
+ name = "flamenco dress"
+ desc = "A Mexican flamenco dress."
+ icon = 'icons/clothing/uniform/formal/dress/flamenco.dmi'
+ icon_state = "flamenco"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/westernbustle
+ name = "western bustle"
+ desc = "A western bustle dress from Earth's late 1800's."
+ icon = 'icons/clothing/uniform/formal/dress/westernbustle.dmi'
+ icon_state = "westernbustle"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/sari
+ name = "red sari"
+ desc = "A colorful traditional dress originating from India."
+ icon = 'icons/clothing/uniform/formal/dress/sari_red.dmi'
+ icon_state = "sari_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/sari/green
+ name = "green sari"
+ icon = 'icons/clothing/uniform/formal/dress/sari_green.dmi'
+ icon_state = "sari_green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/lilacdress
+ name = "lilac dress"
+ desc = "A simple black dress adorned in fake purple lilacs."
+ icon = 'icons/clothing/uniform/formal/dress/lilacdress.dmi'
+ icon_state = "lilacdress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/sundress
+ name = "sundress"
+ desc = "Makes you want to frolic in a field of daisies."
+ icon = 'icons/clothing/uniform/formal/dress/sundress.dmi'
+ icon_state = "sundress"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/sundress_white
+ name = "white sundress"
+ desc = "A white sundress decorated with purple lilies."
+ icon = 'icons/clothing/uniform/formal/dress/sundress_white.dmi'
+ icon_state = "sundress_white"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/pentagramdress
+ name = "pentagram dress"
+ desc = "A black dress with straps over the chest in the shape of a pentagram."
+ icon = 'icons/clothing/uniform/formal/dress/pentagram.dmi'
+ icon_state = "pentagram"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/white
+ name = "white wedding dress"
+ desc = "A fancy white dress with a blue underdress."
+ icon = 'icons/clothing/uniform/formal/dress/whitedress1.dmi'
+ icon_state = "whitedress1"
+ inv_hide_flags = HIDESHOES
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/white2
+ name = "long dress"
+ desc = "A long dress."
+ icon = 'icons/clothing/uniform/formal/dress/whitedress2.dmi'
+ icon_state = "whitedress2"
+ addblends = "whitedress2_a"
+ inv_hide_flags = HIDESHOES
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/white3
+ name = "short dress"
+ desc = "A short, plain dress."
+ icon = 'icons/clothing/uniform/formal/dress/whitedress3.dmi'
+ icon_state = "whitedress3"
+ addblends = "whitedress3_a"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/white4
+ name = "long flared dress"
+ desc = "A long white dress that flares out at the bottom."
+ icon = 'icons/clothing/uniform/formal/dress/whitedress4.dmi'
+ icon_state = "whitedress4"
+ addblends = "whitedress4_a"
+ inv_hide_flags = HIDESHOES
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/darkred
+ name = "fancy dark red dress"
+ desc = "A short, red dress with a black belt. Fancy."
+ icon = 'icons/clothing/uniform/formal/dress/darkreddress.dmi'
+ icon_state = "darkreddress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/festivedress
+ name = "festive dress"
+ desc = "A red dress with a fur-like white trim that is associated with the Christmas season."
+ icon = 'icons/clothing/uniform/formal/dress/festivedress.dmi'
+ icon_state = "festivedress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/littleblackdress
+ name = "little black dress"
+ desc = "A small black dress with a red sash."
+ icon = 'icons/clothing/uniform/formal/dress/littleblackdress.dmi'
+ icon_state = "littleblackdress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/victorianreddress
+ name = "red victorian dress"
+ desc = "A little gratitude wouldn't irretrievably damage my ego."
+ icon = 'icons/clothing/uniform/formal/dress/victorianreddress.dmi'
+ icon_state = "victorianreddress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/victorianblackdress
+ name = "black victorian dress"
+ desc = "What's the use of a good quotation if you can't change it?"
+ icon = 'icons/clothing/uniform/formal/dress/victorianblackdress.dmi'
+ icon_state = "victorianblackdress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/fienddress
+ name = "fiendish dress"
+ desc = "A red and black dress befitting someone from the dark pits themselves....Or a thirteen year old."
+ icon = 'icons/clothing/uniform/formal/dress/fienddress.dmi'
+ icon_state = "fienddress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tabard_w
+ name = "white tabard-dress"
+ desc = "A gold-trimmed white tabard-dress with a large V-shaped boob window. For when you want to show off your hips and look classy at the same time."
+ icon = 'icons/clothing/uniform/formal/dress/white_tabard.dmi'
+ icon_state = "white_tabard"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tabard_b
+ name = "black tabard-dress"
+ desc = "A gold-trimmed black tabard-dress with a large circular boob window. Useful for showing off your hips while your buddy puts something in the target's drink."
+ icon = 'icons/clothing/uniform/formal/dress/black_tabard.dmi'
+ icon_state = "black_tabard"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/verglasdress
+ name = "verglas dress"
+ desc = "The modern twist on a forgotten pattern, the Verglas style utilizes comfortable velvet and silver white satin to create an otherworldly effect evocative of winter, or the void."
+ icon = 'icons/clothing/uniform/formal/dress/verglas_dress.dmi'
+ icon_state = "verglas_dress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/simpledress
+ name = "White Simple Dress"
+ desc = "A very short, plain white dress with a light blue sash."
+ icon = 'icons/clothing/uniform/formal/dress/simpledress.dmi'
+ icon_state = "simpledress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/chiming_dress
+ name = "chiming dress"
+ desc = "This stylish yet rugged dress is inspired by recovered depictions of ancient Surt's native inhabitants. Composed of many integrated panels, it allows for excellent breathability whilst also retaining a strong profile."
+ icon = 'icons/clothing/uniform/formal/dress/chiming_dress.dmi'
+ icon_state = "chiming_dress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/countess
+ name = "countess dress"
+ desc = "This flowing dress radiates a dark authority. Its wide skirt and daring color palette bring to mind the feeling of movement in shadows, or a rush of blood."
+ icon = 'icons/clothing/uniform/formal/dress/countess.dmi'
+ icon_state = "countess"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/baroness
+ name = "baroness dress"
+ desc = "With its imposing train and sanguine color palette, this dress aims to menace. Some day the designer sought to evoke the downfall of Vetala in its design."
+ icon = 'icons/clothing/uniform/formal/dress/baroness.dmi'
+ icon_state = "baroness"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/lilin
+ name = "Lilin sash dress"
+ desc = "An exotic shoulderless dress that plunges into an open-hipped sash-like silk skirt. Its fading dyework seems to evoke a sense of bleeding. A small tag marks it as belonging to the Lindenoak line."
+ icon = 'icons/clothing/uniform/formal/dress/lilin.dmi'
+ icon_state = "lilin"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/summer
+ name = "summer dress"
+ desc = "A light and breezy dress designed to keep its wearer comfortable on hot summer days."
+ icon = 'icons/clothing/uniform/formal/dress/summerdress.dmi'
+ icon_state = "summerdress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/summer/blue
+ name = "blue summer dress"
+ icon = 'icons/clothing/uniform/formal/dress/summerdress2.dmi'
+ icon_state = "summerdress2"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/summer/red
+ name = "red summer dress"
+ icon = 'icons/clothing/uniform/formal/dress/summerdress3.dmi'
+ icon_state = "summerdress3"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/summer/gold
+ name = "golden summer dress"
+ desc = "A light and breezy dress designed to keep its wearer comfortable on hot summer days. This one features an especially daring side cut."
+ icon = 'icons/clothing/uniform/formal/dress/summerdress_nt.dmi'
+ icon_state = "summerdress_nt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/revealing
+ name = "revealing cocktail dress"
+ desc = "A dress this daring requires certain amounts of confidence that few possess. Show off what you've got without too much of a scandal."
+ icon = 'icons/clothing/uniform/formal/dress/revealingdress.dmi'
+ icon_state = "revealingdress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
diff --git a/code/modules/clothing/under/formal/japanese.dm b/code/modules/clothing/under/formal/japanese.dm
new file mode 100644
index 00000000000..a634fdecba2
--- /dev/null
+++ b/code/modules/clothing/under/formal/japanese.dm
@@ -0,0 +1,143 @@
+/**
+ * Japanese Traditional
+ */
+
+//* Kimono *//
+
+/obj/item/clothing/under/kimono
+ name = "plain kimono"
+ desc = "The traditional dress of old Earth Japan, the kimono remains ubiquitous across the galaxy due to its comfort, simplicity, and versatility."
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono_black
+ name = "black kimono"
+ desc = "A more somber and reserved pattern of kimono. Wear this to a funeral, or to the climactic sword battle."
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_black"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono_sakura
+ name = "sakura pattern kimono"
+ desc = "The vibrant pink coloration and subtle flower pattern of this kimono represet the Sakura tree, which was saved from extinction during the Final War thanks to the efforts of conservationists on Luna."
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_sakura"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono_fancy
+ name = "festival kimono"
+ desc = "A blue kimono similar to those traditionally worn to festivals. Its intricate embroidery and fine coloring are not meant to face much wear and tear."
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_fancy"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kamishimo
+ name = "kamishimo"
+ desc = "Popular amongst samurai, these items of clothing are not frequently in vogue. However, their easily recognizable silhouette keeps them from falling into total obscurity."
+ icon = 'icons/clothing/uniform/formal/dress/kamishimo.dmi'
+ icon_state = "kamishimo"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//Keek's Kimonos
+/obj/item/clothing/under/kimono/red
+ name = "red kimono"
+ desc = "The traditional dress of old Earth Japan, the kimono remains ubiquitous across the galaxy due to its comfort, simplicity, and versatility."
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_red"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono/orange
+ name = "orange kimono"
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_orange"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono/yellow
+ name = "yellow kimono"
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_yellow"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono/green
+ name = "green kimono"
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_green"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono/blue
+ name = "blue kimono"
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_blue"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono/purple
+ name = "purple kimono"
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_purple"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono/violet
+ name = "violet kimono"
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_violet"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono/pink
+ name = "pink kimono"
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_pink"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/kimono/earth
+ name = "earth kimono"
+ icon = 'icons/clothing/uniform/formal/dress/kimono.dmi'
+ icon_state = "kimono_earth"
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/formal/lawyer_suits.dm b/code/modules/clothing/under/formal/lawyer_suits.dm
new file mode 100644
index 00000000000..3a78a4b65af
--- /dev/null
+++ b/code/modules/clothing/under/formal/lawyer_suits.dm
@@ -0,0 +1,116 @@
+/**
+ * This would be workwear, but we don't actually have lawyers, so they're just nice suits. But we might want to keep the designation? Ce la vie
+ */
+
+/obj/item/clothing/under/lawyer
+ desc = "Slick threads."
+ name = "lawyer suit"
+
+/obj/item/clothing/under/lawyer/black
+ name = "black lawyer suit"
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/lawyer_black.dmi'
+ icon_state = "lawyer_black"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/lawyer/black/skirt
+ name = "black lawyer skirt"
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/lawyer_black_skirt.dmi'
+ icon_state = "lawyer_black_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//REUSES SPRITESHEET
+/obj/item/clothing/under/lawyer/female
+ name = "black lawyer suit"
+ icon = 'icons/clothing/uniform/formal/suits/black_suit_fem.dmi'
+ icon_state = "black_suit_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/lawyer/red
+ name = "red lawyer suit"
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/lawyer_red.dmi'
+ icon_state = "lawyer_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/lawyer/red/skirt
+ name = "red lawyer skirt"
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/lawyer_red_skirt.dmi'
+ icon_state = "lawyer_red_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/lawyer/blue
+ name = "blue lawyer suit"
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/lawyer_blue.dmi'
+ icon_state = "lawyer_blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/lawyer/blue/skirt
+ name = "blue lawyer skirt"
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/lawyer_blue_skirt.dmi'
+ icon_state = "lawyer_blue_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/lawyer/bluesuit
+ name = "blue suit"
+ desc = "A classy suit."
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/bluesuit.dmi'
+ icon_state = "bluesuit"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/red)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/lawyer/bluesuit/skirt
+ name = "blue skirt suit"
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/bluesuit_skirt.dmi'
+ icon_state = "bluesuit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/lawyer/purpsuit
+ name = "purple suit"
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/lawyer_purp.dmi'
+ icon_state = "lawyer_purp"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/lawyer/purpsuit/skirt
+ name = "purple skirt suit"
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/lawyer_purp_skirt.dmi'
+ icon_state = "lawyer_purp_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/lawyer/oldman
+ name = "Old Man's Suit"
+ desc = "A classic suit for the older gentleman, with built in back support."
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/oldman.dmi'
+ icon_state = "oldman"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/oldwoman
+ name = "Old Woman's Attire"
+ desc = "A typical outfit for the older woman, a lovely cardigan and comfortable skirt."
+ icon = 'icons/clothing/uniform/formal/lawyer_suits/oldwoman.dmi'
+ icon_state = "oldwoman"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/formal/miscellaneous.dm b/code/modules/clothing/under/formal/miscellaneous.dm
new file mode 100644
index 00000000000..24f15815011
--- /dev/null
+++ b/code/modules/clothing/under/formal/miscellaneous.dm
@@ -0,0 +1,22 @@
+/**
+ * Things that don't fit elsewhere.
+ */
+
+//drip or drown seccie
+/obj/item/clothing/under/assistantformal
+ name = "assistant's formal uniform"
+ desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown."
+ icon = 'icons/clothing/uniform/formal/assistant_formal.dmi'
+ icon_state = "assistant_formal"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/assistantformal_fem
+ name = "assistant's formal uniform"
+ desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown."
+ icon = 'icons/clothing/uniform/formal/assistant_formal_fem.dmi'
+ icon_state = "assistant_formal_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/formal/suits.dm b/code/modules/clothing/under/formal/suits.dm
new file mode 100644
index 00000000000..4d28eacfb63
--- /dev/null
+++ b/code/modules/clothing/under/formal/suits.dm
@@ -0,0 +1,395 @@
+/**
+ * Mens Suits, Women Suits, Skeleton Suits
+ */
+
+/obj/item/clothing/under/scratch
+ name = "white suit"
+ desc = "A white suit, suitable for an excellent host"
+ icon = 'icons/clothing/uniform/formal/suits/scratch.dmi'
+ icon_state = "scratch"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/scratch/skirt
+ name = "white skirt suit"
+ icon = 'icons/clothing/uniform/formal/suits/scratch_skirt.dmi'
+ icon_state = "scratch_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/sl_suit
+ desc = "It's a very amish looking suit."
+ name = "amish suit"
+ icon = 'icons/clothing/uniform/formal/suits/sl_suit.dmi'
+ icon_state = "sl_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/gentlesuit
+ name = "gentlemans suit"
+ desc = "A silk black shirt with matching gray slacks. Feels proper."
+ icon = 'icons/clothing/uniform/formal/suits/gentlesuit.dmi'
+ icon_state = "gentlesuit"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/white, /obj/item/clothing/accessory/wcoat/gentleman)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/gentlesuit/skirt
+ name = "lady's suit"
+ desc = "A silk black blouse with a matching gray skirt. Feels proper."
+ icon = 'icons/clothing/uniform/formal/suits/gentlesuit_skirt.dmi'
+ icon_state = "gentlesuit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket
+ name = "black suit"
+ desc = "A black suit and red tie. Very formal."
+ icon = 'icons/clothing/uniform/formal/suits/black_suit.dmi'
+ icon_state = "black_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/really_black
+ name = "executive suit"
+ desc = "A formal black suit and red tie, intended for the station's finest."
+ icon = 'icons/clothing/uniform/formal/suits/really_black_suit.dmi'
+ icon_state = "really_black_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/really_black/skirt
+ name = "executive skirt suit"
+ desc = "A formal black suit and red necktie, intended for the station's finest."
+ icon = 'icons/clothing/uniform/formal/suits/really_black_suit_skirt.dmi'
+ icon_state = "really_black_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "black"
+
+/obj/item/clothing/under/suit_jacket/female
+ name = "female executive suit"
+ desc = "A formal trouser suit for women, intended for the station's finest."
+ icon = 'icons/clothing/uniform/formal/suits/black_suit_fem.dmi'
+ icon_state = "black_suit_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/female/skirt
+ name = "executive skirt"
+ desc = "A formal suit skirt for women, intended for the station's finest."
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ icon = 'icons/clothing/uniform/formal/suits/black_formal_skirt.dmi'
+ icon_state = "black_formal_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/female/pleated_skirt
+ name = "executive pleated skirt"
+ icon = 'icons/clothing/uniform/formal/suits/black_suit_fem_skirt.dmi'
+ icon_state = "black_suit_fem_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/red
+ name = "red suit"
+ desc = "A red suit and blue tie. Somewhat formal."
+ icon = 'icons/clothing/uniform/formal/suits/red_suit.dmi'
+ icon_state = "red_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/red/skirt
+ name = "red skirt suit"
+ desc = "A red suit and blue necktie. Somewhat formal."
+ icon = 'icons/clothing/uniform/formal/suits/red_suit_skirt.dmi'
+ icon_state = "red_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/charcoal
+ name = "charcoal suit"
+ desc = "A charcoal suit and red tie. Very professional."
+ icon = 'icons/clothing/uniform/formal/suits/charcoal_suit.dmi'
+ icon_state = "charcoal_suit"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/navy, /obj/item/clothing/accessory/jacket/charcoal)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/suit_jacket/charcoal/skirt
+ name = "charcoal skirt"
+ icon = 'icons/clothing/uniform/formal/suits/charcoal_suit_skirt.dmi'
+ icon_state = "charcoal_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/navy
+ name = "navy suit"
+ desc = "A navy suit and red tie, intended for the station's finest."
+ icon = 'icons/clothing/uniform/formal/suits/navy_suit.dmi'
+ icon_state = "navy_suit"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/red, /obj/item/clothing/accessory/jacket/navy)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/suit_jacket/navy/skirt
+ name = "navy skirt"
+ icon = 'icons/clothing/uniform/formal/suits/navy_suit_skirt.dmi'
+ icon_state = "navy_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/burgundy
+ name = "burgundy suit"
+ desc = "A burgundy suit and black tie. Somewhat formal."
+ icon = 'icons/clothing/uniform/formal/suits/burgundy_suit.dmi'
+ icon_state = "burgundy_suit"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/black, /obj/item/clothing/accessory/jacket/burgundy)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/suit_jacket/burgundy/skirt
+ name = "burgundy skirt"
+ icon = 'icons/clothing/uniform/formal/suits/burgundy_suit_skirt.dmi'
+ icon_state = "burgundy_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//Reuses spritesheet
+/obj/item/clothing/under/suit_jacket/checkered
+ name = "checkered suit"
+ desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?"
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective3.dmi'
+ icon_state = "detective3"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/black, /obj/item/clothing/accessory/jacket/checkered)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+
+/obj/item/clothing/under/suit_jacket/checkered/skirt
+ name = "checkered skirt"
+ icon = 'icons/clothing/uniform/formal/suits/checkered_suit_skirt.dmi'
+ icon_state = "checkered_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/suit_jacket/tan
+ name = "tan suit"
+ desc = "A tan suit. Smart, but casual."
+ icon = 'icons/clothing/uniform/formal/suits/tan_suit.dmi'
+ icon_state = "tan_suit"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/yellow, /obj/item/clothing/accessory/jacket)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/suit_jacket/tan/skirt
+ name = "tan skirt"
+ icon = 'icons/clothing/uniform/formal/suits/tan_suit_skirt.dmi'
+ icon_state = "tan_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dutchuniform
+ name = "\improper Western suit"
+ desc = "We can't always fight nature. We can't fight change, we can't fight gravity, we can't fight nothing."
+ icon = 'icons/clothing/uniform/formal/suits/dutchuniform.dmi'
+ icon_state = "dutchuniform"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/victorianblred
+ name = "red shirted victorian suit"
+ desc = "Don't you see? I have thirteen lives."
+ icon = 'icons/clothing/uniform/formal/suits/victorianblred.dmi'
+ icon_state = "victorianblred"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/fem_victorianblred
+ name = "red shirted victorian suit"
+ desc = "Don't you see? I have thirteen lives."
+ icon = 'icons/clothing/uniform/formal/suits/victorianblred-fem.dmi'
+ icon_state = "victorianblred-fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/victorianredvest
+ name = "red vested victorian suit"
+ desc = "Why are we going to the back of the ship? Because the front crashes first. Think it through."
+ icon = 'icons/clothing/uniform/formal/suits/victorianredvest.dmi'
+ icon_state = "victorianredvest"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/fem_victorianredvest
+ name = "red vested victorian suit"
+ desc = "Why are we going to the back of the ship? Because the front crashes first. Think it through."
+ icon = 'icons/clothing/uniform/formal/suits/victorianredvest-fem.dmi'
+ icon_state = "victorianredvest-fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/victorianvest
+ name = "victorian suit"
+ desc = "Four minutes? That's ages. What if I get bored, or need a television, couple of books? Anyone for chess? Bring me knitting."
+ icon = 'icons/clothing/uniform/formal/suits/victorianvest.dmi'
+ icon_state = "victorianvest"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/fem_victorianvest
+ name = "victorian suit"
+ desc = "Four minutes? That's ages. What if I get bored, or need a television, couple of books? Anyone for chess? Bring me knitting."
+ icon = 'icons/clothing/uniform/formal/suits/victorianvest-fem.dmi'
+ icon_state = "victorianvest-fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/victorianlightfire
+ name = "light blue shirted victorian suit"
+ desc = "Have you ever thought about what it's like to be wanderers in the Fourth Dimension? Yes, I'm asking you."
+ icon = 'icons/clothing/uniform/formal/suits/victorianlightfire.dmi'
+ icon_state = "victorianlightfire"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/fem_victorianlightfire
+ name = "light blue shirted victorian suit"
+ desc = "Have you ever thought about what it's like to be wanderers in the Fourth Dimension? Yes, I'm asking you."
+ icon = 'icons/clothing/uniform/formal/suits/victorianlightfire-fem.dmi'
+ icon_state = "victorianlightfire-fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/fiendsuit
+ name = "fiendish suit"
+ desc = "A red and black suit befitting someone from the dark pits themselves....Or a thirteen year old."
+ icon = 'icons/clothing/uniform/formal/suits/fiendsuit.dmi'
+ icon_state = "fiendsuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/hawaiian
+ name = "pink hawaiian suit"
+ desc = "A suit consisting of bright white pants and a pink hawaiian shirt. Makes it feel like it's casual friday."
+ icon = 'icons/clothing/uniform/formal/suits/hawaiianpink.dmi'
+ icon_state = "hawaiianpink"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/blueshift
+ name = "light blue suit"
+ desc = "A casual suit consisting of a light blue dress shirt, navy pants, and a black tie. Makes you think of a security officer in over his head."
+ icon = 'icons/clothing/uniform/formal/suits/blueshift.dmi'
+ icon_state = "blueshift"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/office_worker
+ name = "officer worker suit"
+ desc = "A suit consisting of a white dress shirt, white pants, black belt, and red-and-black tie."
+ icon = 'icons/clothing/uniform/formal/suits/hlsuit.dmi'
+ icon_state = "hlsuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/blazer
+ name = "blue blazer"
+ desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie."
+ icon = 'icons/clothing/uniform/formal/suits/blue_blazer.dmi'
+ icon_state = "blue_blazer"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/blazer/skirt
+ name = "ladies blue blazer"
+ desc = "A bold but yet conservative outfit, a red pencil skirt and a navy blazer."
+ icon = 'icons/clothing/uniform/formal/suits/blue_blazer_skirt.dmi'
+ icon_state = "blue_blazer_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//Reuses spritesheet
+/obj/item/clothing/under/redcoatformal
+ name = "formal red coat"
+ desc = "Raise the taxes on their tea. What can go wrong?"
+ icon = 'icons/clothing/uniform/costume/historical/redcoatformal.dmi'
+ icon_state = "redcoatformal"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/businessskirt_female
+ name = "Business Skirt"
+ desc = "A professional black jacket with a mundane brown skirt. Perfect for the office."
+ icon = 'icons/clothing/uniform/formal/suits/businessskirt_female.dmi'
+ icon_state = "businessskirt_female"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/formal/tajaran_formal.dm b/code/modules/clothing/under/formal/tajaran_formal.dm
new file mode 100644
index 00000000000..c1a8958490e
--- /dev/null
+++ b/code/modules/clothing/under/formal/tajaran_formal.dm
@@ -0,0 +1,176 @@
+/**
+ * catman dress clothes
+ */
+
+/obj/item/clothing/under/tajaran/fancy
+ name = "fancy uniform"
+ desc = "Worn by princes, barons and lords of Adhomai, now in stores near you!"
+ icon = 'icons/clothing/uniform/formal/tajaran/male_taj_fancy.dmi'
+ icon_state = "male_taj_fancy"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tajaran/fancy/alt1
+ icon = 'icons/clothing/uniform/formal/tajaran/male_taj_fancy_alt1.dmi'
+ icon_state = "male_taj_fancy_alt1"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tajaran/fancy/alt2
+ icon = 'icons/clothing/uniform/formal/tajaran/male_taj_fancy_alt2.dmi'
+ icon_state = "male_taj_fancy_alt2"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tajaran/summer
+ name = "adhomian summerwear"
+ desc = "A simple piece of adhomian summerwear made with linen."
+ icon = 'icons/clothing/uniform/formal/tajaran/summerwear.dmi'
+ icon_state = "summerwear"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/tajaran
+ name = "fancy adhomian dress"
+ desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is white."
+ icon = 'icons/clothing/uniform/formal/tajaran/taj_dress_white.dmi'
+ icon_state = "taj_dress_white"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/tajaran/blue
+ name = "blue fancy adhomian dress"
+ desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is blue."
+ icon = 'icons/clothing/uniform/formal/tajaran/taj_dress_skyblue.dmi'
+ icon_state = "taj_dress_skyblue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/tajaran/green
+ name = "green fancy adhomian dress"
+ desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is green."
+ icon = 'icons/clothing/uniform/formal/tajaran/taj_dress_green.dmi'
+ icon_state = "taj_dress_green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/tajaran/red
+ name = "red fancy adhomian dress"
+ desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is red."
+ icon = 'icons/clothing/uniform/formal/tajaran/taj_dress_red.dmi'
+ icon_state = "taj_dress_red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/tajaran/fancy
+ name = "red noble adhomian dress"
+ desc = "The classical dress of the Adhomian royalty, only to be worn during the special occassions. This one is crimson red."
+ icon = 'icons/clothing/uniform/formal/tajaran/taj_dress_fancy.dmi'
+ icon_state = "taj_dress_fancy"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/tajaran/fancy/black
+ name = "black noble adhomian dress"
+ desc = "The classical dress of the Adhomian royalty, only to be worn during the special occassions. This one is dark black."
+ icon = 'icons/clothing/uniform/formal/tajaran/taj_dress_fancy_dark.dmi'
+ icon_state = "taj_dress_fancy_dark"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/tajaran/formal
+ name = "fancy adhomian uniform with skirt"
+ desc = "Formal Tajaran clothing with a skirt."
+ icon = 'icons/clothing/uniform/formal/tajaran/female_taj_fancy.dmi'
+ icon_state = "female_taj_fancy"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/tajaran/formal/alt1
+ name = "fancy adhomian uniform with skirt, alt1"
+ icon = 'icons/clothing/uniform/formal/tajaran/female_taj_fancy_alt1.dmi'
+ icon_state = "female_taj_fancy_alt1"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/dress/tajaran/formal/alt2
+ name = "fancy adhomian uniform with skirt, alt2"
+ icon = 'icons/clothing/uniform/formal/tajaran/female_taj_fancy_alt2.dmi'
+ icon_state = "female_taj_fancy_alt2"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tajaran/summer/dress
+ name = "adhomian summer dress"
+ desc = "An Adhomian dress usually worn during the summer."
+ icon = 'icons/clothing/uniform/formal/tajaran/summer-dress.dmi'
+ icon_state = "summer-dress"
+ body_cover_flags = LOWER_TORSO
+ starting_accessories = list(/obj/item/clothing/accessory/tajaran/summershirt)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tajaran/summer/pants
+ name = "adhomian summer pants"
+ desc = "A pair of adhomian pants usually worn during the summer."
+ icon = 'icons/clothing/uniform/formal/tajaran/summer-pants.dmi'
+ icon_state = "summer-pants"
+ starting_accessories = list(/obj/item/clothing/accessory/tajaran/summershirt)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/tajaran/nka_noble
+ name = "noble adhomian clothes"
+ desc = "Clothes frequently worn by the New Kingdom's nobles. Likely a hand-me-down."
+ icon = 'icons/clothing/uniform/formal/tajaran/nka_noble_uniform.dmi'
+ icon_state = "nka_noble_uniform"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/formal/wedding.dm b/code/modules/clothing/under/formal/wedding.dm
new file mode 100644
index 00000000000..ea40ba3f5c5
--- /dev/null
+++ b/code/modules/clothing/under/formal/wedding.dm
@@ -0,0 +1,57 @@
+/**
+ * wedding stuff
+ */
+
+/obj/item/clothing/under/wedding
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
+
+/obj/item/clothing/under/wedding/bride_orange
+ name = "orange wedding dress"
+ desc = "A big and puffy orange dress."
+ icon = 'icons/clothing/uniform/formal/dress/bride_orange.dmi'
+ icon_state = "bride_orange"
+ inv_hide_flags = HIDESHOES
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/wedding/bride_purple
+ name = "purple wedding dress"
+ desc = "A big and puffy purple dress."
+ icon = 'icons/clothing/uniform/formal/dress/bride_purple.dmi'
+ icon_state = "bride_purple"
+ inv_hide_flags = HIDESHOES
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/wedding/bride_blue
+ name = "blue wedding dress"
+ desc = "A big and puffy blue dress."
+ icon = 'icons/clothing/uniform/formal/dress/bride_blue.dmi'
+ icon_state = "bride_blue"
+ inv_hide_flags = HIDESHOES
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/wedding/bride_red
+ name = "red wedding dress"
+ desc = "A big and puffy red dress."
+ icon = 'icons/clothing/uniform/formal/dress/bride_red.dmi'
+ icon_state = "bride_red"
+ inv_hide_flags = HIDESHOES
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/wedding/bride_white
+ name = "silky wedding dress"
+ desc = "A white wedding gown made from the finest silk."
+ icon = 'icons/clothing/uniform/formal/dress/bride_white.dmi'
+ icon_state = "bride_white"
+ inv_hide_flags = HIDESHOES
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/gear_harness.dm b/code/modules/clothing/under/gear_harness.dm
deleted file mode 100644
index e33c229ae82..00000000000
--- a/code/modules/clothing/under/gear_harness.dm
+++ /dev/null
@@ -1,25 +0,0 @@
-/obj/item/clothing/under/gear_harness
- name = "gear harness"
- desc = "How... minimalist."
- icon_state = "gear_harness"
- body_cover_flags = NONE
-
-/obj/item/clothing/under/gear_harness/style_repick_query(mob/user)
- . = ..()
- var/image/normal_image = image(icon, "gear_harness")
- normal_image.maptext = MAPTEXT("normal")
- .["normal"] = normal_image
- var/image/invisible_image = image('icons/system/blank_32x32.dmi', "")
- invisible_image.maptext = MAPTEXT("invisible")
- .["invisible"] = invisible_image
-
-/obj/item/clothing/under/gear_harness/style_repick_set(style, mob/user)
- switch(style)
- if("normal")
- worn_render_flags = initial(worn_render_flags)
- return TRUE
- if("invisible")
- worn_render_flags |= WORN_RENDER_SLOT_NO_RENDER
- return TRUE
- else
- return FALSE
diff --git a/code/modules/clothing/under/imperial_vr.dm b/code/modules/clothing/under/imperial_vr.dm
deleted file mode 100644
index c0646be613c..00000000000
--- a/code/modules/clothing/under/imperial_vr.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/obj/item/clothing/under/imperial
- desc = "imperial military jumpsuit"
- icon_state = "crimson"
- item_state = "crimson"
diff --git a/code/modules/clothing/under/jobs/centcom.dm b/code/modules/clothing/under/jobs/centcom.dm
deleted file mode 100644
index a16c541aee9..00000000000
--- a/code/modules/clothing/under/jobs/centcom.dm
+++ /dev/null
@@ -1,86 +0,0 @@
-/obj/item/clothing/under/rank/centcom
- name = "\improper CentCom Officer uniform"
- desc = "The formal uniform of the Central Command Officer. Striking and recognizable, it radiates authority."
- icon_state = "officer"
-
-/obj/item/clothing/under/rank/centcom/fem
- icon_state = "officer_fem"
-
-/obj/item/clothing/under/rank/centcom/representative
- name = "\improper CentCom Representative uniform"
- desc = "The formal uniform of the Central Command Representative. These guys must be really important."
- icon_state = "centcom"
-
-/obj/item/clothing/under/rank/centcom/representative/fem
- name = "\improper CentCom Representative uniform"
- desc = "The formal uniform of the Central Command Representative. These guys must be really important."
- icon_state = "centcom_fem"
-
-/obj/item/clothing/under/rank/centcom/green
- icon = 'icons/obj/clothing/under/centcom.dmi'
- icon_override = 'icons/mob/clothing/under/centcom.dmi'
- displays_id = FALSE
-
-/obj/item/clothing/under/rank/centcom/green/commander
- name = "\improper CentCom officer's suit"
- desc = "It's a suit worn by CentCom's highest-tier Commanders."
- icon_state = "centcom"
-
-/obj/item/clothing/under/rank/centcom/green/intern
- name = "\improper CentCom intern's jumpsuit"
- desc = "It's a jumpsuit worn by those interning for CentCom. The top is styled after a polo shirt for easy identification."
- icon_state = "intern"
-
-/obj/item/clothing/under/rank/centcom/green/officer
- name = "\improper CentCom turtleneck suit"
- desc = "A casual, yet refined green turtleneck, used by CentCom Officials. It has a fragrance of aloe."
- icon_state = "officer"
-
-/obj/item/clothing/under/rank/centcom/green/officer/replica
- name = "\improper CentCom turtleneck replica"
- desc = "A cheap copy of the CentCom turtleneck! A Donk Co. logo can be seen on the collar."
-
-/obj/item/clothing/under/rank/centcom/green/officer_skirt
- name = "\improper CentCom turtleneck skirt"
- desc = "A skirt version of the CentCom turtleneck, rarer and more sought after than the original."
- icon_state = "officer_skirt"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/rank/centcom/green/officer_skirt/replica
- name = "\improper CentCom turtleneck skirt replica"
- desc = "A cheap copy of the CentCom turtleneck skirt! A Donk Co. logo can be seen on the collar."
-
-/obj/item/clothing/under/rank/centcom/green/centcom_skirt
- name = "\improper CentCom officer's suitskirt"
- desc = "It's a suitskirt worn by CentCom's highest-tier Commanders."
- icon_state = "centcom_skirt"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/rank/centcom/military
- name = "tactical combat uniform"
- desc = "A dark colored uniform worn by CentCom's conscripted military forces."
- icon_state = "military"
- armor_type = /datum/armor/military/jumpsuit
-
-/obj/item/clothing/under/rank/centcom/military/eng
- name = "tactical engineering uniform"
- desc = "A dark colored uniform worn by CentCom's regular military engineers."
- icon_state = "military_eng"
-
-/obj/item/clothing/under/ert
- name = "ERT tactical uniform"
- desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. It looks very tactical."
- icon_state = "ert_uniform"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
-
-/obj/item/clothing/under/gov
- desc = "A neat proper uniform of someone on offical business. The collar is immaculately starched."
- name = "Green formal uniform"
- icon_state = "greensuit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "centcom", SLOT_ID_LEFT_HAND = "centcom")
- starting_accessories = list(/obj/item/clothing/accessory/tie/darkgreen)
-
-/obj/item/clothing/under/gov/skirt
- name = "Green formal skirt uniform"
- desc = "A neat proper uniform of someone on offical business. The top button is sewn shut."
- icon_state = "greensuit_skirt"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
deleted file mode 100644
index 0f634b624d8..00000000000
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ /dev/null
@@ -1,281 +0,0 @@
-//Alphabetical order of civilian jobs.
-
-/obj/item/clothing/under/rank/bartender
- desc = "It looks like it could use some more flair."
- name = "bartender's uniform"
- icon_state = "ba_suit"
-
-/obj/item/clothing/under/rank/bartender/skirt
- desc = "Short and cute."
- name = "bartender's skirt"
- icon_state = "ba_suit_skirt"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "ba_suit", SLOT_ID_LEFT_HAND = "ba_suit")
-
-/obj/item/clothing/under/rank/bartender/skirt_pleated
- name = "bartender's pleated skirt"
- desc = "Short, and to the point."
- icon_state = "barman_skirt"
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
- desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Facility Director\"."
- name = "Facility Director's jumpsuit"
- icon_state = "captain"
-
-/obj/item/clothing/under/rank/captain/talon
- desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
- name = "Talon captain's jumpsuit"
-
-/obj/item/clothing/under/rank/captain/skirt_pleated
- name = "captain's pleated skirt"
- icon_state = "captain_skirt"
-
-/obj/item/clothing/under/rank/cargo
- name = "quartermaster's jumpsuit"
- desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
- icon_state = "qm"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "cargo", SLOT_ID_LEFT_HAND = "cargo")
-
-/obj/item/clothing/under/rank/cargo/skirt_pleated
- name = "quartermaster's pleated skirt"
- desc = "Skiiiiiirt! It's pleated!"
- icon_state = "qm_skirt"
-
-/obj/item/clothing/under/rank/cargo/jeans
- name = "quartermaster's jumpjeans"
- desc = "Jeeeaaans! They're comfy!"
- icon_state = "qmj"
-
-/obj/item/clothing/under/rank/cargo/jeans/female
- name = "quartermaster's jumpjeans"
- desc = "Jeeeaaans! They're comfy!"
- icon_state = "qmjf"
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/cargotech
- name = "cargo technician's jumpsuit"
- desc = "Shooooorts! They're comfy and easy to wear!"
- icon_state = "cargo"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/rank/cargotech/jeans
- name = "cargo technician's jumpjeans"
- desc = "Jeeeaaans! They're comfy!"
- icon_state = "cargoj"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "cargo", SLOT_ID_LEFT_HAND = "cargo")
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/cargotech/jeans/female
- name = "cargo technician's jumpjeans"
- desc = "Jeeeaaans! They're comfy!"
- icon_state = "cargojf"
-
-/obj/item/clothing/under/rank/cargotech/skirt_pleated
- name = "cargo technician's pleated skirt"
- desc = "Skiiiiiirt! It's pleated!"
- icon_state = "cargo_skirt"
-
-/obj/item/clothing/under/rank/chaplain
- desc = "It's a black jumpsuit, often worn by religious folk."
- name = "chaplain's jumpsuit"
- icon_state = "chaplain"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
-
-/obj/item/clothing/under/rank/chaplain/skirt_pleated
- name = "chaplain's pleated skirt"
- icon_state = "chaplain_skirt"
-
-/obj/item/clothing/under/rank/chef
- desc = "It's an apron which is given only to the most hardcore chefs in space."
- name = "chef's uniform"
- icon_state = "chef"
-
-/obj/item/clothing/under/rank/chef/skirt_pleated
- name = "chef's pleated skirt"
- desc = "It's a skirt of which is given only to the most ludicrous of spacebound chefs."
- icon_state = "chef_skirt"
-
-/obj/item/clothing/under/rank/clown
- name = "clown suit"
- desc = "Honk!"
- icon_state = "clown"
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/head_of_personnel
- desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
- name = "head of personnel's jumpsuit"
- icon_state = "hop"
-
-/obj/item/clothing/under/rank/head_of_personnel/skirt_pleated
- name = "head of personnel's pleated skirt"
- desc = "A semi formal uniform given only to Heads of Personnel."
- icon_state = "hop_skirt"
-
-/obj/item/clothing/under/rank/head_of_personnel_whimsy
- desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
- name = "head of personnel's suit"
- icon_state = "hopwhimsy"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "hop", SLOT_ID_LEFT_HAND = "hop")
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/hydroponics
- desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
- name = "botanist's jumpsuit"
- icon_state = "hydroponics"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "green", SLOT_ID_LEFT_HAND = "green")
- permeability_coefficient = 0.50
-
-/obj/item/clothing/under/rank/hydroponics/skirt_pleated
- name = "botanist's pleated skirt"
- icon_state = "hydroponics_skirt"
-
-/obj/item/clothing/under/rank/internalaffairs
- desc = "The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched."
- name = "Internal Affairs uniform"
- icon_state = "internalaffairs"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "ba_suit", SLOT_ID_LEFT_HAND = "ba_suit")
- starting_accessories = list(/obj/item/clothing/accessory/tie/black)
-
-/obj/item/clothing/under/rank/internalaffairs/skirt
- desc = "The plain, professional attire of an Internal Affairs Agent. The top button is sewn shut."
- name = "Internal Affairs skirt"
- icon_state = "internalaffairs_skirt"
-
-/obj/item/clothing/under/rank/janitor
- desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
- name = "janitor's jumpsuit"
- icon_state = "janitor"
- armor_type = /datum/armor/civilian/jumpsuit/janitor
-
-/obj/item/clothing/under/rank/janitor_fem
- name = "janitor's jumpsuit"
- desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
- icon_state = "janitor_fem"
- armor_type = /datum/armor/civilian/jumpsuit/janitor
-
-/obj/item/clothing/under/rank/janitor/skirt_pleated
- name = "janitor's pleated skirt"
- desc = "The official pleated skirt of the local janitor. It bears minor protection from biohazards."
- icon_state = "janitor_skirt"
- armor_type = /datum/armor/civilian/jumpsuit/janitor
-
-/obj/item/clothing/under/lawyer
- desc = "Slick threads."
- name = "lawyer suit"
-
-/obj/item/clothing/under/lawyer/black
- name = "black lawyer suit"
- icon_state = "lawyer_black"
-
-/obj/item/clothing/under/lawyer/black/skirt
- name = "black lawyer skirt"
- icon_state = "lawyer_black_skirt"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_black", SLOT_ID_LEFT_HAND = "lawyer_black")
-
-/obj/item/clothing/under/lawyer/female
- name = "black lawyer suit"
- icon_state = "black_suit_fem"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_black", SLOT_ID_LEFT_HAND = "lawyer_black")
-
-/obj/item/clothing/under/lawyer/red
- name = "red lawyer suit"
- icon_state = "lawyer_red"
-
-/obj/item/clothing/under/lawyer/red/skirt
- name = "red lawyer skirt"
- icon_state = "lawyer_red_skirt"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_red", SLOT_ID_LEFT_HAND = "lawyer_red")
-
-/obj/item/clothing/under/lawyer/blue
- name = "blue lawyer suit"
- icon_state = "lawyer_blue"
-
-/obj/item/clothing/under/lawyer/blue/skirt
- name = "blue lawyer skirt"
- icon_state = "lawyer_blue_skirt"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_blue", SLOT_ID_LEFT_HAND = "lawyer_blue")
-
-/obj/item/clothing/under/lawyer/bluesuit
- name = "blue suit"
- desc = "A classy suit."
- icon_state = "bluesuit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_blue", SLOT_ID_LEFT_HAND = "lawyer_blue")
- starting_accessories = list(/obj/item/clothing/accessory/tie/red)
-
-/obj/item/clothing/under/lawyer/bluesuit/skirt
- name = "blue skirt suit"
- icon_state = "bluesuit_skirt"
-
-/obj/item/clothing/under/lawyer/purpsuit
- name = "purple suit"
- icon_state = "lawyer_purp"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "purple", SLOT_ID_LEFT_HAND = "purple")
-
-/obj/item/clothing/under/lawyer/purpsuit/skirt
- name = "purple skirt suit"
- icon_state = "lawyer_purp_skirt"
-
-/obj/item/clothing/under/lawyer/oldman
- name = "Old Man's Suit"
- desc = "A classic suit for the older gentleman, with built in back support."
- icon_state = "oldman"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "johnny", SLOT_ID_LEFT_HAND = "johnny")
-
-/obj/item/clothing/under/oldwoman
- name = "Old Woman's Attire"
- desc = "A typical outfit for the older woman, a lovely cardigan and comfortable skirt."
- icon_state = "oldwoman"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "johnny", SLOT_ID_LEFT_HAND = "johnny")
-
-/obj/item/clothing/under/librarian
- name = "sensible suit"
- desc = "It's very... sensible."
- icon_state = "red_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_red", SLOT_ID_LEFT_HAND = "lawyer_red")
-
-/obj/item/clothing/under/mime
- name = "mime's outfit"
- desc = "It's not very colourful."
- icon_state = "mime"
-
-/obj/item/clothing/under/rank/mime/skirt_pleated
- name = "mime's pleated skirt"
- icon_state = "mime_skirt"
-
-/obj/item/clothing/under/rank/miner
- desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
- name = "shaft miner's jumpsuit"
- icon_state = "miner"
-
-//Pilot
-/obj/item/clothing/under/rank/pilot1
- name = "\improper Nanotrasen flight suit"
- desc = "A blue and grey Nanotrasen flight suit. Warm and practical, it feels cozy."
- icon_state = "flight1"
- icon = 'icons/clothing/uniform/rank/flight.dmi'
- starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1)
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_NO_RENDER
- worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
- worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
- worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/rank/pilot2
- name = "\improper Nanotrasen flight suit"
- desc = "A dark blue Nanotrasen flight suit. Warm and practical, several patches are scattered across it."
- icon_state = "flight2"
- icon = 'icons/clothing/uniform/rank/flight.dmi'
- starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot2)
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_NO_RENDER
- worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
- worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
- worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-// The things folks do for fashion...
-/obj/item/clothing/under/rank/janitor/starcon
- name = "janitor's uniform"
- desc = "It's the official uniform of the station's janitor with minor modifications. It has minor protection from biohazards, but not from the harshness of space."
- icon_state = "janitor_sc"
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
deleted file mode 100644
index 0f040495f0d..00000000000
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ /dev/null
@@ -1,95 +0,0 @@
-//Contains: Engineering department jumpsuits
-/obj/item/clothing/under/rank/chief_engineer
- desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
- name = "chief engineer's jumpsuit"
- icon_state = "chief"
- armor_type = /datum/armor/engineering/jumpsuit
-
-/obj/item/clothing/under/rank/chief_engineer/jeans
- name = "chief engineer's jumpjeans"
- desc = "Casual jeans and a high visibility top given to those more insane than those with the average CE jumpsuit. It bears minor radiation shielding."
- icon_state = "chiefj"
- armor_type = /datum/armor/engineering/jumpsuit
-
-/obj/item/clothing/under/rank/chief_engineer/fem_jeans
- name = "chief engineer's jumpjeans"
- desc = "Casual jeans and a high visibility top given to those more insane than those with the average CE jumpsuit. It bears minor radiation shielding."
- icon_state = "chiefjf"
- armor_type = /datum/armor/engineering/jumpsuit
-
-/obj/item/clothing/under/rank/chief_engineer/skirt_pleated
- name = "chief engineer's pleated skirt"
- desc = "It's a high visibility pleated skirt given to those insane enough to achieve the rank of 'Chief Engineer'. It comes with minor rediation shielding."
- icon_state = "chiefengineer_skirt"
- armor_type = /datum/armor/engineering/jumpsuit
-
-/obj/item/clothing/under/rank/atmospheric_technician
- desc = "It's a jumpsuit worn by atmospheric technicians."
- name = "atmospheric technician's jumpsuit"
- icon_state = "atmos"
-
-/obj/item/clothing/under/rank/atmospheric_technician/jeans
- name = "atmospheric technician's jumpjeans"
- desc = "Casual jeans worn by atmospherics technicians"
- icon_state = "atmosj"
-
-/obj/item/clothing/under/rank/atmospheric_technician/fem_jeans
- name = "atmospheric technician's jumpjeans"
- desc = "Casual jeans worn by atmospherics technicians"
- icon_state = "atmosjf"
-
-/obj/item/clothing/under/rank/atmospheric_technician/skirt_pleated
- name = "atmospheric technician's pleated skirt"
- desc = "A pleated skirt occassionally work by atmospheric technicians. Nothing too fancy, but it gets the job done."
- icon_state = "atmos_skirt"
-
-/obj/item/clothing/under/rank/engineer
- desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
- name = "engineer's jumpsuit"
- icon_state = "engine"
- armor_type = /datum/armor/engineering/jumpsuit
-
-/obj/item/clothing/under/rank/engineer/jeans
- name = "engineer's jumpjeans"
- desc = "Casual jeans and a sturdy shirt make for minor radiation shielding. The shirt has orange bands around the forearm, showing the wearer's an engineer."
- icon_state = "enginej"
- armor_type = /datum/armor/engineering/jumpsuit
-
-/obj/item/clothing/under/rank/engineer/fem_jeans
- name = "engineer's jumpjeans"
- desc = "Casual jeans and a sturdy shirt make for minor radiation shielding. The shirt is high visibility, showing the wearer's an engineer."
- icon_state = "enginejf"
- armor_type = /datum/armor/engineering/jumpsuit
-
-/obj/item/clothing/under/rank/engineer/skirt_pleated
- name = "engineer's pleated skirt"
- desc = "It's a high visibility pleated skirt worn by some engineers. It has minor radiation shielding."
- icon_state = "engine_skirt"
- armor_type = /datum/armor/engineering/jumpsuit
-
-/obj/item/clothing/under/rank/engineer/turtleneck
- name = "engineering turtleneck"
- desc = "It's a stylish turtleneck with minor radiation shielding. Nobody's going to see it behind the voidsuit, though."
- icon_state = "turtle_eng"
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/engineer/turtleneck_fem
- name = "engineering turtleneck"
- desc = "It's a stylish turtleneck with minor radiation shielding. Nobody's going to see it behind the voidsuit, thought."
- icon_state = "turtle_eng_fem"
-
-/obj/item/clothing/under/rank/roboticist
- desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
- name = "roboticist's jumpsuit"
- icon_state = "robotics"
-
-/obj/item/clothing/under/rank/roboticist/alt
- desc = "It's a slimming black jumpsuit with reinforced seams and a gold trim; great for industrial work."
- name = "roboticist's jumpsuit"
- icon_state = "robotics2"
-
-/obj/item/clothing/under/rank/roboticist/skirt_pleated
- name = "roboticist's pleated skirt"
- desc = "It's a slimming black pleated skirt with reinforced seams for a more active industrial workplace."
- icon_state = "robotics_skirt"
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
deleted file mode 100644
index 8a3a4a0cadf..00000000000
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Science
- */
-/obj/item/clothing/under/rank/research_director
- desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
- name = "research director's jumpsuit"
- icon_state = "director"
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/research_director/skirt_pleated
- name = "research director's pleated skirt"
- desc = "Feminine fashion for the style conscious RD. Its fabric provides minor protection from biological contaminants, and its pleated skirt provides extra style points."
- icon_state = "director_skirt"
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/research_director/skirt_pleated/whimsical
- name = "whimsical research director's pleated skirt"
- desc = "Whimsical attire for the more magical of RD's, providing minor protection from biological contaminants like it's nothing."
- icon_state = "rdwhimsy_skirt"
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/research_director/skirt_pleated/turtleneck
- name = "research director's turtleneck pleated skirt"
- desc = "A dark purple purple turtleneck and a pleated tan skirt, for a director of superior authority."
- icon_state = "rdturtle_skirt"
-
-/obj/item/clothing/under/rank/research_director/rdalt
- desc = "A dress suit and slacks stained with hard work and dedication to science. Perhaps other things as well, but mostly hard work and dedication."
- name = "head researcher uniform"
- icon_state = "rdalt"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "director", SLOT_ID_LEFT_HAND = "director")
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/research_director/dress_rd
- name = "research director dress uniform"
- desc = "Feminine fashion for the style conscious RD. Its fabric provides minor protection from biological contaminants."
- icon_state = "dress_rd"
- armor_type = /datum/armor/science/jumpsuit
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/rank/research_director/turtleneck
- desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style."
- name = "research director's turtleneck"
- icon_state = "rdturtle"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "director", SLOT_ID_LEFT_HAND = "director")
-
-/obj/item/clothing/under/rank/scientist
- desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
- name = "scientist's jumpsuit"
- icon_state = "science"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/scientist/jeans
- name = "scientist's jumpjeans"
- desc = "The perfect getup for the more laid-back researcher. Sadly, it doesn't seem to be as protective as its jumpsuit counterpart."
- icon_state = "sciencej"
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/scientist/femjeans
- name = "scientist's jumpjeans"
- desc = "The perfect getup for the more laid-back researcher. Sadly, it doesn't seem to be as protective as it's jumpsuit counterpart"
- icon_state = "sciencejf"
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/scientist/skirt_pleated
- name = "scientist's pleated skirt"
- desc = "It's made of a special fiber that provides minor protection against biohazards. Appropriately placed markings on the shoulders and pleated skirt denote the wearer as a scientist."
- icon_state = "toxins_skirt"
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/scientist/turtleneck
- name = "science turtleneck"
- desc = "It's a stylish turtleneck weaved with an explosive-resistant, comfortable mesh. You don't have to look like a dork to be a dork."
- icon_state = "turtle_sci"
- armor_type = /datum/armor/science/jumpsuit
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "purple", SLOT_ID_LEFT_HAND = "purple")
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/scientist/turtleneck_fem
- name = "science turtleneck"
- desc = "It's a stylish turtleneck weaved with an explosive-resistant, comfortable mesh. You don't have to look like a dork to be a dork."
- icon_state = "turtle_sci_fem"
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/chemist
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
- name = "chemist's jumpsuit"
- icon_state = "chemistry"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-/obj/item/clothing/under/rank/chemist/jeans
- name = "chemist's jumpjeans"
- desc = "Casual jeans and a coloured top with special protection against biohazards. It has chemist rank striping on the shoulders."
- icon_state = "chemistryj"
- armor_type = /datum/armor/medical/jumpsuit
-
-/obj/item/clothing/under/rank/chemist/fem_jeans
- name = "chemist's jumpjeans"
- desc = "Casual jeans and a coloured top with special protectiona gainst biohazards. It has chemist rank striping on the shoulders."
- icon_state = "chemistryjf"
- armor_type = /datum/armor/medical/jumpsuit
-
-/obj/item/clothing/under/rank/chemist/skirt_pleated
- name = "chemist's pleated skirt"
- desc = "It's made of a special fiber that gives special protection against biohazards. It even has bonus pleating!"
- icon_state = "chemistry_skirt"
- armor_type = /datum/armor/medical/jumpsuit
-
-/*
- * Medical
- */
-/obj/item/clothing/under/rank/chief_medical_officer
- desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
- name = "chief medical officer's jumpsuit"
- icon_state = "cmo"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/chief_medical_officer/skirt_pleated
- name = "chief medical officer's pleated skirt"
- desc = "A pleated skirt for the fashion conscious CMO, now with minor biological protection!"
- icon_state = "cmo_skirt"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/chief_medical_officer/turtleneck
- desc = "It's a turtleneck worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection, for an officer with a superior sense of style and practicality."
- name = "chief medical officer's turtleneck"
- icon_state = "cmoturtle"
-
-/obj/item/clothing/under/rank/chief_medical_officer/jeans
- name = "chief medical officer's jeans"
- desc = "A high-stress workplace should never revoke one's right to dress casual. The minor biological protection should do the trick well enough."
- icon_state = "cmoj"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/chief_medical_officer/fem_jeans
- name = "chief medical officer's jeans"
- desc = "A high-stress workplace should never revoke one's right to dress casual. The minor biological protection should do the trick well enough."
- icon_state = "cmojf"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/geneticist
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
- name = "geneticist's jumpsuit"
- icon_state = "genetics"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/geneticist/skirt_pleated
- name = "geneticist's pleated skirt"
- desc = "A pleated skirt for the ever forgotten geneticist."
- icon_state = "genetics_skirt"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/virologist
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
- name = "virologist's jumpsuit"
- icon_state = "virology"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/virologist/jeans
- name = "virologist's jumpjeans"
- desc = "A casual outfit made of special fibers that provide minor protection against biohazards. It has green striping on the shoulders that denote the wearer as a virologist."
- icon_state = "virologyj"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/virologist/fem_jeans
- name = "virologist's jumpjeans"
- desc = "A casual outfit made of special fibers that provide minor protection against biohazards. It has green striping on the shoulders that denote the wearer as a virologist."
- icon_state = "virologyjf"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/virologist/skirt_pleated
- name = "virologist's pleated skirt"
- desc = "It's made of a special fiber that gives special protection against biohazards. It even has bonus pleating!"
- icon_state = "virology_skirt"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/nursesuit
- desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
- name = "nurse's suit"
- icon_state = "nursesuit"
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/nurse
- desc = "A dress commonly worn by the nursing staff in the medical department."
- name = "nurse's dress"
- icon_state = "nurse"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "nursesuit", SLOT_ID_LEFT_HAND = "nursesuit")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/orderly
- desc = "A white suit to be worn by medical attendants."
- name = "orderly's uniform"
- icon_state = "orderly"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "nursesuit", SLOT_ID_LEFT_HAND = "nursesuit")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical
- desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
- name = "medical doctor's jumpsuit"
- icon_state = "medical"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/jeans
- name = "medical doctor's jeans"
- desc = "A casual outfit made of special fibers that provide minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
- icon_state = "medicalj"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/fem_jeans
- name = "medical doctor's jeans"
- desc = "A casual outfit made of special fibers that provide minor protection against biohazards. It has a cross on the chest denoting that th wearer is trained medical personnel."
- icon_state = "medicaljf"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/skirt_pleated
- name = "medical doctor's pleated skirt"
- desc = "It's made of a special fiber that provides minor protection against biohazards. Its themed pleating and the cross on the chest denotes that the wearer is trained medical personnel."
- icon_state = "medical_skirt"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/turtleneck
- name = "medical turtleneck"
- desc = "It's a stylish turtleneck made of bioresistant fiber. Look good, save lives- what more could you want?"
- icon_state = "turtle_med"
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/medical/turtleneck_fem
- name = "medical turtleneck"
- desc = "It's a stylish turtleneck made of bioresistant fiber. Look good, save lives- what more could you want?"
- icon_state = "turtle_med_fem"
-
-/obj/item/clothing/under/rank/medical/paramedic
- name = "short sleeve medical jumpsuit"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one has a cross on the chest denoting that the wearer is trained medical personnel."
- icon_state = "medical_short"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/medical/scrubs
- name = "blue scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
- icon_state = "scrubsblue"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/scrubs_fem
- name = "blue scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
- icon_state = "scrubsblue_fem"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/scrubs/green
- name = "green scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
- icon_state = "scrubsgreen"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "green", SLOT_ID_LEFT_HAND = "green")
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/scrubs_fem/green
- name = "green scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
- icon_state = "scrubsgreen_fem"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/scrubs/purple
- name = "purple scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
- icon_state = "scrubspurple"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "purple", SLOT_ID_LEFT_HAND = "purple")
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/scrubs_fem/purple
- name = "purple scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
- icon_state = "scrubspurple_fem"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/scrubs/black
- name = "black scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in black."
- icon_state = "scrubsblack"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/scrubs_fem/black
- name = "black scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in black."
- icon_state = "scrubsblack_fem"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/scrubs/navyblue
- name = "navy blue scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in navy blue."
- icon_state = "scrubsnavyblue"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/medical/scrubs_fem/navyblue
- name = "navy blue scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in navy blue."
- icon_state = "scrubsnavyblue_fem"
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/psych
- desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
- name = "psychiatrist's jumpsuit"
- icon_state = "psych"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
-
-/obj/item/clothing/under/rank/psych/turtleneck
- desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
- name = "psychologist's turtleneck"
- icon_state = "psychturtle"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "psyche", SLOT_ID_LEFT_HAND = "psyche")
-
-/obj/item/clothing/under/rank/psych/turtleneck_fem
- name = "psychologist's turtleneck"
- desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
- icon_state = "psychturtle"
-
-/*
- * Medsci, unused (i think) stuff
- */
-/obj/item/clothing/under/rank/geneticist_new
- desc = "It's made of a special fiber which provides minor protection against biohazards."
- name = "geneticist's jumpsuit"
- icon_state = "genetics_new"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/chemist_new
- desc = "It's made of a special fiber which provides minor protection against biohazards."
- name = "chemist's jumpsuit"
- icon_state = "chemist_new"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-
-/obj/item/clothing/under/rank/scientist_new
- desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
- name = "scientist's jumpsuit"
- icon_state = "scientist_new"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/virologist_new
- desc = "Made of a special fiber that gives increased protection against biohazards."
- name = "virologist's jumpsuit"
- icon_state = "virologist_new"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
diff --git a/code/modules/clothing/under/jobs/miscellaneous_vr.dm b/code/modules/clothing/under/jobs/miscellaneous_vr.dm
deleted file mode 100644
index 08a2b86ff0a..00000000000
--- a/code/modules/clothing/under/jobs/miscellaneous_vr.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/obj/item/clothing/under/permit
- desc = "This permit entitles the bearer to conduct their duties without a uniform, so long as they are furred or have no visible genitalia."
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
deleted file mode 100644
index de6d3f189dc..00000000000
--- a/code/modules/clothing/under/jobs/security.dm
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Contains:
- * Security
- * Detective
- * Head of Security
- */
-
-/*
- * Security
- */
-/obj/item/clothing/under/rank/warden
- desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
- name = "warden's jumpsuit"
- icon_state = "warden"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
- armor_type = /datum/armor/station/padded
- siemens_coefficient = 0.9
-
-/obj/item/clothing/under/rank/warden_fem
- name = "warden's jumpsuit"
- desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
- icon_state = "warden_fem"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/warden/skirt_pleated
- name = "warden's pleated skirt"
- desc = "A pleated skirt made up of a slightly sturdier material than your average jumpsuit. It has the word 'Warden' writton on the shoulders."
- icon_state = "rwarden_skirt"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/security
- name = "security officer's jumpsuit"
- desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
- icon_state = "security"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
- armor_type = /datum/armor/station/padded
- siemens_coefficient = 0.9
-
-/obj/item/clothing/under/rank/security_fem
- name = "security officer's jumpsuit"
- desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
- icon_state = "security_fem"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/security/skirt_pleated
- name = "security officer's pleated skirt"
- desc = "A pleated skirt made up of a slightly sturdier material than most jumpsuits, allowing more robust protection."
- icon_state = "sec_skirt"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/security/turtleneck
- name = "security turtleneck"
- desc = "It's a stylish turtleneck made of a robust nanoweave. Nobody said the Law couldn't be fashionable."
- icon_state = "turtle_sec"
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/rank/security/turtleneck_fem
- name = "security turtleneck"
- desc = "It's a stylish turtleneckf made of a robust nanoweave. Nobody said the Law couldn't be fashionable."
- icon_state = "turtle_sec_fem"
-
-/obj/item/clothing/under/rank/dispatch
- name = "dispatcher's uniform"
- desc = "A dress shirt and khakis with a security patch sewn on."
- icon_state = "dispatch"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "detective", SLOT_ID_LEFT_HAND = "detective")
- armor_type = /datum/armor/station/padded
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
- siemens_coefficient = 0.9
-
-/obj/item/clothing/under/rank/security2
- name = "security officer's uniform"
- desc = "It's made of a slightly sturdier material, to allow for robust protection."
- icon_state = "redshirt2"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
- armor_type = /datum/armor/station/padded
- siemens_coefficient = 0.9
-
-/obj/item/clothing/under/rank/security2_fem
- name = "security officer's uniform"
- desc = "It's made of a slightly sturdier material, to allow for robust protection."
- icon_state = "redshirt2_fem"
-
-/obj/item/clothing/under/rank/security/corp
- icon_state = "sec_corporate"
- name = "security officer's corporate uniform"
- desc = "A corporate standard uniform made of a slightly sturdier material, to allow for robust protection."
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
-
-/obj/item/clothing/under/rank/security/corp_fem
- name = "security officer's corporate uniform"
- desc = "A corporate standard uniform made of a slightly sturdier material, to allow for robust protection."
- icon_state = "sec_corporate_fem"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/warden/corp
- icon_state = "warden_corporate"
- name = "warden's corporate uniform"
- desc = "A corporate standard uniform made of a slightly sturdier material, to allow for robust protection. It has the word \"Warden\" on the shoulders."
- armor_type = /datum/armor/station/padded
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
-
-/obj/item/clothing/under/rank/warden/corp_fem
- name = "warden's corporate uniform"
- desc = "A corporate standard uniform made of a slightly sturdier material, to allow for robust protection. It has the word \"Warden\" on the shoulders."
- icon_state = "warden_corporate_fem"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/tactical
- name = "tactical jumpsuit"
- desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
- icon_state = "swatunder"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "green", SLOT_ID_LEFT_HAND = "green")
- armor_type = /datum/armor/station/padded
- siemens_coefficient = 0.9
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/*
- * Detective
- */
-/obj/item/clothing/under/det
- name = "detective's suit"
- desc = "A rumpled white dress shirt paired with well-worn grey slacks."
- icon_state = "detective"
- armor_type = /datum/armor/station/padded
- siemens_coefficient = 0.9
- starting_accessories = list(/obj/item/clothing/accessory/tie/blue_clip)
-
-/obj/item/clothing/under/det_fem
- name = "detective's suit"
- desc = "A rumpled white dress shirt paired with well-worn grey slacks."
- icon_state = "detective_fem"
- armor_type = /datum/armor/station/padded
-
-/*
-/obj/item/clothing/under/det/verb/rollup()
- set name = "Roll Suit Sleeves"
- set category = VERB_CATEGORY_OBJECT
- set src in usr
- var/unrolled = item_state_slots[SLOT_ID_UNIFORM] == initial(snowflake_worn_state)
- item_state_slots[SLOT_ID_UNIFORM] = unrolled ? "[snowflake_worn_state]_r" : initial(snowflake_worn_state)
- var/mob/living/carbon/human/H = loc
- H.update_inv_w_uniform(1)
- to_chat(H, "You roll the sleeves of your shirt [unrolled ? "up" : "down"]")
-*/
-/obj/item/clothing/under/det/grey
- name = "detective's tan suit"
- icon_state = "detective2"
- desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks."
- starting_accessories = list(/obj/item/clothing/accessory/tie/red_long)
-
-/obj/item/clothing/under/det/grey_fem
- name = "detective's tan suit"
- desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks."
- icon_state = "detective2_fem"
- starting_accessories = list(/obj/item/clothing/accessory/tie/red_long)
-
-/obj/item/clothing/under/det/grey/skirt_pleated
- name = "detective's grey pleated skirt"
- desc = "A sertous-looking pleated skirt paired with a freshly-pressed white shirt and a gold-clipped tie."
- icon_state = "greydet_skirt"
-
-/obj/item/clothing/under/det/black
- name = "detective's spiffy suit"
- icon_state = "detective3"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "sl_suit", SLOT_ID_LEFT_HAND = "sl_suit")
- desc = "An immaculate white dress shirt, paired with a pair of dark grey dress pants, a red tie, and a charcoal vest."
- starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/vest)
-
-/obj/item/clothing/under/det/black_fem
- name = "detective's spiffy suit"
- desc = "An immaculate white dress shirt, paired with a pair of dark grey dress pants, a red tie, and a charcoal vest."
- icon_state = "detective3_fem"
- starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/vest)
-
-/obj/item/clothing/under/det/corporate
- name = "detective's corporate jumpsuit"
- icon_state = "det_corporate"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
- desc = "A more modern uniform for corporate investigators."
-
-/obj/item/clothing/under/det/corporate_fem
- name = "detective's corporate jumpsuit"
- desc = "A more modern uniform for coroprate investigators."
- icon_state = "det_corporate_fem"
-
-/obj/item/clothing/under/det/waistcoat
- icon_state = "detective"
- name = "detective's semi-tidy suit"
- desc = "A rumpled white dress shirt paired with well-worn grey slacks, complete with a blue striped tie, faux-gold tie clip, and waistcoat."
- starting_accessories = list(/obj/item/clothing/accessory/tie/blue_clip, /obj/item/clothing/accessory/wcoat)
-
-/obj/item/clothing/under/det/waistcoat_fem
- name = "detective's semi-tidy suit"
- desc = "A rumpled white dress shirt paired with well-worn grey slacks, complete with a blue striped tie, faux-gold tie clip, and waistcoat."
- icon_state = "detective_fem"
- starting_accessories = list(/obj/item/clothing/accessory/tie/blue_clip, /obj/item/clothing/accessory/wcoat)
-
-/obj/item/clothing/under/det/grey/waistcoat
- icon_state = "detective2"
- name = "detective's serious suit"
- desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie and waistcoat."
- starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/wcoat)
-
-/obj/item/clothing/under/det/grey/waistcoat_fem
- name = "detective's serious suit"
- desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie and waistcoat."
- icon_state = "detective2_fem"
- starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/wcoat)
-
-/obj/item/clothing/under/det/skirt
- name = "detective's skirt"
- icon_state = "detective_skirt"
- desc = "A serious-looking white blouse paired with a formal black pencil skirt."
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "sl_suit", SLOT_ID_LEFT_HAND = "sl_suit")
-
-/*
- * Head of Security
- */
-/obj/item/clothing/under/rank/head_of_security
- desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
- name = "head of security's jumpsuit"
- icon_state = "hos"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
- armor_type = /datum/armor/station/padded
- siemens_coefficient = 0.9
-
-/obj/item/clothing/under/rank/head_of_security_fem
- name = "head of security's jumpsuit"
- desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armour to protect the wearer."
- icon_state = "hos_fem"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/head_of_security/skirt_pleated
- name = "head of security's pleated skirt"
- desc = "A pleated skirt worn by those few with the dedication to achieve the position of 'Head of Security'. It bears additional armour to protect the wearer."
- icon_state = "rhos_skirt"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/head_of_security/skirt_pleated/alt
- name = "dark head of security's pleated skirt"
- desc = "A pleated skirt worn by those few with the dedication to achieve the position of 'Head of Security'. It bears additional armour to protect the wearer."
- icon_state = "hosalt_skirt"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/head_of_security/corp
- name = "head of security's corporate jumpsuit"
- desc = "A clean jumpsuit to corporate standard, worn by those few with the dedication to achieve the position of \"Head of Security\"."
- icon_state = "hos_corporate"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
-
-/obj/item/clothing/under/rank/head_of_security/corp_fem
- name = "head of security's corporate jumpsuit"
- desc = "A clean jumpsuit to corporate standard, worn by those few with the dedication to achieve the position of \"Head of Security\""
- icon_state = "hos_corporate_fem"
-
-/obj/item/clothing/under/rank/head_of_security/turtleneck
- name = "head of security's turtleneck"
- desc = "A stylish alternative to the normal head of security jumpsuit, complete with tactical pants."
- icon_state = "hosturtle"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
-
-//Jensen cosplay gear
-/obj/item/clothing/under/rank/head_of_security/jensen
- desc = "You never asked for anything that stylish."
- name = "head of security's jumpsuit"
- icon_state = "jensen"
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/*
- * Navy uniforms
- */
-/obj/item/clothing/under/rank/security/navyblue
- name = "security officer's uniform"
- desc = "The latest in fashionable security outfits."
- icon_state = "officerblueclothes"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "ba_suit", SLOT_ID_LEFT_HAND = "ba_suit")
-
-/obj/item/clothing/under/rank/security/navyblue_fem
- name = "security officer's uniform"
- desc = "The latest in fashionable security outfits."
- icon_state = "officerblueclothes_fem"
-
-/obj/item/clothing/under/rank/head_of_security/navyblue
- desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security."
- name = "head of security's uniform"
- icon_state = "hosblueclothes"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "ba_suit", SLOT_ID_LEFT_HAND = "ba_suit")
-
-/obj/item/clothing/under/rank/head_of_security/navyblue_fem
- name = "head of security's uniform"
- desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security."
- icon_state = "hosblueclothes_fem"
-
-/obj/item/clothing/under/rank/warden/navyblue
- desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
- name = "warden's uniform"
- icon_state = "wardenblueclothes"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "ba_suit", SLOT_ID_LEFT_HAND = "ba_suit")
-
-/obj/item/clothing/under/rank/warden/navyblue_fem
- name = "warden's uniform"
- desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
- icon_state = "wardenblueclothes_fem"
diff --git a/code/modules/clothing/under/misc.dm b/code/modules/clothing/under/misc.dm
deleted file mode 100644
index 7fad7786c70..00000000000
--- a/code/modules/clothing/under/misc.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-
-//Misc
-
-/obj/item/clothing/under/hazard
- name = "hazard jumpsuit"
- desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
- icon_state = "hazard"
- snowflake_worn_state = "hazard"
- siemens_coefficient = 0.8
- armor_type = /datum/armor/engineering/jumpsuit
- max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-
-/obj/item/clothing/under/sterile
- name = "sterile jumpsuit"
- desc = "A sterile white jumpsuit with medical markings. Protects against all manner of biohazards."
- icon_state = "sterile"
- snowflake_worn_state = "sterile"
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-//Pirate Mate Fatigues
-/obj/item/clothing/under/worn_fatigues
- name = "special ops fatigues"
- desc = "These worn fatigues match the pattern known to be used by JSDF Marine Corps special forces."
- icon_state = "russobluecamo"
-
-/obj/item/clothing/under/onestar
- name = "one star jumpsuit"
- desc = "A jumpsuit in One Star colours."
- icon = 'icons/clothing/uniform/misc/onestar.dmi'
- icon_state = "os_jumpsuit"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
deleted file mode 100644
index 60dd88a1f4b..00000000000
--- a/code/modules/clothing/under/miscellaneous.dm
+++ /dev/null
@@ -1,2536 +0,0 @@
-/obj/item/clothing/under/pj/red
- name = "red pj's"
- desc = "Sleepwear."
- icon_state = "red_pyjamas"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
-
-/obj/item/clothing/under/pj/red_fem
- name = "red pj's"
- desc = "Sleepwear."
- icon_state = "red_pyjamas_fem"
-
-/obj/item/clothing/under/pj/blue
- name = "blue pj's"
- desc = "Sleepwear."
- icon_state = "blue_pyjamas"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
-
-/obj/item/clothing/under/pj/blue_fem
- name = "blue pj's"
- desc = "Sleepwear."
- icon_state = "blue_pyjamas_fem"
-
-/obj/item/clothing/under/captain_fly
- name = "rogue's uniform"
- desc = "For the man who doesn't care because he's still free."
- icon_state = "captain_fly"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
-
-/obj/item/clothing/under/scratch
- name = "white suit"
- desc = "A white suit, suitable for an excellent host"
- icon_state = "scratch"
-
-/obj/item/clothing/under/scratch/skirt
- name = "white skirt suit"
- icon_state = "scratch_skirt"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "scratch", SLOT_ID_LEFT_HAND = "scratch")
-
-/obj/item/clothing/under/sl_suit
- desc = "It's a very amish looking suit."
- name = "amish suit"
- icon_state = "sl_suit"
-
-/obj/item/clothing/under/waiter
- name = "waiter's outfit"
- desc = "It's a very smart uniform with a special pocket for tips."
- icon_state = "waiter"
-
-/obj/item/clothing/under/waiter_fem
- name = "waiter's outfit"
- desc = "It's a very smart uniform with a special pocket for tips."
- icon_state = "waiter_fem"
-
-/obj/item/clothing/under/customs
- name = "customs uniform"
- desc = "A standard OriCon customs uniform. Complete with epaulettes."
- icon_state = "cu_suit"
-
-/obj/item/clothing/under/customs/khaki
- icon_state = "cu_suit_kh"
-
-/obj/item/clothing/under/rank/mailman
- name = "mailman's jumpsuit"
- desc = "'Special delivery!'"
- icon_state = "mailman"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
-
-/obj/item/clothing/under/sexyclown
- name = "sexy-clown suit"
- desc = "It makes you look HONKable!"
- icon_state = "sexyclown"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "clown", SLOT_ID_LEFT_HAND = "clown")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL //Please never
-
-/obj/item/clothing/under/rank/vice
- name = "vice officer's jumpsuit"
- desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
- icon_state = "vice"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "grey", SLOT_ID_LEFT_HAND = "grey")
-
-/obj/item/clothing/under/space
- name = "\improper NASA jumpsuit"
- desc = "It has a NASA logo on it and is made of space-proofed materials."
- icon_state = "black"
- w_class = WEIGHT_CLASS_BULKY//bulky item
- gas_transfer_coefficient = 0.01
- permeability_coefficient = 0.02
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected.
- min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
-
-/obj/item/clothing/under/acj
- name = "administrative cybernetic jumpsuit"
- icon_state = "syndicate"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
- desc = "it's a cybernetically enhanced jumpsuit used for administrative duties."
- gas_transfer_coefficient = 0.01
- permeability_coefficient = 0.01
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- armor_type = /datum/armor/invulnerable
- cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
- min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
- siemens_coefficient = 0
-
-/obj/item/clothing/under/owl
- name = "owl uniform"
- desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
- icon_state = "owl"
-
-/obj/item/clothing/under/johnny
- name = "johnny~~ jumpsuit"
- desc = "Johnny~~"
- icon_state = "johnny"
-
-/obj/item/clothing/under/color/rainbow
- name = "rainbow jumpsuit"
- desc = "A multi-colored jumpsuit."
- icon_state = "rainbow"
-
-/obj/item/clothing/under/psysuit
- name = "dark undersuit"
- desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm."
- icon_state = "psysuit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-
-/obj/item/clothing/under/gentlesuit
- name = "gentlemans suit"
- desc = "A silk black shirt with matching gray slacks. Feels proper."
- icon_state = "gentlesuit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "grey", SLOT_ID_LEFT_HAND = "grey")
- starting_accessories = list(/obj/item/clothing/accessory/tie/white, /obj/item/clothing/accessory/wcoat/gentleman)
-
-/obj/item/clothing/under/gentlesuit/skirt
- name = "lady's suit"
- desc = "A silk black blouse with a matching gray skirt. Feels proper."
- icon_state = "gentlesuit_skirt"
-
-/obj/item/clothing/under/gimmick/rank/captain/suit
- name = "Facility Director's suit"
- desc = "A green suit and yellow necktie. Exemplifies authority."
- icon_state = "green_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "centcom", SLOT_ID_LEFT_HAND = "centcom")
-
-/obj/item/clothing/under/gimmick/rank/captain/suit/skirt
- name = "Facility Director's skirt suit"
- icon_state = "green_suit_skirt"
-
-/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
- name = "head of personnel's suit"
- desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble."
- icon_state = "teal_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "green", SLOT_ID_LEFT_HAND = "green")
-
-/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt
- name = "head of personnel's skirt suit"
- icon_state = "teal_suit_skirt"
-
-/obj/item/clothing/under/suit_jacket
- name = "black suit"
- desc = "A black suit and red tie. Very formal."
- icon_state = "black_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_black", SLOT_ID_LEFT_HAND = "lawyer_black")
-
-/obj/item/clothing/under/suit_jacket/really_black
- name = "executive suit"
- desc = "A formal black suit and red tie, intended for the station's finest."
- icon_state = "really_black_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_black", SLOT_ID_LEFT_HAND = "lawyer_black")
-
-/obj/item/clothing/under/suit_jacket/really_black/skirt
- name = "executive skirt suit"
- desc = "A formal black suit and red necktie, intended for the station's finest."
- icon_state = "really_black_suit_skirt"
-
-/obj/item/clothing/under/suit_jacket/female
- name = "female executive suit"
- desc = "A formal trouser suit for women, intended for the station's finest."
- icon_state = "black_suit_fem"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_black", SLOT_ID_LEFT_HAND = "lawyer_black")
-
-/obj/item/clothing/under/suit_jacket/female/skirt
- name = "executive skirt"
- desc = "A formal suit skirt for women, intended for the station's finest."
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
- icon_state = "black_suit_fem"
- item_state = "black_formal_skirt"
-
-/obj/item/clothing/under/suit_jacket/female/pleated_skirt
- name = "executive pleated skirt"
- icon_state = "black_suit_fem_skirt"
-
-/obj/item/clothing/under/suit_jacket/red
- name = "red suit"
- desc = "A red suit and blue tie. Somewhat formal."
- icon_state = "red_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_red", SLOT_ID_LEFT_HAND = "lawyer_red")
-
-/obj/item/clothing/under/suit_jacket/red/skirt
- name = "red skirt suit"
- desc = "A red suit and blue necktie. Somewhat formal."
- icon_state = "red_suit_skirt"
-
-/obj/item/clothing/under/schoolgirl
- name = "frilly blue skirt" //Citadel change REEEFETISHCONTENT
- desc = "A clean white shirt with a blue collar and skirt. Looks like something out of an anime." //Citadel change REEEFETISHCONTENT
- icon_state = "schoolgirl"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/schoolgirl/red
- name = "frilly red skirt" //Citadel change REEEFETISHCONTENT
- desc = "A clean white shirt with a red collar and skirt. Looks like something out of an anime." //Citadel change REEEFETISHCONTENT
- icon_state = "schoolgirlred"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
-
-/obj/item/clothing/under/schoolgirl/green
- name = "frilly green skirt" //Citadel change REEEFETISHCONTENT
- desc = "A clean white shirt with a green collar and skirt. Looks like something out of an anime." //Citadel change REEEFETISHCONTENT
- icon_state = "schoolgirlgreen"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "green", SLOT_ID_LEFT_HAND = "green")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/schoolgirl/orange
- name = "frilly orange skirt" //Citadel change REEEFETISHCONTENT
- desc = "A clean white shirt with a orange collar and skirt. Looks like something out of an anime." //Citadel change REEEFETISHCONTENT
- icon_state = "schoolgirlorange"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "orange", SLOT_ID_LEFT_HAND = "orange")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/schoolgirl/pink
- name = "frilly pink skirt" //Citadel change REEEFETISHCONTENT
- desc = "A clean white shirt with a pink collar and skirt. Looks like something out of an anime." //Citadel change REEEFETISHCONTENT
- icon_state = "schoolgirlpink"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "pink", SLOT_ID_LEFT_HAND = "pink")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/overalls
- name = "laborer's overalls"
- desc = "A set of durable overalls for getting the job done."
- icon_state = "overalls"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "cargo", SLOT_ID_LEFT_HAND = "cargo")
-
-/obj/item/clothing/under/overalls_fem
- name = "laborer's overalls"
- desc = "A set of durable overalls for getting the job done."
- icon_state = "overalls_fem"
-
-/obj/item/clothing/under/overalls/sleek
- name = "sleek overalls"
- desc = "A set of modern pleather reinforced overalls."
- icon_state = "overalls_sleek"
-
-/obj/item/clothing/under/overalls/sleek_fem
- name = "sleek overalls"
- desc = "A set of modern pleather reinforced overalls."
- icon_state = "overalls_sleek_fem"
-
-/obj/item/clothing/under/pirate
- name = "pirate outfit"
- desc = "Yarr."
- icon_state = "pirate"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "sl_suit", SLOT_ID_LEFT_HAND = "sl_suit")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
-
-/obj/item/clothing/under/kilt
- icon = 'icons/clothing/uniform/costume/kilt.dmi'
- name = "kilt"
- icon_state = "kilt"
- desc = "Includes shoes and plaid"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
- worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX, BODYTYPE_TESHARI)
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|FEET
-
-/obj/item/clothing/under/sexymime
- name = "sexy mime outfit"
- desc = "The only time when you DON'T enjoy looking at someone's rack."
- icon_state = "sexymime"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "mime", SLOT_ID_LEFT_HAND = "mime")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL //Please never
-
-/obj/item/clothing/under/gladiator
- name = "gladiator uniform"
- desc = "Are you not entertained? Is that not why you are here?"
- icon_state = "gladiator"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "yellow", SLOT_ID_LEFT_HAND = "yellow")
- body_cover_flags = LOWER_TORSO
-
-//Obsolete, but retained for posterity.
-/*
-/obj/item/clothing/under/gladiator/ashlander
- name = "ashlander panoply"
- desc = "Hardy metal plates and firm red sinew comprise this scuffed and marred armor."
- has_sensors = UNIFORM_HAS_NO_SENSORS
- armor = list(melee = 5, bullet = 0, laser = 5,energy = 5, bomb = 0, bio = 0, rad = 0)
-*/
-
-/obj/item/clothing/under/moderncoat
- name = "modern wrapped coat"
- desc = "The cutting edge of fashion."
- icon_state = "moderncoat"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
-
-/obj/item/clothing/under/ascetic
- name = "plain ascetic garb"
- desc = "Popular with freshly grown vatborn and new age cultists alike."
- icon_state = "ascetic"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
-
-/obj/item/clothing/under/ascetic_fem
- name = "plain ascetic garb"
- desc = "Popular with freshly grown vatborn and new age cultists alike."
- icon_state = "ascetic_fem"
-
-/obj/item/clothing/under/robe
- name = "black robe"
- desc = "A black robe. It gives off uncomfortable cult vibes."
- icon_state = "robe"
-
-/obj/item/clothing/under/whiterobe
- name = "white robe"
- desc = "A white robe. It gives off uncomfortable cult vibes."
- icon_state = "whiterobe"
-
-/obj/item/clothing/under/goldrobe
- name = "black gold-lined robe"
- desc = "A gold-lined black robe. It gives off uncomfortable cult vibes, but fancy."
- icon_state = "goldrobe"
-
-/obj/item/clothing/under/whitegoldrobe
- name = "white gold-lined robe"
- desc = "A gold-lined white robe. It gives off uncomfortable cult vibes, but fancy."
- icon_state = "whitegoldrobe"
-
-/*
- * dress
- */
-/obj/item/clothing/under/dress
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/dress/cropdress
- name = "cropped dress"
- desc = "A cropped dress to keep you cool, but fashionable."
- icon_state = "cropdress"
-
-/obj/item/clothing/under/dress/twistdress
- name = "twisted dress"
- desc = "A new take on twisted coffee, this top and skirt keep your robustness at an all-time high."
- icon_state = "twistfront"
-
-/obj/item/clothing/under/dress/blacktango
- name = "black tango dress"
- desc = "Filled with Latin fire."
- icon_state = "black_tango"
-
-/obj/item/clothing/under/dress/blacktango/alt
- name = "black tango dress"
- desc = "Filled with Latin fire."
- icon_state = "black_tango_alt"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black_tango", SLOT_ID_LEFT_HAND = "black_tango")
-
-/obj/item/clothing/under/dress/stripeddress
- name = "striped dress"
- desc = "Fashion in space."
- icon_state = "striped_dress"
-
-/obj/item/clothing/under/dress/sailordress
- name = "sailor dress"
- desc = "Formal wear for a leading lady."
- icon_state = "sailor_dress"
-
-/obj/item/clothing/under/dress/redeveninggown
- name = "red evening gown"
- desc = "Fancy dress for space bar singers."
- icon_state = "red_evening_gown"
-
-/obj/item/clothing/under/dress/maid
- name = "maid costume"
- desc = "Maid in China."
- icon_state = "maid"
-
-/obj/item/clothing/under/dress/maid/janitor
- name = "maid uniform"
- desc = "A simple maid uniform for housekeeping."
- icon_state = "janimaid"
-
-/obj/item/clothing/under/dress/maid/sexy
- name = "sexy maid costume"
- desc = "You must be a bit risque teasing all of them in a maid uniform!"
- icon_state = "sexymaid"
-
-/obj/item/clothing/under/dress/maid/neko
- name = "neko maid uniform"
- desc = "A tailored maid uniform that takes many cues from Old Earth Bavarian commonwear. It seems airy and breathable."
- icon = 'icons/clothing/uniform/misc/neko.dmi'
- icon_state = "neko"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
-
-/obj/item/clothing/under/dress/dress_fire
- name = "flame dress"
- desc = "A small black dress with blue flames print on it."
- icon_state = "dress_fire"
-
-/obj/item/clothing/under/dress/dress_green
- name = "green dress"
- desc = "A simple, tight fitting green dress."
- icon_state = "dress_green"
-
-/obj/item/clothing/under/dress/dress_orange
- name = "orange dress"
- desc = "A fancy orange gown for those who like to show leg."
- icon_state = "dress_orange"
-
-/obj/item/clothing/under/dress/dress_pink
- name = "pink dress"
- desc = "A simple, tight fitting pink dress."
- icon_state = "dress_pink"
-
-/obj/item/clothing/under/dress/dress_yellow
- name = "yellow dress"
- desc = "A flirty, little yellow dress."
- icon_state = "dress_yellow"
-
-/obj/item/clothing/under/dress/dress_saloon
- name = "saloon girl dress"
- desc = "A old western inspired gown for the girl who likes to drink."
- icon_state = "dress_saloon"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "dress_white", SLOT_ID_LEFT_HAND = "dress_white")
-
-/obj/item/clothing/under/dress/dress_cap
- name = "Facility Director's dress uniform"
- desc = "Feminine fashion for the style conscious Facility Director."
- icon_state = "dress_cap"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/dress/dress_hop
- name = "head of personnel dress uniform"
- desc = "Feminine fashion for the style conscious HoP."
- icon_state = "dress_hop"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/dress/dress_hr
- name = "human resources director uniform"
- desc = "Superior class for the nosy H.R. Director."
- icon_state = "huresource"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/dress/black_corset
- name = "black corset and skirt"
- desc = "A black corset and skirt for those fancy nights out."
- icon_state = "black_corset"
-
-/obj/item/clothing/under/dress/flower_dress
- name = "flower dress"
- desc = "A beautiful dress with a skirt of flowers."
- icon_state = "flower_dress"
-
-/obj/item/clothing/under/dress/red_swept_dress
- name = "red swept dress"
- desc = "A red dress that sweeps to the side."
- icon_state = "red_swept_dress"
-
-/obj/item/clothing/under/dress/flamenco
- name = "flamenco dress"
- desc = "A Mexican flamenco dress."
- icon_state = "flamenco"
-
-/obj/item/clothing/under/dress/westernbustle
- name = "western bustle"
- desc = "A western bustle dress from Earth's late 1800's."
- icon_state = "westernbustle"
-
-/obj/item/clothing/under/dress/sari
- name = "red sari"
- desc = "A colorful traditional dress originating from India."
- icon_state = "sari_red"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "darkreddress", SLOT_ID_LEFT_HAND = "darkreddress")
-
-/obj/item/clothing/under/dress/sari/green
- name = "green sari"
- icon_state = "sari_green"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "dress_green", SLOT_ID_LEFT_HAND = "dress_green")
-
-/obj/item/clothing/under/dress/lilacdress
- name = "lilac dress"
- desc = "A simple black dress adorned in fake purple lilacs."
- icon_state = "lilacdress"
-
-/*
- * wedding stuff
- */
-/obj/item/clothing/under/wedding
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
-
-/obj/item/clothing/under/wedding/bride_orange
- name = "orange wedding dress"
- desc = "A big and puffy orange dress."
- icon_state = "bride_orange"
- inv_hide_flags = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_purple
- name = "purple wedding dress"
- desc = "A big and puffy purple dress."
- icon_state = "bride_purple"
- inv_hide_flags = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_blue
- name = "blue wedding dress"
- desc = "A big and puffy blue dress."
- icon_state = "bride_blue"
- inv_hide_flags = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_red
- name = "red wedding dress"
- desc = "A big and puffy red dress."
- icon_state = "bride_red"
- inv_hide_flags = HIDESHOES
-
-/obj/item/clothing/under/wedding/bride_white
- name = "silky wedding dress"
- desc = "A white wedding gown made from the finest silk."
- icon_state = "bride_white"
- inv_hide_flags = HIDESHOES
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/sundress
- name = "sundress"
- desc = "Makes you want to frolic in a field of daisies."
- icon_state = "sundress"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/sundress_white
- name = "white sundress"
- desc = "A white sundress decorated with purple lilies."
- icon_state = "sundress_white"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/pentagramdress
- name = "pentagram dress"
- desc = "A black dress with straps over the chest in the shape of a pentagram."
- icon_state = "pentagram"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/captainformal
- name = "Facility Director's formal uniform"
- desc = "A Facility Director's formal-wear, for special occasions."
- icon_state = "captain_formal"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_blue", SLOT_ID_LEFT_HAND = "lawyer_blue")
-
-/obj/item/clothing/under/hosformalmale
- name = "head of security's formal uniform"
- desc = "A male head of security's formal-wear, for special occasions."
- icon_state = "hos_formal_male"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_red", SLOT_ID_LEFT_HAND = "lawyer_red")
-
-/obj/item/clothing/under/hosformalfem
- name = "head of security's formal uniform"
- desc = "A female head of security's formal-wear, for special occasions."
- icon_state = "hos_formal_fem"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_red", SLOT_ID_LEFT_HAND = "lawyer_red")
-
-/obj/item/clothing/under/assistantformal
- name = "assistant's formal uniform"
- desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown."
- icon_state = "assistant_formal"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_black", SLOT_ID_LEFT_HAND = "lawyer_black")
-
-/obj/item/clothing/under/assistantformal_fem
- name = "assistant's formal uniform"
- desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown."
- icon_state = "assistant_formal_fem"
-
-/obj/item/clothing/under/suit_jacket/charcoal
- name = "charcoal suit"
- desc = "A charcoal suit and red tie. Very professional."
- icon_state = "charcoal_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_black", SLOT_ID_LEFT_HAND = "lawyer_black")
- starting_accessories = list(/obj/item/clothing/accessory/tie/navy, /obj/item/clothing/accessory/jacket/charcoal)
-
-/obj/item/clothing/under/suit_jacket/charcoal/skirt
- name = "charcoal skirt"
- icon_state = "charcoal_suit_skirt"
-
-/obj/item/clothing/under/suit_jacket/navy
- name = "navy suit"
- desc = "A navy suit and red tie, intended for the station's finest."
- icon_state = "navy_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_blue", SLOT_ID_LEFT_HAND = "lawyer_blue")
- starting_accessories = list(/obj/item/clothing/accessory/tie/red, /obj/item/clothing/accessory/jacket/navy)
-
-/obj/item/clothing/under/suit_jacket/navy/skirt
- name = "navy skirt"
- icon_state = "navy_suit_skirt"
-
-/obj/item/clothing/under/suit_jacket/burgundy
- name = "burgundy suit"
- desc = "A burgundy suit and black tie. Somewhat formal."
- icon_state = "burgundy_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_red", SLOT_ID_LEFT_HAND = "lawyer_red")
- starting_accessories = list(/obj/item/clothing/accessory/tie/black, /obj/item/clothing/accessory/jacket/burgundy)
-
-/obj/item/clothing/under/suit_jacket/burgundy/skirt
- name = "burgundy skirt"
- icon_state = "burgundy_suit_skirt"
-
-/obj/item/clothing/under/suit_jacket/checkered
- name = "checkered suit"
- desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?"
- icon_state = "checkered_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_black", SLOT_ID_LEFT_HAND = "lawyer_black")
- starting_accessories = list(/obj/item/clothing/accessory/tie/black, /obj/item/clothing/accessory/jacket/checkered)
-
-/obj/item/clothing/under/suit_jacket/checkered/skirt
- name = "checkered skirt"
- icon_state = "checkered_suit_skirt"
-
-/obj/item/clothing/under/suit_jacket/tan
- name = "tan suit"
- desc = "A tan suit. Smart, but casual."
- icon_state = "tan_suit"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "tan_suit", SLOT_ID_LEFT_HAND = "tan_suit")
- starting_accessories = list(/obj/item/clothing/accessory/tie/yellow, /obj/item/clothing/accessory/jacket)
-
-/obj/item/clothing/under/suit_jacket/tan/skirt
- name = "tan skirt"
- icon_state = "tan_suit_skirt"
-
-/obj/item/clothing/under/serviceoveralls
- name = "workman outfit"
- desc = "The very image of a working man. Not that you're probably doing work."
- icon_state = "mechanic"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "cargo", SLOT_ID_LEFT_HAND = "cargo")
-
-/obj/item/clothing/under/cheongsam
- name = "white cheongsam"
- desc = "It is a white cheongsam dress."
- icon_state = "cheongsam-white"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
-
-/obj/item/clothing/under/cheongsam/red
- name = "red cheongsam"
- desc = "It is a red cheongsam dress."
- icon_state = "cheongsam-red"
-
-/obj/item/clothing/under/cheongsam/blue
- name = "blue cheongsam"
- desc = "It is a blue cheongsam dress."
- icon_state = "cheongsam-blue"
-
-/obj/item/clothing/under/cheongsam/black
- name = "black cheongsam"
- desc = "It is a black cheongsam dress."
- icon_state = "cheongsam-black"
-
-/obj/item/clothing/under/cheongsam/darkred
- name = "dark red cheongsam"
- desc = "It is a dark red cheongsam dress."
- icon_state = "cheongsam-darkred"
-
-/obj/item/clothing/under/cheongsam/darkgreen
- name = "dark green cheongsam"
- desc = "It is a dark green cheongsam dress."
- icon_state = "cheongsam-darkgreen"
-
-/obj/item/clothing/under/cheongsam/green
- name = "green cheongsam"
- desc = "It is a green cheongsam dress."
- icon_state = "cheongsam-green"
-
-/obj/item/clothing/under/cheongsam/purple
- name = "purple cheongsam"
- desc = "It is a purple cheongsam dress."
- icon_state = "cheongsam-purple"
-
-/obj/item/clothing/under/cheongsam/darkblue
- name = "dark blue cheongsam"
- desc = "It is a dark blue cheongsam dress."
- icon_state = "cheongsam-darkblue"
-
-/obj/item/clothing/under/blazer
- name = "blue blazer"
- desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie."
- icon_state = "blue_blazer"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "lawyer_blue", SLOT_ID_LEFT_HAND = "lawyer_blue")
-
-/obj/item/clothing/under/blazer/skirt
- name = "ladies blue blazer"
- desc = "A bold but yet conservative outfit, a red pencil skirt and a navy blazer."
- icon_state = "blue_blazer_skirt"
-
-/obj/item/clothing/under/croptop
- name = "crop top"
- desc = "A shirt that has had the top cropped. This one is NT sponsored."
- icon_state = "croptop"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "grey", SLOT_ID_LEFT_HAND = "grey")
-
-/obj/item/clothing/under/croptop/red
- name = "red crop top"
- desc = "A red shirt that has had the top cropped."
- icon_state = "croptop_red"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
-
-/obj/item/clothing/under/croptop/grey
- name = "grey crop top"
- desc = "A grey shirt that has had the top cropped."
- icon_state = "croptop_grey"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "grey", SLOT_ID_LEFT_HAND = "grey")
-
-/obj/item/clothing/under/cuttop
- name = "grey cut top"
- desc = "A grey shirt that has had the top cut low."
- icon_state = "cuttop"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "grey", SLOT_ID_LEFT_HAND = "grey")
-
-/obj/item/clothing/under/cuttop/red
- name = "red cut top"
- desc = "A red shirt that has had the top cut low."
- icon_state = "cuttop_red"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
-
-/obj/item/clothing/under/dress/white
- name = "white wedding dress"
- desc = "A fancy white dress with a blue underdress."
- icon_state = "whitedress1"
- inv_hide_flags = HIDESHOES
-
-/obj/item/clothing/under/dress/white2
- name = "long dress"
- desc = "A long dress."
- icon_state = "whitedress2"
- addblends = "whitedress2_a"
- inv_hide_flags = HIDESHOES
-
-/obj/item/clothing/under/dress/white3
- name = "short dress"
- desc = "A short, plain dress."
- icon_state = "whitedress3"
- addblends = "whitedress3_a"
-
-/obj/item/clothing/under/dress/white4
- name = "long flared dress"
- desc = "A long white dress that flares out at the bottom."
- icon_state = "whitedress4"
- addblends = "whitedress4_a"
- inv_hide_flags = HIDESHOES
-
-/obj/item/clothing/under/dress/darkred
- name = "fancy dark red dress"
- desc = "A short, red dress with a black belt. Fancy."
- icon_state = "darkreddress"
-
-/*
- * swimsuit
- */
-/obj/item/clothing/under/swimsuit
- name = "primitive swimsuit"
- desc = "In all reality, this is just a simple loincloth."
- icon_state = "loincloth"
- siemens_coefficient = 1
- body_cover_flags = 0
-
-/obj/item/clothing/under/swimsuit/black
- name = "black swimsuit"
- desc = "An oldfashioned black swimsuit."
- icon_state = "swim_black"
-
-/obj/item/clothing/under/swimsuit/blue
- name = "blue swimsuit"
- desc = "An oldfashioned blue swimsuit."
- icon_state = "swim_blue"
-
-/obj/item/clothing/under/swimsuit/purple
- name = "purple swimsuit"
- desc = "An oldfashioned purple swimsuit."
- icon_state = "swim_purp"
-
-/obj/item/clothing/under/swimsuit/green
- name = "green swimsuit"
- desc = "An oldfashioned green swimsuit."
- icon_state = "swim_green"
-
-/obj/item/clothing/under/swimsuit/red
- name = "red swimsuit"
- desc = "An oldfashioned red swimsuit."
- icon_state = "swim_red"
-
-/obj/item/clothing/under/swimsuit/striped
- name = "striped swimsuit"
- desc = "A more revealing striped swimsuit."
- icon_state = "swim_striped"
-
-/obj/item/clothing/under/swimsuit/white
- name = "white swimsuit"
- desc = "A classic one piece."
- icon_state = "swim_white"
-
-/obj/item/clothing/under/swimsuit/earth
- name = "earthen swimsuit"
- desc = "A design more popular on Earth these days."
- icon_state = "swim_earth"
-
-/obj/item/clothing/under/swimsuit/stripper/stripper_pink
- name = "pink swimsuit"
- desc = "A rather skimpy pink swimsuit."
- icon_state = "stripper_p"
-
-/obj/item/clothing/under/swimsuit/stripper/stripper_green
- name = "green swimsuit"
- desc = "A rather skimpy green swimsuit."
- icon_state = "stripper_g"
-
-/obj/item/clothing/under/swimsuit/stripper/mankini
- name = "mankini"
- desc = "No honest man would wear this abomination."
- icon_state = "mankini"
-
-/obj/item/clothing/under/swimsuit/stripper/cowbikini
- name = "cow print bikini"
- desc = "A rather skimpy cow patterned swimsuit."
- icon_state = "swim_cow"
-
-/obj/item/clothing/under/swimsuit/stripper/captain
- name = "sexy captain swimsuit"
- desc = "A revealing stripper's costume patterned after the Captain's uniform."
- icon_state = "lewdcap"
-
-/obj/item/clothing/under/swimsuit/highclass
- name = "high class swimsuit"
- desc = "An elegant swimsuit with a white bikini top and black bikini bottom. Thin black silk drapes down the back and goes to the upper thighs, and authentic gold rings hold the top together at the bust and back."
- icon_state = "swim_highclass"
-
-/obj/item/clothing/under/swimsuit/latex
- name = "latex swimsuit"
- desc = "A tight latex one piece. It clings tightly to the flesh, leaving very little to the imagination."
- icon_state = "swim_latex"
-
-/obj/item/clothing/under/swimsuit/risque
- name = "risque swimsuit"
- desc = "This fits a bit too snug in all the right places. Comes with a collar, for inscrutable reasons."
- icon_state = "swim_risque"
-
-/obj/item/clothing/under/swimsuit/streamlined
- name = "streamlined swimsuit"
- desc = "An all white one-piece that maintains modesty without sacrificing class."
- icon_state = "swim_stream"
-
-/*
- * pyjamas
- */
-/obj/item/clothing/under/bluepyjamas
- name = "blue pyjamas"
- desc = "Slightly old-fashioned sleepwear."
- icon_state = "blue_pyjamas"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/bluepyjamas_fem
- name = "blue pyjamas"
- desc = "Slightly old-fashioned sleepwear."
- icon_state = "blue_pyjamas_fem"
-
-/obj/item/clothing/under/redpyjamas
- name = "red pyjamas"
- desc = "Slightly old-fashioned sleepwear."
- icon_state = "red_pyjamas"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/redpyjamas_fem
- name = "red pyjamas"
- desc = "Slightly old-fashioned sleepwear."
- icon_state = "red_pyjamas_fem"
-
-/*
- *Misc Uniforms
- */
-
-/obj/item/clothing/under/brandjumpsuit/aether
- name = "\improper Aether jumpsuit"
- desc = "A jumpsuit belonging to Aether Atmospherics and Recycling, a Trans-Stellar that supplies recycling and atmospheric systems to colonies."
- icon_state = "aether"
- snowflake_worn_state = "aether"
-
-/obj/item/clothing/under/pcrc
- name = "\improper PCRC uniform"
- desc = "A uniform belonging to Proxima Centauri Risk Control, a private security firm."
- icon_state = "pcrc"
- item_state = "jensensuit"
- snowflake_worn_state = "pcrc"
-
-/obj/item/clothing/under/pcrc_fem
- name = "\improper PCRC uniform"
- desc = "A uniform belonging to Proxima Centauri Risk Control, a private security firm."
- icon_state = "pcrc_fem"
- item_state = "jensensuit"
- snowflake_worn_state = "pcrc"
-
-/obj/item/clothing/under/brandjumpsuit/grayson
- name = "\improper Grayson overalls"
- desc = "A set of overalls belonging to Grayson Manufactories, a mining Trans-Stellar."
- icon_state = "mechanic"
- snowflake_worn_state = "mechanic"
-
-/obj/item/clothing/under/brandjumpsuit/wardt
- name = "\improper Ward-Takahashi jumpsuit"
- desc = "A jumpsuit belonging to Ward-Takahashi, a Trans-Stellar in the consumer goods market."
- icon_state = "robotics2"
- snowflake_worn_state = "robotics2"
-
-/obj/item/clothing/under/brandjumpsuit/mbill
- name = "\improper Major Bill's uniform"
- desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation."
- icon_state = "mbill"
- snowflake_worn_state = "mbill"
- catalogue_data = list(/datum/category_item/catalogue/information/organization/major_bills)
-
-/obj/item/clothing/under/confederacy
- name = "\improper Confederacy uniform"
- desc = "A military uniform belonging to the Confederacy of Man, an independent human government." //Name pending review
- icon_state = "confed"
- snowflake_worn_state = "confed"
-
-/obj/item/clothing/under/saare
- name = "SAARE uniform"
- desc = "A dress uniform belonging to Stealth Assault Enterprises, a minor private military corporation." //Name pending review
- icon_state = "saare"
- snowflake_worn_state = "saare"
-
-/obj/item/clothing/under/saare_fem
- name = "SAARE uniform"
- desc = "A dress uniform belonging to Stealth Assault Enterprises, a minor private military corporation."
- icon_state = "saare_fem"
- snowflake_worn_state = "saare_fem"
-
-/obj/item/clothing/under/frontier
- name = "frontier clothes"
- desc = "A rugged flannel shirt and denim overalls. A popular style among frontier colonists."
- icon_state = "frontier"
- snowflake_worn_state = "frontier"
-
-/obj/item/clothing/under/brandjumpsuit/focal
- name = "\improper Focal Point jumpsuit"
- desc = "A jumpsuit belonging to Focal Point Energistics, an engineering megacorporation."
- icon_state = "focal"
- snowflake_worn_state = "focal"
-
-/obj/item/clothing/under/brandjumpsuit/hephaestus
- name = "\improper Hephaestus jumpsuit"
- desc = "A jumpsuit belonging to Hephaestus Industries, a Trans-Stellar best known for its arms production."
- icon_state = "heph"
- snowflake_worn_state = "heph"
-
-/obj/item/clothing/under/brandjumpsuit/hephaestus_fem
- name = "\improper Hephaestus jumpsuit (female)"
- desc = "A jumpsuit belonging to Hephaestus Industries, a Trans-Stellar best known for its arms production."
- icon_state = "heph_fem"
- snowflake_worn_state = "heph_fem"
-
-/obj/item/clothing/under/rank/psych/turtleneck/sweater
- desc = "A warm looking sweater and a pair of dark blue slacks."
- name = "sweater"
- icon_state = "turtleneck"
- snowflake_worn_state = "turtleneck"
-
-/obj/item/clothing/under/rank/psych/turtleneck/sweater
- desc = "A warm looking sweater and a pair of dark blue slacks."
- name = "sweater"
- icon_state = "turtleneck_fem"
- snowflake_worn_state = "turtleneck_fem"
-
-//And this is where the real game begins
-/obj/item/clothing/under/future_fashion
- name = "Futuristic Dark Blue-Striped Jumpsuit"
- desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has dark blue stripes."
- icon = 'icons/clothing/uniform/misc/future.dmi'
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_NO_RENDER | WORN_RENDER_INHAND_ALLOW_DEFAULT
- worn_bodytypes = BODYTYPE_DEFAULT
- inhand_default_type = INHAND_DEFAULT_ICON_UNIFORMS
- inhand_state = "jensen"
- icon_state = "dark_blue"
-
-/obj/item/clothing/under/future_fashion/green_striped
- name = "Futuristic Green-Striped Jumpsuit"
- desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has green stripes."
- icon_state = "green"
-
-/obj/item/clothing/under/future_fashion/light_blue_striped
- name = "Futuristic Light Blue-Striped Jumpsuit"
- desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has light blue stripes."
- icon_state = "light_blue"
-
-/obj/item/clothing/under/future_fashion/orange_striped
- name = "Futuristic Orange-Striped Jumpsuit"
- desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has orange-brownish stripes."
- icon_state = "orange"
-
-/obj/item/clothing/under/future_fashion/purple_striped
- name = "Futuristic Purple-Striped Jumpsuit"
- desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has purple stripes."
- icon_state = "purple"
-
-/obj/item/clothing/under/future_fashion/red_striped
- name = "Futuristic Red-Striped Jumpsuit"
- desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has red stripes."
- icon_state = "red"
-
-/obj/item/clothing/under/medigown
- name = "medical gown"
- desc = "A flimsy examination gown, the back ties never close."
- icon_state = "medicalgown"
- snowflake_worn_state = "medicalgown"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/bathrobe
- name = "bathrobe"
- desc = "A fluffy robe to keep you from showing off to the world."
- icon_state = "bathrobe"
- snowflake_worn_state = "bathrobe"
-
-/obj/item/clothing/under/explorer
- desc = "A green uniform for operating in hazardous environments."
- name = "explorer's jumpsuit"
- icon_state = "explorer"
-
-/obj/item/clothing/under/explorer_fem
- desc = "A green uniform for operating in hazardous environments."
- name = "explorer's jumpsuit"
- icon_state = "explorer_fem"
-
-/obj/item/clothing/under/cohesion
- name = "black cohesion suit"
- desc = "A plain black cohesion suit intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
- icon_state = "cohesionsuit"
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL // defeats the purpose!!!
-
-/obj/item/clothing/under/cohesion
- name = "black cohesion suit (female)"
- desc = "A plain black cohesion suit intended to assist Prometheans in maintaining their form and prevent direct sken exposure."
- icon_state = "cohesionsuit_fem"
-
-/obj/item/clothing/under/cohesion/striped
- name = "red striped cohesion suit"
- desc = "A black cohesion suit with red stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
- icon_state = "cohesionsuit_striped"
-
-/obj/item/clothing/under/cohesion/striped_fem
- name = "red striped cohesion suit (female)"
- desc = "A black cohesion suit with red striped intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
- icon_state = "cohesionsuit_striped_fem"
-
-/obj/item/clothing/under/cohesion/decal
- name = "purple decaled cohesion suit"
- desc = "A white cohesion suit with purple decals intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
- icon_state = "cohesionsuit_decal"
-
-/obj/item/clothing/under/cohesion/decal_fem
- name = "purple decaled cohesion suit (female)"
- desc = "A white cohesion suit with purple decals intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
- icon_state = "cohesionsuit_decal_fem"
-
-/obj/item/clothing/under/cohesion/pattern
- name = "blue patterned cohesion suit"
- desc = "A white cohesion suit with blue patterns intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
- icon_state = "cohesionsuit_pattern"
-
-/obj/item/clothing/under/cohesion/pattern_fem
- name = "blue patterned cohesion suit (female)"
- desc = "A white cohesion suit with blue patterns intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
- icon_state = "cohesionsuit_pattern_fem"
-
-/obj/item/clothing/under/cohesion/hazard
- name = "hazard cohesion suit"
- desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
- icon_state = "cohesionsuit_hazard"
-
-/obj/item/clothing/under/cohesion/hazard_fem
- name = "hazard cohesion suit (female)"
- desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
- icon_state = "cohesionsuit_hazard_fem"
-
-//Uniforms
-//On-mob sprites go in icons\mob\uniform.dmi with the format "white_ranger_uniform_s" - with 'white' replaced with green, cyan, etc... of course! Note the _s - this is not optional.
-//Item sprites go in icons\obj\clothing\ranger.dmi with the format "white_ranger_uniform"
-/obj/item/clothing/under/color/ranger
- var/unicolor = "white"
- name = "ranger uniform"
- desc = "Made from a space-proof fibre and tight fitting, this uniform usually gives the agile Rangers all kinds of protection while not inhibiting their movement. \
- This costume is instead made from genuine cotton fibre and is based on the season three uniform."
- icon = 'icons/obj/clothing/ranger.dmi'
- icon_state = "ranger_uniform"
-
-/obj/item/clothing/under/color/ranger/Initialize(mapload)
- . = ..()
- if(icon_state == "ranger_uniform") //allows for custom items
- name = "[unicolor] ranger uniform"
- icon_state = "[unicolor]_ranger_uniform"
-
-/obj/item/clothing/under/color/ranger/black
- unicolor = "black"
-
-/obj/item/clothing/under/color/ranger/pink
- unicolor = "pink"
-
-/obj/item/clothing/under/color/ranger/green
- unicolor = "green"
-
-/obj/item/clothing/under/color/ranger/cyan
- unicolor = "cyan"
-
-/obj/item/clothing/under/color/ranger/orange
- unicolor = "orange"
-
-/obj/item/clothing/under/color/ranger/yellow
- unicolor = "yellow"
-
-/obj/item/clothing/under/haltertop
- name = "halter top"
- desc = "A black halter top with denim jean shorts."
- icon_state = "haltertop"
-
-/obj/item/clothing/under/festivedress
- name = "festive dress"
- desc = "A red dress with a fur-like white trim that is associated with the Christmas season."
- icon_state = "festivedress"
-
-/obj/item/clothing/under/littleblackdress
- name = "little black dress"
- desc = "A small black dress with a red sash."
- icon_state = "littleblackdress"
-
-/obj/item/clothing/under/bridgeofficer
- name = "bridge officer uniform"
- desc = "A jumpsuit for those ranked high enough to stand at the bridge, but not high enough to touch any buttons."
- icon_state = "bridgeofficer"
- item_state = "bridgeofficer"
-
-/obj/item/clothing/under/paramedunidark
- name = "Paramedic Uniform"
- desc = "A dark jumpsuit for those brave souls who have to deal with a CMO who thinks they're the do everything person."
- icon_state = "paramedic-dark"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/parameduniskirtdark
- name = "Paramedic Uniskirt"
- desc = "A dark jumpskirt for those brave souls who have to deal with a CMO who thinks they're the do everything person."
- icon_state = "paramedic-dark_skirt"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/btcbartender
- name = "BTC Bartender"
- desc = "For the classy bartender who converts their paychecks into Spesscoin."
- icon_state = "btc_bartender"
-
-/obj/item/clothing/under/paramedunilight
- name = "\improper Paramedic Uniform"
- desc = "A light jumpsuit for those brave souls who have to deal with a CMO who thinks they're the do everything person."
- icon_state = "paramedic-light"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/parameduniskirtlight
- name = "\improper Paramedic Uniskirt"
- desc = "A light jumpskirt for those brave souls who have to deal with a CMO who thinks they're the do everything person."
- icon_state = "paramedic_skirt"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/dutchuniform
- name = "\improper Western suit"
- desc = "We can't always fight nature. We can't fight change, we can't fight gravity, we can't fight nothing."
- icon_state = "dutchuniform"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/victorianblred
- name = "red shirted victorian suit"
- desc = "Don't you see? I have thirteen lives."
- icon_state = "victorianblred"
-
-/obj/item/clothing/under/fem_victorianblred
- name = "red shirted victorian suit"
- desc = "Don't you see? I have thirteen lives."
- icon_state = "victorianblred-fem"
-
-/obj/item/clothing/under/victorianredvest
- name = "red vested victorian suit"
- desc = "Why are we going to the back of the ship? Because the front crashes first. Think it through."
- icon_state = "victorianredvest"
-
-/obj/item/clothing/under/fem_victorianredvest
- name = "red vested victorian suit"
- desc = "Why are we going to the back of the ship? Because the front crashes first. Think it through."
- icon_state = "victorianredvest-fem"
-
-/obj/item/clothing/under/victorianvest
- name = "victorian suit"
- desc = "Four minutes? That's ages. What if I get bored, or need a television, couple of books? Anyone for chess? Bring me knitting."
- icon_state = "victorianvest"
-
-/obj/item/clothing/under/fem_victorianvest
- name = "victorian suit"
- desc = "Four minutes? That's ages. What if I get bored, or need a television, couple of books? Anyone for chess? Bring me knitting."
- icon_state = "victorianvest-fem"
-
-/obj/item/clothing/under/victorianlightfire
- name = "light blue shirted victorian suit"
- desc = "Have you ever thought about what it's like to be wanderers in the Fourth Dimension? Yes, I'm asking you."
- icon_state = "victorianlightfire"
-
-/obj/item/clothing/under/fem_victorianlightfire
- name = "light blue shirted victorian suit"
- desc = "Have you ever thought about what it's like to be wanderers in the Fourth Dimension? Yes, I'm asking you."
- icon_state = "victorianlightfire-fem"
-
-/obj/item/clothing/under/victorianreddress
- name = "red victorian dress"
- desc = "A little gratitude wouldn't irretrievably damage my ego."
- icon_state = "victorianreddress"
-
-/obj/item/clothing/under/victorianblackdress
- name = "black victorian dress"
- desc = "What's the use of a good quotation if you can't change it?"
- icon_state = "victorianblackdress"
-
-/obj/item/clothing/under/bridgeofficerskirt
- name = "bridge officer skirt"
- desc = "A jumpskirt for those ranked high enough to stand at the bridge, but not high enough to touch any buttons."
- icon_state = "bridgeofficerskirt"
-
-/obj/item/clothing/under/fiendsuit
- name = "fiendish suit"
- desc = "A red and black suit befitting someone from the dark pits themselves....Or a thirteen year old."
- icon_state = "fiendsuit"
-
-/obj/item/clothing/under/fienddress
- name = "fiendish dress"
- desc = "A red and black dress befitting someone from the dark pits themselves....Or a thirteen year old."
- icon_state = "fienddress"
-
-/obj/item/clothing/under/leotard
- name = "black leotard"
- desc = "A black leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included."
- icon_state = "leotard"
-
-/obj/item/clothing/under/leotardcolor
- name = "colored leotard"
- desc = "A colorable leotard with a piece of semi-transparent cloth near the bust. Perfect for showing off cleavage. Bunny ears not included."
- icon_state = "leotard_color"
-
-/obj/item/clothing/under/leotardwindow
- name = "side-window leotard"
- desc = "A revealing leotard with a window that exposes your sides."
- icon_state = "leotard_window"
-
-/obj/item/clothing/under/bunnysuit_f
- name = "bunny leotard (f)"
- desc = "A black leotard, commonly used by casino workers to drive up tips. Bunny ears and tail sold separately."
- icon_state = "bunny_f"
-
-/obj/item/clothing/under/bunnysuit_m
- name = "bunny leotard (m)"
- desc = "A black leotard, commonly used by casino workers to drive up tips. Bunny ears and tail sold separately."
- icon_state = "bunny_m"
-
-/obj/item/clothing/under/tabard_w
- name = "white tabard-dress"
- desc = "A gold-trimmed white tabard-dress with a large V-shaped boob window. For when you want to show off your hips and look classy at the same time."
- icon_state = "white_tabard"
-
-/obj/item/clothing/under/tabard_b
- name = "black tabard-dress"
- desc = "A gold-trimmed black tabard-dress with a large circular boob window. Useful for showing off your hips while your buddy puts something in the target's drink."
- icon_state = "black_tabard"
-
-/obj/item/clothing/under/verglasdress
- name = "verglas dress"
- desc = "The modern twist on a forgotten pattern, the Verglas style utilizes comfortable velvet and silver white satin to create an otherworldly effect evocative of winter, or the void."
- icon_state = "verglas_dress"
-
-/obj/item/clothing/under/fashionminiskirt
- name = "fashionable miniskirt"
- desc = "An impractically short miniskirt allegedly making waves through the local fashion scene."
- icon_state = "miniskirt_fashion"
-
-/obj/item/clothing/under/bodysuit
- name = "standard bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
- icon_state = "bodysuit"
-
-/obj/item/clothing/under/bodysuit_fem
- name = "standard bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
- icon_state = "bodysuit_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuiteva
- name = "\improper EVA bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one has bright white plating for easy visibility and thick cuffs to lock into your thrust controls."
- icon_state = "bodysuit_eva"
-
-/obj/item/clothing/under/bodysuit/bodysuiteva_fem
- name = "\improper EVA bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one has bright white plating for easy visibility and thick cuffs to lock into your thrust controls."
- icon_state = "bodysuit_eva_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuitemt
- name = "\improper EMT bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a deep blue base with white and blue coloration."
- icon_state = "bodysuit_emt"
-
-/obj/item/clothing/under/bodysuit/bodysuitemt_fem
- name = "\improper EMT bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a deep blue base with white and blue colouration."
- icon_state = "bodysuit_emt_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuithazard
- name = "hazard bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking orange plating and reflective stripes."
- icon_state = "bodysuit_hazard"
-
-/obj/item/clothing/under/bodysuit/bodysuithazard_fem
- name = "hazard bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking orange plating and reflective stripes."
- icon_state = "bodysuit_hazard_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuitexplocom
- name = "exploration command bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking purple plating and eyecatching golden stripes."
- icon_state = "bodysuit_pathfinder"
-
-/obj/item/clothing/under/bodysuit/bodysuitexplocom_fem
- name = "exploration command bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking purple plating and eyecatching golden stripes."
- icon_state = "bodysuit_pathfinder_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuitexplo
- name = "exploration bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking purple plating."
- icon_state = "bodysuit_explo"
-
-/obj/item/clothing/under/bodysuit/bodysuitexplo_fem
- name = "exploration bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking purple plating."
- icon_state = "bodysuit_explo_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuitminer
- name = "mining bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with tan and purple coloration."
- icon_state = "bodysuit_miner"
-
-/obj/item/clothing/under/bodysuit/bodysuitminer_fem
- name = "mining bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with tan and purple colouration."
- icon_state = "bodysuit_miner_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuitsec
- name = "security bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with red and yellow coloration."
- icon_state = "bodysuit_security"
-
-/obj/item/clothing/under/bodysuit/bodysuitsec_fem
- name = "security bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with red and yellow colouration."
- icon_state = "bodysuit_security_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuitsecweewoo
- name = "advanced security bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with red and yellow coloration. The flashing lights fill you with confidence."
- icon_state = "bodysuit_secweewoo"
-
-/obj/item/clothing/under/bodysuit/bodysuitsecweewoo_fem
- name = "advanced security bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with red and yellow colouration. The flashing lights fill you with confidence."
- icon_state = "bodysuit_secweewoo_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuitseccom
- name = "security command bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with striking red plating and eyecatching golden stripes."
- icon_state = "bodysuit_seccom"
-
-/obj/item/clothing/under/bodysuit/bodysuitseccom_fem
- name = "security command bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with striking red plating and eyecatching golden stripes."
- icon_state = "bodysuit_seccom_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuitcommand
- name = "command bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a flashy blue base with white plating and eyecatching golden stripes."
- icon_state = "bodysuit_command"
-
-/obj/item/clothing/under/bodysuit/bodysuitcommand_fem
- name = "command bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a flashy blue base with white plating and eyecatching golden stripes."
- icon_state = "bodysuit_command_fem"
-
-/obj/item/clothing/under/bodysuit/bodysuitcentcom
- name = "central command bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a sleek black base with an elegant golden trim and grey plating. It fits your corporate badges nicely."
- icon_state = "bodysuit_centcom"
-
-/obj/item/clothing/under/bodysuit/bodysuitcentcom_fem
- name = "central command bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a sleek black base with an elegant golden trim and grey plating. It fits your corporate badges nicely."
- icon_state = "bodysuit_centcom"
-
-/obj/item/clothing/under/bodysuit/blueskirt
- name = "blue skirt"
- desc = "A comfy blue sweater paired with a stylish charcoal skirt!"
- icon_state = "blueskirt"
-
-/obj/item/clothing/under/bodysuit/redskirt
- name = "red skirt"
- desc = "A comfy red sweater paired with a stylish charcoal skirt!"
- icon_state = "redskirt"
-
-/obj/item/clothing/under/para
- name = "PARA tactical uniform"
- desc = "A standard grey jumpsuit, emblazoned with the Icon of the PMD. Close inspection of the embroidery reveals a complex web of glyphs written in an unknown language."
- icon_state = "para_ert_uniform"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
-
-/obj/item/clothing/under/pmd
- name = "PMD uniform"
- desc = "A black uniform whose back is emblazoned with the Icon of the PMD. Close inspection of the silver embroidery reveals a complex web of glyphs written in an unknown language."
- icon_state = "pmd_uniform"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
-
-/obj/item/clothing/under/blueshortskirt
- name = "Short Skirt"
- desc = "A light blue sweater with a black skirt."
- icon_state = "blueshortskirt_female"
-
-/obj/item/clothing/under/greyskirt_female
- name = "Grey Skirt"
- desc = "A medium length, grey skirt with a long-sleeve, black sweater on top."
- icon_state = "greyskirt_female"
-
-/obj/item/clothing/under/highwayman_clothes
- name = "Highwayman Clothes"
- desc = "For the dungeon crawling, adventurous robber."
- icon_state = "highwayman_clothes"
-
-/obj/item/clothing/under/highwayman_clothes_fem
- name = "Highwayman Clothes"
- desc = "For the dungeon crawling, adventurous robber."
- icon_state = "highwayman_clothes_fem"
-
-/obj/item/clothing/under/businessskirt_female
- name = "Business Skirt"
- desc = "A professional black jacket with a mundane brown skirt. Perfect for the office."
- icon_state = "businessskirt_female"
-
-/obj/item/clothing/under/simpledress
- name = "White Simple Dress"
- desc = "A very short, plain white dress with a light blue sash."
- icon_state = "simpledress"
-
-/obj/item/clothing/under/roman
- name = "Roman Lorica"
- desc = "Replica lorica segmentata. It doesn't feel like it would actually afford much protection against modern weaponry."
- icon_state = "roman"
-
-//Costumes - Bring all of them down here sometime to help build categories?
-/obj/item/clothing/under/lobster
- name = "lobster costume"
- desc = "If you can dance, you've got a career in Law ahead."
- icon_state = "lobster"
-
-/obj/item/clothing/under/mummy
- name = "mummy bandages"
- desc = "This aged and dirty wrap bears the dust of countless aeons. Keep away from water."
- icon_state = "mummy"
-
-/obj/item/clothing/under/skeleton
- name = "skeleton costume"
- desc = "Too spooky, too scary. Those who don this costume are haunted by xylophones."
- icon_state = "skeleton"
-
-/obj/item/clothing/under/scarecrow
- name = "scarecrow costume"
- desc = "Ideal for stalking someone through a field of hay. This suit is less practical on a space station."
- icon_state = "scarecrow"
-
-/obj/item/clothing/under/darkholme
- name = "leather harness costume"
- desc = "The outfit of a dungeon master, and we're not talking about tabletop."
- icon_state = "darkholme"
-
-/obj/item/clothing/under/geisha
- name = "geisha outfit"
- desc = "These silk robes are commonly associated with Old World courtesans and radiate a delicate femininity."
- icon_state = "geisha"
-
-/obj/item/clothing/under/drfreeze
- name = "cryogenic scientist costume"
- desc = "Themed puns aren't required, but they do make you seem cooler."
- icon_state = "drfreeze"
-
-/obj/item/clothing/under/red_mech
- name = "red plug suit"
- desc = "The ideal outfit for a psychotic bitch. Knowledge of German not required."
- icon_state = "red_mech_suit"
-
-/obj/item/clothing/under/white_mech
- name = "white plug suit"
- desc = "For pilots whose color palettes match their personalities."
- icon_state = "white_mech_suit"
-
-/obj/item/clothing/under/blue_mech
- name = "blue plug suit"
- desc = "If you want to sit in your bedroom and cry, this is the suit to do it in."
- icon_state = "blue_mech_suit"
-
-/obj/item/clothing/under/christmas
- name = "holiday suit"
- desc = "This costume hearkens back to Old Earth solstice traditions representing community interaction and an emphemeral concept known as 'holiday cheer'."
- icon_state = "christmasmaler"
-
-/obj/item/clothing/under/christmas/green
- name = "green holiday suit"
- desc = "Commonly associated with faerie-like 'helpers', the color green represents vitality and the coming spring."
- icon_state = "christmasmaleg"
-
-/obj/item/clothing/under/christmasfem
- name = "sexy holiday suit"
- desc = "Appreciation of more physical forms of comfort is important during the holidays. Even when it's cold out."
- icon_state = "christmasfemaler"
-
-/obj/item/clothing/under/christmasfem/green
- name = "sexy green holiday suit"
- desc = "Something special for Santa's little helper."
- icon_state = "christmasfemaleg"
-
-/obj/item/clothing/under/telegram
- name = "singing courier"
- desc = "Living telegram operators experience one of the largest on the job fatality rates of all courier-based occupations."
- icon_state = "telegram"
-
-//Kimonos and Traditional Japanese
-/obj/item/clothing/under/kimono
- name = "plain kimono"
- desc = "The traditional dress of old Earth Japan, the kimono remains ubiquitous across the galaxy due to its comfort, simplicity, and versatility."
- icon_state = "kimono"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/kimono_black
- name = "black kimono"
- desc = "A more somber and reserved pattern of kimono. Wear this to a funeral, or to the climactic sword battle."
- icon_state = "kimono_black"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/kimono_sakura
- name = "sakura pattern kimono"
- desc = "The vibrant pink coloration and subtle flower pattern of this kimono represet the Sakura tree, which was saved from extinction during the Final War thanks to the efforts of conservationists on Luna."
- icon_state = "kimono_sakura"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/kimono_fancy
- name = "festival kimono"
- desc = "A blue kimono similar to those traditionally worn to festivals. Its intricate embroidery and fine coloring are not meant to face much wear and tear."
- icon_state = "kimono_fancy"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/kamishimo
- name = "kamishimo"
- desc = "Popular amongst samurai, these items of clothing are not frequently in vogue. However, their easily recognizable silhouette keeps them from falling into total obscurity."
- icon_state = "kamishimo"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-//Keek's Kimonos
-/obj/item/clothing/under/kimono/red
- name = "red kimono"
- desc = "The traditional dress of old Earth Japan, the kimono remains ubiquitous across the galaxy due to its comfort, simplicity, and versatility."
- icon_state = "kimono_red"
-
-/obj/item/clothing/under/kimono/orange
- name = "orange kimono"
- icon_state = "kimono_orange"
-
-/obj/item/clothing/under/kimono/yellow
- name = "yellow kimono"
- icon_state = "kimono_yellow"
-
-/obj/item/clothing/under/kimono/green
- name = "green kimono"
- icon_state = "kimono_green"
-
-/obj/item/clothing/under/kimono/blue
- name = "blue kimono"
- icon_state = "kimono_blue"
-
-/obj/item/clothing/under/kimono/purple
- name = "purple kimono"
- icon_state = "kimono_purple"
-
-/obj/item/clothing/under/kimono/violet
- name = "violet kimono"
- icon_state = "kimono_violet"
-
-/obj/item/clothing/under/kimono/pink
- name = "pink kimono"
- icon_state = "kimono_pink"
-
-/obj/item/clothing/under/kimono/earth
- name = "earth kimono"
- icon_state = "kimono_earth"
-
-//Chinese Traditional
-/obj/item/clothing/under/qipao
- name = "black qipao"
- desc = "A popular dress from Old Earth China, commonly worn to festivals. Easily recognizable thanks to its intricate embroidery and bold side slits."
- icon_state = "qipao"
-
-/obj/item/clothing/under/qipao/white
- name = "white qipao"
- desc = "A popular dress from Old Earth China, commonly worn to festivals. Easily recognizable thanks to its intricate embroidery and bold side slits."
- icon_state = "qipao_white"
-
-/obj/item/clothing/under/qipao/red
- name = "red qipao"
- desc = "A popular dress from Old Earth China, commonly worn to festivals. Easily recognizable thanks to its intricate embroidery and bold side slits."
- icon_state = "qipao_red"
-
-/obj/item/clothing/under/cheong
- name = "black cheongsam"
- desc = "Popular among the men of Old Earth China during festivals. Embroidered and crafted out of fine silk, this is suitable as formal or casual wear."
- icon_state = "cheong"
-
-/obj/item/clothing/under/cheong/white
- name = "white cheongsam"
- desc = "Popular among the men of Old Earth China during festivals. Embroidered and crafted out of fine silk, this is suitable as formal or casual wear."
- icon_state = "cheongw"
-
-/obj/item/clothing/under/cheong/red
- name = "red cheongsam"
- desc = "Popular among the men of Old Earth China during festivals. Embroidered and crafted out of fine silk, this is suitable as formal or casual wear."
- icon_state = "cheongr"
-
-//Baggy Turtlenecks
-/obj/item/clothing/under/turtlebaggy
- name = "baggy turtleneck (cream)"
- desc = "A cozy knit turtleneck. It's too baggy and comfortable to be tactical."
- icon_state = "bb_turtle"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/turtlebaggy/cream_fem
- name = "baggy turtleneck (cream)(female)"
- desc = "A cozy knit turtleneck. It's too baggy and comfortable to be tactical."
- icon_state = "bb_turtle_fem"
-
-/obj/item/clothing/under/turtlebaggy/purple
- name = "baggy turtleneck (purple)"
- icon_state = "bb_turtlepur"
-
-/obj/item/clothing/under/turtlebaggy/purple_fem
- name = "baggy turtleneck (purple)(female)"
- icon_state = "bb_turtlepur_fem"
-
-/obj/item/clothing/under/turtlebaggy/red
- name = "baggy turtleneck (red)"
- icon_state = "bb_turtlered"
-
-/obj/item/clothing/under/turtlebaggy/red_fem
- name = "baggy turtleneck (red)(female)"
- icon_state = "bb_turtlered_fem"
-
-/obj/item/clothing/under/turtlebaggy/blue
- name = "baggy turtleneck (blue)"
- icon_state = "bb_turtleblu"
-
-/obj/item/clothing/under/turtlebaggy/blue_fem
- name = "baggy turtleneck (blue)(female)"
- icon_state = "bb_turtleblu_fem"
-
-/obj/item/clothing/under/turtlebaggy/green
- name = "baggy turtleneck (green)"
- icon_state = "bb_turtlegrn"
-
-/obj/item/clothing/under/turtlebaggy/green_fem
- name = "baggy turtleneck (green)(female)"
- icon_state = "bb_turtlegrn_fem"
-
-/obj/item/clothing/under/turtlebaggy/black
- name = "baggy turtleneck (black)"
- icon_state = "bb_turtleblk"
-
-/obj/item/clothing/under/turtlebaggy/black_fem
- name = "baggy turtleneck (black)(female)"
- icon_state = "bb_turtleblk_fem"
-
-/obj/item/clothing/under/trader_coveralls
- name = "nebula gas outfit"
- desc = "A hardy and practical uniform distributed to Nebula Gas employees, meant to provide protection and comfort in industrial environments."
- icon_state = "mechanic"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "cargo", SLOT_ID_LEFT_HAND = "cargo")
-
-/obj/item/clothing/under/safari
- name = "safari uniform"
- desc = "A sturdy canvas button-up and shorts, designed to provide protection without retaining heat."
- icon_state = "safari"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
-/obj/item/clothing/under/bsing
- name = "blue performer's outfit"
- desc = "A truly iconic outfit, still worn by enthusiasts and fans of Old Earth digital media."
- icon_state = "bsing"
-
-/obj/item/clothing/under/ysing
- name = "yellow performer's outfit"
- desc = "Inspired by the original, this outfit is still stylish, although derivative."
- icon_state = "ysing"
-
-/obj/item/clothing/under/redcoatformal
- name = "formal red coat"
- desc = "Raise the taxes on their tea. What can go wrong?"
- icon_state = "redcoatformal"
-
-//Colored Clown Suits
-/obj/item/clothing/under/rank/clown/orange
- name = "orange clown suit"
- desc = "Honk!"
- icon_state = "orangeclown"
-
-/obj/item/clothing/under/rank/clown/yellow
- name = "yellow clown suit"
- desc = "Honk!"
- icon_state = "yellowclown"
-
-/obj/item/clothing/under/rank/clown/green
- name = "green clown suit"
- desc = "Honk!"
- icon_state = "greenclown"
-
-/obj/item/clothing/under/rank/clown/blue
- name = "blue clown suit"
- desc = "Honk!"
- icon_state = "blueclown"
-
-/obj/item/clothing/under/rank/clown/purple
- name = "purple clown suit"
- desc = "Honk!"
- icon_state = "purpleclown"
-
-/obj/item/clothing/under/rank/clown/rainbow
- name = "rainbow clown suit"
- desc = "Honk!"
- icon_state = "rainbowclown"
-
-/obj/item/clothing/under/hawaiian
- name = "pink hawaiian suit"
- desc = "A suit consisting of bright white pants and a pink hawaiian shirt. Makes it feel like it's casual friday."
- icon_state = "hawaiianpink"
-
-/obj/item/clothing/under/blueshift
- name = "light blue suit"
- desc = "A casual suit consisting of a light blue dress shirt, navy pants, and a black tie. Makes you think of a security officer in over his head."
- icon_state = "blueshift"
-
-/obj/item/clothing/under/office_worker
- name = "officer worker suit"
- desc = "A suit consisting of a white dress shirt, white pants, black belt, and red-and-black tie."
- icon_state = "hlsuit"
-
-/obj/item/clothing/under/tracksuit_blue
- name = "blue tracksuit"
- desc = "A dark blue tracksuit. It calls to mind images of excercise, particularly squats."
- icon_state = "tracksuit_blue"
-
-/obj/item/clothing/under/druidic_gown
- name = "flowery tunic"
- desc = "A simple linen tunic with a half-skirt of flowers covering one side."
- icon_state = "druidic_gown"
-
-/obj/item/clothing/under/druidic_gown_fem
- name = "flowery tunic"
- desc = "A simple linen tunic with a half-skirt of flowers covering one side."
- icon_state = "druidic_gown_fem"
-
-/obj/item/clothing/under/tribal_tunic
- name = "simple tunic"
- desc = "A simple linen tunic. Smells faintly of earth and flowers"
- icon_state = "tribal_tunic"
-
-/obj/item/clothing/under/tribal_tunic/ashlander
- name = "coarse tunic"
- desc = "A simple, coarse tunic. Smells faintly of ash and charred wood."
- icon_state = "tribal_tunic"
- has_sensors = UNIFORM_HAS_NO_SENSORS
-
-/obj/item/clothing/under/tribal_tunic_fem
- name = "simple tunic"
- desc = "A simple linen tunic. Smells faintly of earth and flowers."
- icon_state = "tribal_tunic_fem"
-
-/obj/item/clothing/under/tribal_tunic_fem/ashlander
- name = "coarse tunic"
- desc = "A simple, coarse tunic. Smells faintly of ash and charred wood."
- icon_state = "tribal_tunic_fem"
- has_sensors = UNIFORM_HAS_NO_SENSORS
-
-/obj/item/clothing/under/acolyte_hunter
- name = "acolyte's garbs"
- desc = "Hand-woven cotton ornated with pieces of turquoise form little more than loincloth, which can be adjusted depending on the wearer's preferences. Well suited for a simpler life."
- icon_state = "acolyte_hunter"
-
-/obj/item/clothing/under/acolyte_hunter_fem
- name = "acolyte's garbs"
- desc = "Hand-woven cotton ornated with pieces of turquoise form little more than loincloth, which can be adjusted depending on the wearer's preferences. Well suited for a simpler life."
- icon_state = "acolyte_hunter_fem"
-
-/obj/item/clothing/under/shamanblue
- name = "blue shaman garbs"
- desc = "Finely crafted cotton clothing, dyed blue with anil. The care and craftsmanship put into such an outfit indicates high status in a tribe. Can be adjusted to suit the wearer's preferences."
- icon_state = "shamanblue"
-
-/obj/item/clothing/under/shamanblue_fem
- name = "blue shaman garbs"
- desc = "Finely crafted cotton clothing, dyed blue with anil. The care and craftsmanship put into such an outfit indicates high status in a tribe. Can be adjusted to suit the wearer's preferences."
- icon_state = "shamanblue_fem"
-
-/obj/item/clothing/under/shamanred
- name = "red shaman garbs"
- desc = "Finely crafted cotton clothing, dyed red with madder root. The care and craftsmanship put into such an outfit indicates high status in a tribe. Can be adjusted to suit the wearer's preferences."
- icon_state = "shamanred"
-
-/obj/item/clothing/under/shamanred_fem
- name = "red shaman garbs"
- desc = "Finely crafted cotton clothing, dyed red with madder root. The care and craftsmanship put into such an outfit indicates high status in a tribe. Can be adjusted to suit the wearer's preferences."
- icon_state = "shamanred_fem"
-
-/obj/item/clothing/under/hunter
- name = "rugged loincloth"
- desc = "Minimal yet hardy clothing padded in places by leather which can be taken off if need be, covering no more than it needs to. Ideal for those who spend their time away from the tribe in pursuit of the hunt."
- icon_state = "hunter"
-
-/obj/item/clothing/under/hunter_fem
- name = "rugged loincloth"
- desc = "Minimal yet hardy clothing padded in places by leather which can be taken off if need be, covering no more than it needs to. Ideal for those who spend their time away from the tribe in pursuit of the hunt."
- icon_state = "hunter_fem"
-
-/obj/item/clothing/under/gatherer
- name = "loincloth"
- desc = "Hand-woven cotton ornated with pieces of turquoise form covering the groin, which can also be adjusted to cover the breasts as well. Well suited for a simpler life."
- icon_state = "gatherer"
-
-/obj/item/clothing/under/gatherer_fem
- name = "loincloth"
- desc = "Hand-woven cotton ornated with pieces of turquoise form covering the groin, which can also be adjusted to cover the breasts as well. Well suited for a simpler life."
- icon_state = "gatherer_fem"
-
-/obj/item/clothing/under/skirt/pleated
- name = "pleated skirt"
- icon_state = "pleated"
-
-
-/obj/item/clothing/var/hides_bulges = FALSE // OwO wats this?
-
-/obj/item/clothing/under/permit
- name = "public nudity permit"
- desc = "This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide."
- icon = 'icons/obj/card_cit.dmi'
- icon_state = "permit-civilian"
- body_cover_flags = 0
- equip_sound = null
-
- item_state = "golem" //This is dumb and hacky but was here when I got here.
- snowflake_worn_state = "golem" //It's basically just a coincidentally black iconstate in the file.
-
-/obj/item/clothing/under/bluespace
- name = "bluespace jumpsuit"
- icon_state = "lingchameleon"
- item_icons = list(
- SLOT_ID_LEFT_HAND = 'icons/mob/items/lefthand_uniforms.dmi',
- SLOT_ID_RIGHT_HAND = 'icons/mob/items/righthand_uniforms.dmi',
- )
- item_state = "lingchameleon"
- snowflake_worn_state = "lingchameleon"
- desc = "Do you feel like warping spacetime today? Because it seems like that's on the agenda, now. \
- Allows one to resize themselves at will, and conceals their true weight."
- hides_bulges = TRUE
- var/original_size
-
-/obj/item/clothing/under/bluespace/verb/toggle_fibers()
- set category = VERB_CATEGORY_OBJECT
- set name = "Adjust fibers"
- set desc = "Adjust your suit fibers. This makes it so your stomach(s) will show or not."
- set src in usr
-
- adjust_fibers(usr)
-
-/obj/item/clothing/under/bluespace/proc/adjust_fibers(mob/user)
- if(hides_bulges == FALSE)
- hides_bulges = TRUE
- to_chat(user, "You tense the suit fibers, hiding your stomach(s).")
- else
- hides_bulges = FALSE
- to_chat(user, "You relax the suit fibers, showing your stomach(s).")
-
-/obj/item/clothing/under/bluespace/verb/resize()
- set name = "Adjust Size"
- set category = VERB_CATEGORY_OBJECT
- set src in usr
- bluespace_size(usr)
-
-/obj/item/clothing/under/bluespace/proc/bluespace_size(mob/usr as mob)
- if (!ishuman(usr))
- return
-
- var/mob/living/carbon/human/H = usr
-
- if (H.stat || H.restrained())
- return
-
- if (src != H.w_uniform)
- to_chat(H,"You must be WEARING the uniform to change your size.")
- return
-
- var/new_size = input("Put the desired size (25-200%)", "Set Size", 200) as num|null
-
- //Check AGAIN because we accepted user input which is blocking.
- if (src != H.w_uniform)
- to_chat(H,"You must be WEARING the uniform to change your size.")
- return
-
- if (H.stat || H.restrained())
- return
-
- if (isnull(H.size_multiplier))
- to_chat(H,"The uniform panics and corrects your apparently microscopic size.")
- H.resize(RESIZE_NORMAL)
- H.update_icons() //Just want the matrix transform
- return
-
- if (!ISINRANGE(new_size,25,200))
- to_chat(H,"The safety features of the uniform prevent you from choosing this size.")
- return
-
- else if(new_size)
- if(new_size != H.size_multiplier)
- if(!original_size)
- original_size = H.size_multiplier
- H.resize(new_size/100)
- H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!")
- else //They chose their current size.
- return
-
-/obj/item/clothing/under/bluespace/unequipped(mob/user, slot, flags)
- . = ..()
- if(. && ishuman(user) && original_size)
- var/mob/living/carbon/human/H = user
- H.resize(original_size)
- original_size = null
- H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!")
-
-//Same as Nanotrasen Security Uniforms
-/obj/item/clothing/under/ert
- armor_type = /datum/armor/centcom/jumpsuit
-
-/obj/item/clothing/under/laconic
- name = "laconic field suit"
- desc = "A lightweight black turtleneck with padded gray slacks. It seems comfortable, but practical."
- icon_state = "laconic"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "grey", SLOT_ID_LEFT_HAND = "grey")
-
-/obj/item/clothing/under/bountyskin
- name = "bounty hunter skinsuit"
- desc = "A skintight bodysuit meant to be worn under powered armor. Popularized by a famous bounty hunter."
- icon_state = "bountyskin"
-
-/obj/item/clothing/under/smooth_gray
- name = "smooth gray jumpsuit"
- desc = "An ironed version of the famous, bold, and bald apparel. As smooth as it looks, it does not guarantee being able to slip away."
- icon_state = "gray_smooth_jumpsuit"
-
-/obj/item/clothing/under/navy_gray
- name = "navy gray jumpsuit"
- desc = "A light grey-blue jumpsuit resembling those worn in the Navy, without any of the traditional markings."
- icon = 'icons/clothing/uniform/rank/utility.dmi'
- icon_state = "lightnavy"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
- worn_bodytypes = BODYTYPE_DEFAULT
-
-/obj/item/clothing/under/chiming_dress
- name = "chiming dress"
- desc = "This stylish yet rugged dress is inspired by recovered depictions of ancient Surt's native inhabitants. Composed of many integrated panels, it allows for excellent breathability whilst also retaining a strong profile."
- icon_state = "chiming_dress"
-
-//Antediluvian
-
-/obj/item/clothing/under/antediluvian
- name = "Antediluvian corset"
- desc = "This metallic corset and sturdy cloth bustier provide very little coverage. A dismountable sheer bodystocking integrated into the clothing retains some modesty. It is unknown whether it serveed ceremonial or official purpose."
- icon_state = "antediluvian"
- item_state = "antediluvian"
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- //item_action_name = "Reconfigure Suit"
-
-/*
-/obj/item/clothing/under/antediluvian/verb/switchsprite()
- set name = "Reconfigure Suit"
- set category = VERB_CATEGORY_OBJECT
- set src in usr
- if(!istype(usr, /mob/living))
- return
- if(usr.stat)
- return
- to_chat(usr, "You rearrange the suit's configuration.")
- if(snowflake_worn_state == "antediluvian_s")
- snowflake_worn_state = "antediluvian_d_s"
- if(snowflake_worn_state == "antediluvian_d_s")
- snowflake_worn_state = "antediluvian_s"
-*/
-
-/obj/item/clothing/under/antediluvian/dress
- name = "Antediluvian dress"
- desc = "A metalic dress with inner padding, following a similar, scantily-clad fashion trend. It is unknown whether it served ceremonial or official purpose."
- icon_state = "ante"
- icon = 'icons/clothing/suit/misc/ante.dmi'
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
-
-/obj/item/clothing/under/antediluvian/dress/aziru
- name = "Antediluvian Wrap"
- desc = "A dress made out of an elegantly wrapped single piece of cloth, with golden embellishments of unknown origin. It seems to have purposefully exposed arms."
- icon_state = "aziru_dress"
- icon = 'icons/clothing/uniform/misc/ante_aziru.dmi'
-
-/obj/item/clothing/under/antediluvian/dress/ante_boobflap
- name = "Antediluvian Chest Flaps"
- desc = "A comfortable collar with two trailing flaps going down onto the chest area, meeting the bare minimum requirements for decency, should they stay in place in motion."
- icon_state = "ante_boobflap"
- icon = 'icons/clothing/uniform/misc/ante_boobflap.dmi'
-
-/obj/item/clothing/under/hasie
- name = "Hasie skirt"
- desc = "A daring combination of dark charcoals and vibrant reds and whites, the Hasie skirt/vest combo knows what it's doing. Sporting a low cut charcoal miniskirt and matching midriff button-up, this ensemble wows with the incredible color contrast of its two-tone vest."
- icon_state = "hasie"
-
-/obj/item/clothing/under/utility_fur_pants
- name = "Utility Fur Pants"
- desc = "A pair of pants designed to match the Utility Fur coat."
- icon_state = "furup"
-
-/obj/item/clothing/under/half_moon
- name = "Half Moon outfit"
- desc = "This eminently fashionable outfit evokes memories of Luna. It consists of a tailored latex leotard and daringly cut white shorts. Paired with plunging off-color stockings, it's to die for."
- icon_state = "half_moon"
-
-//Military Surplus
-/obj/item/clothing/under/surplus
- name = "surplus fatigues"
- desc = "Old military fatigues like these are very common across the Frontier. Sturdy and somewhat comfortable, they hold up to the harsh working environments many colonists face, while also adding a little flair - regardless of prior military service."
- icon_state = "bdu_olive"
-
-/obj/item/clothing/under/surplus/desert
- icon_state = "bdu_desert"
-
-/obj/item/clothing/under/surplus/russoblue
- icon_state = "bdu_russoblue"
-
-/obj/item/clothing/under/toga
- name = "toga"
- desc = "A length of white wool, wrapped carefully around the wearer. Sometimes bound by a belt or sash, in some cultures the way the toga was wrapped and worn denoted social status."
- icon = 'icons/clothing/uniform/costume/toga.dmi'
- icon_state = "toga"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/aquiline_enforcer
- name = "aquiline enforcer uniform"
- desc = "Prior to the Final War issues with law enforcement on Old Earth became so bad that in many countries the police became little more than roving executioners. Ornate uniforms such as this one purport to be based on accounts of those times."
- icon = 'icons/clothing/uniform/costume/aquiline.dmi'
- icon_state = "dredd"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/countess
- name = "countess dress"
- desc = "This flowing dress radiates a dark authority. Its wide skirt and daring color palette bring to mind the feeling of movement in shadows, or a rush of blood."
- icon = 'icons/clothing/uniform/misc/countess.dmi'
- icon_state = "countess"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/baroness
- name = "baroness dress"
- desc = "With its imposing train and sanguine color palette, this dress aims to menace. Some day the designer sought to evoke the downfall of Vetala in its design."
- icon = 'icons/clothing/uniform/misc/baroness.dmi'
- icon_state = "baroness"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/yoko
- name = "scavenging sniper set"
- desc = "This outfit seems to favor tight materials and lots of open skin. It's likely that its previous owner hailed from an arid environment. It remains stylish, regardless of climate."
- icon = 'icons/clothing/uniform/costume/spiral.dmi'
- icon_state = "yoko"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/kamina
- name = "spiral hero outfit"
- desc = "An outfit that radiates pure authority. Yours is the drill that will pierce the heavens."
- icon = 'icons/clothing/uniform/costume/spiral.dmi'
- icon_state = "kamina"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/tape
- name = "body tape wrapping"
- desc = "Several layers of flexible body tape may be placed in a skintight arrangement that protects the user's modesty while still allowing them to dazzle. Odds of winning a Multipass increase when wearing this attire."
- icon = 'icons/clothing/uniform/misc/tape.dmi'
- icon_state = "tape"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/revealing
- name = "revealing cocktail dress"
- desc = "A dress this daring requires certain amounts of confidence that few possess. Show off what you've got without too much of a scandal."
- icon = 'icons/clothing/uniform/misc/revealing.dmi'
- icon_state = "revealingdress"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-//Lindenoak Line
-/obj/item/clothing/under/sitri
- name = "Sitri striped sweater"
- desc = "A comfortable, fashionable pair of high waisted shorts paired with a striped grey and white turtleneck. The Goetic seal of Sitri is embroidered on the left breast pocket in soft grey thread. A tag on the inside of the sweater bears the name 'Lindenoak' in both Common and Daemonic."
- icon = 'icons/clothing/uniform/misc/lindenoak.dmi'
- icon_state = "sitri"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/belial
- name = "Belial striped shirt and shorts"
- desc = "A comfortable cotton shirt in a mix of blazing red, white and blue hues, combined with a pair of white shorts and accompanying, crisscrossing black lace along it's sides. Its tag marks it as belonging to the Lindenoak clothing line."
- icon = 'icons/clothing/uniform/misc/lindenoak.dmi'
- icon_state = "belial"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/lilin
- name = "Lilin sash dress"
- desc = "An exotic shoulderless dress that plunges into an open-hipped sash-like silk skirt. Its fading dyework seems to evoke a sense of bleeding. A small tag marks it as belonging to the Lindenoak line."
- icon = 'icons/clothing/uniform/misc/lindenoak.dmi'
- icon_state = "lilin"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/asmodai
- name = "Asmodai laced blouse"
- desc = "An open chest blouse held together by black lacing and coupled with a pair side pre-ripped jeans. It's an outfit that's as much comfortable as it is fashionable. A small tag marks it as belonging to the Lindenoak line."
- icon = 'icons/clothing/uniform/misc/lindenoak.dmi'
- icon_state = "asmodai"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/skirt/highwaisted
- name = "high-waisted business skirt"
- desc = "A well tailored skirt matched with a form fitting blouse, perfect for all those paper pushing needs."
- icon = 'icons/clothing/uniform/misc/lindenoak.dmi'
- icon_state = "hueyskirt"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/summer
- name = "summer dress"
- desc = "A light and breezy dress designed to keep its wearer comfortable on hot summer days."
- icon = 'icons/clothing/uniform/misc/summer_dress.dmi'
- icon_state = "summerdress"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/summer/blue
- name = "blue summer dress"
- icon = 'icons/clothing/uniform/misc/summer_dress.dmi'
- icon_state = "summerdress2"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/summer/red
- name = "red summer dress"
- icon = 'icons/clothing/uniform/misc/summer_dress.dmi'
- icon_state = "summerdress3"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/summer/gold
- name = "golden summer dress"
- desc = "A light and breezy dress designed to keep its wearer comfortable on hot summer days. This one features an especially daring side cut."
- icon = 'icons/clothing/uniform/misc/summer_dress.dmi'
- icon_state = "summerdress_nt"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-//Had to split these into two paths to avoid bloating the loadout.
-/obj/item/clothing/under/skinsuit
- name = "skinsuit"
- desc = "Similar to other form-fitting latex bodysuits in design and function, skinsuits typically feature integrated hardpoints around common wear areas."
- icon = 'icons/clothing/uniform/misc/skinsuit.dmi'
- icon_state = "skinsuit"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/skinsuit/gray
- name = "gray skinsuit"
- icon_state = "skinsuit_g"
-
-/obj/item/clothing/under/skinsuit/leotard
- name = "leotard skinsuit"
- desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations."
- icon_state = "skinsuitleo"
-
-/obj/item/clothing/under/skinsuit/leotard/gray
- name = "gray leotard skinsuit"
- icon_state = "skinsuitleo_g"
-
-//As with the above.
-/obj/item/clothing/under/skinsuit_fem
- name = "skinsuit"
- desc = "Similar to other form-fitting latex bodysuits in design and function, skinsuits typically feature integrated hardpoints around common wear areas."
- icon = 'icons/clothing/uniform/misc/skinsuit.dmi'
- icon_state = "skinsuitfem"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/skinsuit_fem/gray
- name = "gray skinsuit"
- icon_state = "skinsuitfem_g"
-
-/obj/item/clothing/under/skinsuit_fem/leotard
- name = "leotard skinsuit"
- desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations."
- icon_state = "skinsuitfemleo"
-
-/obj/item/clothing/under/skinsuit_fem/leotard/gray
- name = "gray leotard skinsuit"
- icon_state = "skinsuitfemleo_g"
-
-/obj/item/clothing/under/skinsuit_striped
- name = "skinsuit striped"
- desc = "A dark skinsuit with white stripe embellishments, covering the contours. The latest in the line of skintight outfits that this crew in particular greatly prefers, to the point they now take up 30% of the sector's demands among NT's facilities."
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
- icon = 'icons/clothing/uniform/misc/skin_taped.dmi'
- icon_state = "skinsuit_taped"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-//Alt Bodysuits
-/obj/item/clothing/under/bodysuit/alt
- name = "alternate bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
- icon = 'icons/clothing/uniform/misc/bodysuit_alt.dmi'
- icon_state = "altbodysuit"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/bodysuit/alt/sleeveless
- name = "sleeveless alternate bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one is designed to stop at the mid-bicep, allowing total freedom to the wearer's forearms."
- icon_state = "altbodysuit_sleeves"
-
-/obj/item/clothing/under/bodysuit/alt/pants
- name = "alternate bodysuit pants"
- desc = "Following complaints that bodysuits were too tight to roll down to the waist, production of bodysuit pants as singular items grew in popularity."
- icon_state = "altbodysuit_pants"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/bodysuit/alt_fem
- name = "alternate bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
- icon = 'icons/clothing/uniform/misc/bodysuit_alt.dmi'
- icon_state = "altbodysuitfem"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/bodysuit/alt_fem/sleeveless
- name = "sleeveless alternate bodysuit"
- desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one is designed to stop at the mid-bicep, allowing total freedom to the wearer's forearms."
- icon_state = "altbodysuitfem_sleeves"
-
-/obj/item/clothing/under/bodysuit/alt_fem/pants
- name = "bodysuit pants"
- desc = "Following complaints that bodysuits were too tight to roll down to the waist, production of bodysuit pants as singular items grew in popularity."
- icon_state = "altbodysuitfem_pants"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-//Historical Military Uniforms
-/obj/item/clothing/under/redcoat
- name = "redcoat uniform"
- desc = "Looks old."
- icon = 'icons/clothing/uniform/misc/old_military.dmi'
- icon_state = "redcoatformal"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/general
- name = "despotic general uniform"
- desc = "Looks old."
- icon = 'icons/clothing/uniform/misc/old_military.dmi'
- icon_state = "general"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "grey", SLOT_ID_LEFT_HAND = "grey")
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/american
- name = "post-revolutionary american uniform"
- desc = "Looks old."
- icon = 'icons/clothing/uniform/misc/old_military.dmi'
- icon_state = "american"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/prussian
- name = "prussian uniform"
- desc = "Looks old."
- icon = 'icons/clothing/uniform/misc/old_military.dmi'
- icon_state = "prussian"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/soviet
- name = "soviet uniform"
- desc = "For the Motherland!"
- icon = 'icons/clothing/uniform/misc/old_military.dmi'
- icon_state = "soviet"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "grey", SLOT_ID_LEFT_HAND = "grey")
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/ballet
- name = "\improper Antheia tutu"
- desc = "A gossamer thin tutu from the boutique Antheia line. Famed for their flexibility and ease of motion, these outfits originate from Old Earth dance traditions."
- icon = 'icons/clothing/uniform/misc/ballet.dmi'
- icon_state = "tutu"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "white", SLOT_ID_LEFT_HAND = "white")
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/blackshortsripped
- name = "ripped black shorts"
- desc = "A pair of torn up black shorts, for those who know better."
- icon_state = "black_shorts_ripped"
-
-/obj/item/clothing/under/darkcleric
- name = "dark cleric armor"
- desc = "A chainmail tunic layered with a leather cuirass and religious iconography. Worn in veneration of a forgotten god."
- icon = 'icons/clothing/uniform/costume/darkcleric.dmi'
- icon_state = "darkcleric"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
-
-/obj/item/clothing/under/tourist
- name = "tourist liesurewear"
- desc = "This loud shirt is made of mid-grade cashmere. This premier liesurewear pairs well with a nice pair of khaki shorts that stop uncomfortably above the knee."
- icon = 'icons/clothing/uniform/misc/tourist.dmi'
- icon_state = "tourist"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
-
-/obj/item/clothing/under/replika/arar
- name = "repair-worker replikant bodysuit"
- desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the engineering variety. Comes with multiple interfacing ports, arm protectors, and a conspicuous lack of leg coverage."
- description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "arar"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/replika/lstr
- name = "land-survey replikant bodysuit"
- desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the exploration variety. Comes with several interfacing ports and a conspicuous lack of leg coverage."
- description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "lstr"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/replika/sakr
- name = "medical replikant bodysuit"
- desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the medical variety. Comes with default interfacing ports and a conspicuous lack of leg coverage."
- description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "sakr"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/replika/fklr
- name = "command replikant bodysuit"
- desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the command variety. Comes with interfacing ports, an air of formality, and a conspicuous lack of leg coverage."
- description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "fklr"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/replika/eulr
- name = "general-purpose replikant bodysuit"
- desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of multipurpose variety. Comes with default interfacing ports and a conspicuous lack of leg coverage."
- description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "eulr"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/replika/klbr
- name = "controller replikant bodysuit"
- desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the controller variety. Comes with several interfacing ports and a conspicuous lack of leg coverage."
- description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "klbr"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/replika/stcr
- name = "security-technician replikant bodysuit"
- desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the security variety. Comes with multiple interfacing ports and a conspicuous lack of leg coverage."
- description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "stcr"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/replika/adlr
- name = "administration replikant bodysuit"
- desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the administrative variety. Comes with several interfacing ports and a conspicuous lack of leg coverage."
- description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "adlr"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/replika/lstr_alt
- name = "combat-engineer replikant bodysuit"
- desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the exploration variety. Comes with extra interfacing ports, white armpads, and a familiar lack of leg coverage."
- description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "lstr_alt"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/gestalt/sleek_skirt
- name = "sleek crew skirt"
- desc = "A tight-fitting black uniform with a narrow skirt and striking crimson trim."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "gestalt_skirt"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/gestalt/sleek
- name = "sleek crew uniform"
- desc = "A tight-fitting black uniform with striking crimson trim."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "gestalt"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/gestalt/sleek_fem
- name = "sleek female crew uniform"
- desc = "A tight-fitting black uniform with striking crimson trim."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "gestalt_fem"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-
-/obj/item/clothing/under/gestalt/sleeveless
- name = "sleeveless sleek crew uniform"
- desc = "A tight-fitting, sleeveless single-piece black uniform with striking crimson trim."
- icon = 'icons/clothing/uniform/misc/replika.dmi'
- icon_state = "gestalt_sleeveless"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/sleeveless_qipao
- name = "sleeveless black qipao"
- desc = "A popular dress from Old Earth China, commonly worn to festivals. Easily recognizable thanks to its intricate embroidery and bold side slits."
- icon = 'icons/clothing/uniform/misc/sleeveless_qipao.dmi'
- icon_state = "sleevelessqipao"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/nanotrasen_vr.dm b/code/modules/clothing/under/nanotrasen_vr.dm
deleted file mode 100644
index a61046069d0..00000000000
--- a/code/modules/clothing/under/nanotrasen_vr.dm
+++ /dev/null
@@ -1,55 +0,0 @@
-//Nanotrasen Security Uniforms
-
-/obj/item/clothing/under/nanotrasen
- name = "Nanotrasen uniform"
- desc = "A comfortable turtleneck and black trousers sporting nanotrasen symbols."
- icon_state = "navyutility"
- snowflake_worn_state = "navyutility"
- armor_type = /datum/armor/none
- siemens_coefficient = 0.9
-
-/obj/item/clothing/under/nanotrasen/security
- name = "Nanotrasen security uniform"
- desc = "The security uniform of Nanotrasen's security. It looks sturdy and well padded"
- icon_state = "navyutility_sec"
- snowflake_worn_state = "navyutility_sec"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/nanotrasen/security/warden
- name = "Nanotrasen warden uniform"
- desc = "The uniform of the Nanotrasen's prison wardens. It looks sturdy and well padded. This one has gold cuffs."
- icon_state = "navyutility_com"
- snowflake_worn_state = "navyutility_com"
-
-/obj/item/clothing/under/nanotrasen/security/commander
- name = "Nanotrasen security command uniform"
- desc = "The uniform of the Nanotrasen's security commanding officers. It looks sturdy and well padded. This one has gold trim and red blazes."
- icon_state = "blackutility_seccom"
- snowflake_worn_state = "blackutility_seccom"
-
-//Head Gear
-
-/obj/item/clothing/head/soft/nanotrasen
- name = "Nanotrasen security cap"
- desc = "It's a NT blue ballcap with a Nanotrasen crest. It looks surprisingly sturdy."
- icon_state = "fleetsoft"
- item_state_slots = list(
- SLOT_ID_LEFT_HAND = "darkbluesoft",
- SLOT_ID_RIGHT_HAND = "darkbluesoft",
- )
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/head/beret/nanotrasen
- name = "Nanotrasen security beret"
- desc = "A NT blue beret belonging to the Nanotrasen security forces. For personnel that are more inclined towards style than safety."
- icon_state = "beret_navy"
-
-//Armor
-
-/obj/item/clothing/suit/storage/vest/nanotrasen
- name = "security armor vest"
- desc = "A Sturdy kevlar plate carrier with webbing attached."
- icon_state = "webvest"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "swat", SLOT_ID_LEFT_HAND = "swat")
- armor_type = /datum/armor/station/tactical
- weight = ITEM_WEIGHT_ARMOR_LIGHT
diff --git a/code/modules/clothing/under/oricon/_oricon.dm b/code/modules/clothing/under/oricon/_oricon.dm
deleted file mode 100644
index 859f13caff9..00000000000
--- a/code/modules/clothing/under/oricon/_oricon.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-/obj/item/clothing/under/oricon
- name = "master oricon uniform"
- desc = "You shouldn't be seeing this."
- armor_type = /datum/armor/station/padded
- siemens_coefficient = 0.8
- // default to false
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- // default to no inhand; until someone gets generic inhands
- worn_render_flags = WORN_RENDER_INHAND_NO_RENDER | WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
diff --git a/code/modules/clothing/under/oricon/utility.dm b/code/modules/clothing/under/oricon/utility.dm
deleted file mode 100644
index 19ff5c43585..00000000000
--- a/code/modules/clothing/under/oricon/utility.dm
+++ /dev/null
@@ -1,236 +0,0 @@
-/obj/item/clothing/under/oricon/utility
- icon = 'icons/clothing/uniform/rank/utility.dmi'
-
-/obj/item/clothing/under/oricon/utility/sysguard
- name = "explorer's uniform"
- desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim."
- armor_type = /datum/armor/uniform/utility
- icon_state = "black_crew"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/command
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command)
- name = "explorer's command uniform"
- icon_state = "black_command" // todo: actual state
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/engineering
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering)
- name = "explorer's engineering uniform"
- icon_state = "black_eng"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/security
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security)
- name = "explorer's security uniform"
- icon_state = "black_sec"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/medical
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical)
- name = "explorer's medical uniform"
- icon_state = "black_med"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/supply
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply)
- name = "explorer's logistics uniform"
- icon_state = "black_sup"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/exploration
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration)
- name = "explorer's uniform"
- icon_state = "black" // todo: actual state
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/research
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research)
- name = "explorer's research uniform"
- icon_state = "black_sci"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/officer
- name = "explorer's officer uniform"
- desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has gold trim."
- icon_state = "black_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/officer/command
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command)
- name = "explorer's command officer uniform"
- icon_state = "black_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/officer/engineering
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering)
- name = "explorer's engineering officer uniform"
- icon_state = "black_eng_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/officer/security
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security)
- name = "explorer's security officer uniform"
- icon_state = "black_sec_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/officer/medical
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical)
- name = "explorer's medical officer uniform"
- icon_state = "black_med_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/officer/supply
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply)
- name = "explorer's logistics officer uniform"
- icon_state = "black_command" // todo: actual state
-
-// todo: you actual memes why does this exist
-/obj/item/clothing/under/oricon/utility/sysguard/officer/exploration
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration)
- name = "explorer's expeditionary officer uniform"
- icon_state = "black_command" // todo: actual state
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/sysguard/officer/research
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research)
- name = "explorer's science officer uniform"
- icon_state = "black_sci_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/fleet
- name = "fleet coveralls"
- desc = "The utility uniform of the JSDF Fleet, made from an insulated material."
- icon_state = "navy"
- worn_rolldown_state = "navy_down"
- siemens_coefficient = 0.7
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/fleet/command
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/fleet)
- name = "fleet command coveralls"
- icon_state = "navy_command"
- worn_rolldown_state = null
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/fleet/command/pilot
- starting_accessories = list(/obj/item/clothing/accessory/oricon/specialty/pilot)
- name = "fleet pilot coveralls"
- icon_state = "navy_officer"
- worn_rolldown_state = null
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/fleet/engineering
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/fleet)
- name = "fleet engineer coveralls"
- icon_state = "navy_engi"
-
-/obj/item/clothing/under/oricon/utility/fleet/security
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/fleet)
- name = "fleet security coveralls"
- icon_state = "navy_sec"
-
-/obj/item/clothing/under/oricon/utility/fleet/medical
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/fleet)
- name = "fleet medical coveralls"
- icon_state = "navy_med"
-
-/obj/item/clothing/under/oricon/utility/fleet/supply
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/fleet)
- name = "fleet logistics coveralls"
- icon_state = "navy_sup"
-
-/obj/item/clothing/under/oricon/utility/fleet/exploration
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/fleet)
- name = "fleet explorer coveralls"
- icon_state = "navy_combat"
- worn_rolldown_state = null
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine
- name = "marine fatigues"
- desc = "The utility uniform of the JSDF Marine Corps, made from durable material."
- icon_state = "grey"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine/command
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/marine)
- name = "marine command coveralls"
- icon_state = "grey_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine/engineering
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/marine)
- name = "marine engineering coveralls"
- icon_state = "grey_eng"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine/security
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/marine)
- name = "marine security coveralls"
- icon_state = "grey_sec"
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine/medical
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/marine)
- name = "marine medical coveralls"
- icon_state = "grey_med"
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine/supply
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/marine)
- name = "marine logistics coveralls"
- icon_state = "grey_sup"
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine/exploration
- starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/marine)
- name = "marine explorer coveralls"
- icon_state = "terran"
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine/research
- name = "marine researcher coveralls"
- icon_state = "grey_sci"
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
- worn_has_rolldown = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine/green
- name = "green fatigues"
- desc = "A green version of the JSDF marine utility uniform, made from durable material."
- icon_state = "green"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/oricon/utility/marine/tan
- name = "tan fatigues"
- desc = "A tan version of the JSDF marine utility uniform, made from durable material."
- icon_state = "tan"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
deleted file mode 100644
index dbac3d0a821..00000000000
--- a/code/modules/clothing/under/pants.dm
+++ /dev/null
@@ -1,217 +0,0 @@
-//these need item states -S2-
-/obj/item/clothing/under/pants
- name = "jeans"
- desc = "A nondescript pair of tough blue jeans."
- icon_state = "jeans"
- gender = PLURAL
- body_cover_flags = LOWER_TORSO|LEGS
-
-/obj/item/clothing/under/pants/ripped
- name = "ripped jeans"
- desc = "A nondescript pair of tough blue jeans with holes in them."
- icon_state = "jeansripped"
-
-/obj/item/clothing/under/pants/classicjeans
- name = "classic jeans"
- desc = "You feel cooler already."
- icon_state = "jeansclassic"
-
-/obj/item/clothing/under/pants/classicjeans/ripped
- name = "ripped classic jeans"
- desc = "You feel cooler already. These have holes in them."
- icon_state = "jeansclassicripped"
-
-/obj/item/clothing/under/pants/mustangjeans
- name = "must hang jeans"
- desc = "Made in the finest space jeans factory this side of Alpha Centauri."
- icon_state = "jeansmustang"
-
-/obj/item/clothing/under/pants/mustangjeans/ripped
- name = "ripped must hang jeans"
- desc = "Made in the finest space jeans factory this side of Alpha Centauri. These have holes in them."
- icon_state = "jeansmustangripped"
-
-/obj/item/clothing/under/pants/blackjeans
- name = "black jeans"
- desc = "Only for those who can pull it off."
- icon_state = "jeansblack"
-
-/obj/item/clothing/under/pants/blackjeans/ripped
- name = "ripped black jeans"
- desc = "Only for those who can pull it off. These have holes in them."
- icon_state = "jeansblackripped"
-
-/obj/item/clothing/under/pants/greyjeans
- name = "grey jeans"
- desc = "Only for those who can pull it off."
- icon_state = "jeansgrey"
-
-/obj/item/clothing/under/pants/greyjeans/ripped
- name = "ripped grey jeans"
- desc = "Only for those who can pull it off. These have holes in them."
- icon_state = "jeansgreyripped"
-
-/obj/item/clothing/under/pants/youngfolksjeans
- name = "young folks jeans"
- desc = "For those tired of boring old jeans. Relive the passion of your youth!"
- icon_state = "jeansyoungfolks"
-
-/obj/item/clothing/under/pants/white
- name = "white pants"
- desc = "Plain white pants. Boring."
- icon_state = "whitepants"
-
-/obj/item/clothing/under/pants/red
- name = "red pants"
- desc = "Bright red pants. Overflowing with personality."
- icon_state = "redpants"
-
-/obj/item/clothing/under/pants/black
- name = "black pants"
- desc = "These pants are dark, like your soul."
- icon_state = "blackpants"
-
-/obj/item/clothing/under/pants/tan
- name = "tan pants"
- desc = "Some tan pants. You look like a white collar worker with these on."
- icon_state = "tanpants"
-
-/obj/item/clothing/under/pants/track
- name = "track pants"
- desc = "A pair of track pants, for the athletic."
- icon_state = "trackpants"
-
-/obj/item/clothing/under/pants/track/blue
- name = "blue track pants"
- icon_state = "trackpantsblue"
-
-/obj/item/clothing/under/pants/track/green
- name = "green track pants"
- icon_state = "trackpantsgreen"
-
-/obj/item/clothing/under/pants/track/white
- name = "white track pants"
- icon_state = "trackpantswhite"
-
-/obj/item/clothing/under/pants/track/red
- name = "red track pants"
- icon_state = "trackpantsred"
-
-/obj/item/clothing/under/pants/khaki
- name = "khaki pants"
- desc = "A pair of dust beige khaki pants."
- icon_state = "khaki"
-
-/obj/item/clothing/under/pants/camo
- name = "camo pants"
- desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
- icon_state = "camopants"
-
-/obj/item/clothing/under/pants/chaps
- name = "sexy brown chaps"
- desc = "A pair of sexy, tight brown leather chaps."
- icon_state = "chapsb"
-
-/obj/item/clothing/under/pants/chaps/black
- name = "sexy black chaps"
- desc = "A pair of sexy, tight black leather chaps."
- icon_state = "chapsbl"
-
-/obj/item/clothing/under/pants/yogapants
- name = "yoga pants"
- desc = "A pair of tight-fitting yoga pants for those lazy days."
- icon_state = "yogapants"
- addblends = "yogapants_a"
-
-/*
- * Baggy Pants
- */
-/obj/item/clothing/under/pants/baggy
- name = "baggy jeans"
- desc = "A nondescript pair of tough baggy blue jeans."
- icon_state = "baggy_jeans"
-
-/obj/item/clothing/under/pants/baggy/classicjeans
- name = "baggy classic jeans"
- desc = "You feel cooler already."
- icon_state = "baggy_jeansclassic"
-
-/obj/item/clothing/under/pants/baggy/mustangjeans
- name = "maggy must hang jeans"
- desc = "Made in the finest space jeans factory this side of Alpha Centauri."
- icon_state = "baggy_jeansmustang"
-
-/obj/item/clothing/under/pants/baggy/blackjeans
- name = "baggy black jeans"
- desc = "Only for those who can pull it off."
- icon_state = "baggy_jeansblack"
-
-/obj/item/clothing/under/pants/baggy/greyjeans
- name = "baggy grey jeans"
- desc = "Only for those who can pull it off."
- icon_state = "baggy_jeansgrey"
-
-/obj/item/clothing/under/pants/baggy/youngfolksjeans
- name = "baggy young folks jeans"
- desc = "For those tired of boring old jeans. Relive the passion of your youth!"
- icon_state = "baggy_jeansyoungfolks"
-
-/obj/item/clothing/under/pants/baggy/white
- name = "baggy white pants"
- desc = "Plain white pants. Boring."
- icon_state = "baggy_whitepants"
-
-/obj/item/clothing/under/pants/baggy/red
- name = "baggy red pants"
- desc = "Bright red pants. Overflowing with personality."
- icon_state = "baggy_redpants"
-
-/obj/item/clothing/under/pants/baggy/black
- name = "baggy black pants"
- desc = "These pants are dark, like your soul."
- icon_state = "baggy_blackpants"
-
-/obj/item/clothing/under/pants/baggy/tan
- name = "baggy tan pants"
- desc = "Some tan pants. You look like a white collar worker with these on."
- icon_state = "baggy_tanpants"
-
-/obj/item/clothing/under/pants/baggy/track
- name = "baggy track pants"
- desc = "A pair of track pants, for the athletic."
- icon_state = "baggy_trackpants"
-
-/obj/item/clothing/under/pants/baggy/khaki
- name = "baggy khaki pants"
- desc = "A pair of dust beige khaki pants."
- icon_state = "baggy_khaki"
-
-/obj/item/clothing/under/pants/baggy/camo
- name = "baggy camo pants"
- desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
- icon_state = "baggy_camopants"
-
-/obj/item/clothing/under/pants/utility
- name = "green utility pants"
- desc = "A pair of pleather reinforced green work pants."
- icon_state = "workpants_green"
-
-/obj/item/clothing/under/pants/utility/orange
- name = "orange utility pants"
- desc = "A pair of pleather reinforced orange work pants."
- icon_state = "workpants_orange"
-
-/obj/item/clothing/under/pants/utility/blue
- name = "blue utility pants"
- desc = "A pair of pleather reinforced blue work pants."
- icon_state = "workpants_blue"
-
-/obj/item/clothing/under/pants/utility/white
- name = "white utility pants"
- desc = "A pair of pleather reinforced white work pants."
- icon_state = "workpants_white"
-
-/obj/item/clothing/under/pants/utility/red
- name = "red utility pants"
- desc = "A pair of pleather reinforced red work pants."
- icon_state = "workpants_red"
diff --git a/code/modules/clothing/under/shiny_vr.dm b/code/modules/clothing/under/shiny_vr.dm
deleted file mode 100644
index a5fdac71bfb..00000000000
--- a/code/modules/clothing/under/shiny_vr.dm
+++ /dev/null
@@ -1,20 +0,0 @@
-/obj/item/clothing/under/shiny
- icon_override = 'icons/mob/clothing/modular_latex.dmi'
- icon = 'icons/obj/clothing/modular_shiny.dmi'
- desc = "You can be a super-hero in this! Just don't forget your mask!"
-
-/obj/item/clothing/under/shiny/catsuit
- name = "shiny suit"
- icon_state = "suit"
- var/opened = 0
-
-/obj/item/clothing/under/shiny/catsuit/poly
- name = "polychromic shiny suit"
- icon_state = "suit_col"
-
-/obj/item/clothing/under/shiny/leotard
- name = "shiny leotard"
- icon_state = "leotard"
-
-/obj/item/clothing/under/shiny/leotard/poly
- name = "polychromic shiny leotard"
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
deleted file mode 100644
index 68ed5bac492..00000000000
--- a/code/modules/clothing/under/shorts.dm
+++ /dev/null
@@ -1,256 +0,0 @@
-//these need item states -S2-
-/obj/item/clothing/under/shorts
- name = "athletic shorts"
- desc = "95% Polyester, 5% Spandex!"
- gender = PLURAL
- body_cover_flags = LOWER_TORSO
-
-/obj/item/clothing/under/shorts/red
- name = "red athletic shorts"
- icon_state = "redshorts"
-
-/obj/item/clothing/under/shorts/green
- name = "green athletic shorts"
- icon_state = "greenshorts"
-
-/obj/item/clothing/under/shorts/blue
- name = "blue athletic shorts"
- icon_state = "blueshorts"
-
-/obj/item/clothing/under/shorts/black
- name = "black athletic shorts"
- icon_state = "blackshorts"
-
-/obj/item/clothing/under/shorts/grey
- name = "grey athletic shorts"
- icon_state = "greyshorts"
-
-/obj/item/clothing/under/shorts/white
- name = "white shorts"
- icon_state = "whiteshorts"
-
-/obj/item/clothing/under/shorts/white/female
- name = "white short shorts"
- icon_state = "whiteshorts_f"
-
-/obj/item/clothing/under/shorts/jeans
- name = "jeans shorts"
- desc = "Some jeans! Just in short form!"
- icon_state = "jeans_shorts"
-
-/obj/item/clothing/under/shorts/jeans/female
- name = "jeans short shorts"
- icon_state = "jeans_shorts_f"
-
-/obj/item/clothing/under/shorts/jeans/classic
- name = "classic jeans shorts"
- icon_state = "jeansclassic_shorts"
-
-/obj/item/clothing/under/shorts/jeans/classic/female
- name = "classic jeans short shorts"
- icon_state = "jeansclassic_shorts_f"
-
-/obj/item/clothing/under/shorts/jeans/mustang
- name = "mustang jeans shorts"
- icon_state = "jeansmustang_shorts"
-
-/obj/item/clothing/under/shorts/jeans/mustang/female
- name = "mustang jeans short shorts"
- icon_state = "jeansmustang_shorts_f"
-
-/obj/item/clothing/under/shorts/jeans/youngfolks
- name = "young folks jeans shorts"
- icon_state = "jeansyoungfolks_shorts"
-
-/obj/item/clothing/under/shorts/jeans/youngfolks/female
- name = "young folks jeans short shorts"
- icon_state = "jeansyoungfolks_shorts_f"
-
-/obj/item/clothing/under/shorts/jeans/black
- name = "black jeans shorts"
- icon_state = "blackpants_shorts"
-
-/obj/item/clothing/under/shorts/jeans/black/female
- name = "black jeans short shorts"
- icon_state = "black_shorts_f"
-
-/obj/item/clothing/under/shorts/jeans/grey
- name = "grey jeans shorts"
- icon_state = "greypants_shorts"
-
-/obj/item/clothing/under/shorts/jeans/grey/female
- name = "grey jeans short shorts"
- icon_state = "grey_shorts_f"
-
-/obj/item/clothing/under/shorts/khaki
- name = "khaki shorts"
- desc = "For that island getaway. It's five o'clock somewhere, right?"
- icon_state = "tanpants_shorts"
-
-/obj/item/clothing/under/shorts/khaki/female
- name = "khaki short shorts"
- icon_state = "khaki_shorts_f"
-
-//Argh, skirts be below this line -> ------------------------------
-
-/obj/item/clothing/under/skirt
- name = "short black skirt"
- desc = "A skirt that is a shiny black."
- icon_state = "skirt_short_black"
- body_cover_flags = LOWER_TORSO
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/skirt/khaki
- name = "khaki skirt"
- desc = "A skirt that is a khaki color."
- icon_state = "skirt_khaki"
-
-/obj/item/clothing/under/skirt/blue
- name = "short blue skirt"
- desc = "A skirt that is a shiny blue."
- icon_state = "skirt_short_blue"
-
-/obj/item/clothing/under/skirt/red
- name = "short red skirt"
- desc = "A skirt that is a shiny red."
- icon_state = "skirt_short_red"
-
-/obj/item/clothing/under/skirt/denim
- name = "short denim skirt"
- desc = "A skirt that is made of denim."
- icon_state = "skirt_short_denim"
-
-/obj/item/clothing/under/skirt/swept
- name = "swept skirt"
- desc = "A skirt that is swept to one side."
- icon_state = "skirt_swept"
-
-/obj/item/clothing/under/skirt/loincloth
- name = "loincloth"
- desc = "A piece of cloth wrapped around the waist."
- icon_state = "loincloth"
-
-/obj/item/clothing/under/skirt/pleated
- name = "pleated skirt"
- desc = "A simple pleated skirt. It's like high school all over again."
- icon_state = "pleated"
- addblends = "pleated_a"
-
-/obj/item/clothing/under/skirt/outfit
- name = "black skirt"
- desc = "A black skirt, very fancy!"
- icon_state = "blackskirt"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/under/skirt/outfit/plaid_blue
- name = "blue plaid skirt"
- desc = "A preppy blue skirt with a white blouse."
- icon_state = "plaid_blue"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "blue", SLOT_ID_LEFT_HAND = "blue")
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- worn_has_rolldown = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/skirt/outfit/plaid_red
- name = "red plaid skirt"
- desc = "A preppy red skirt with a white blouse."
- icon_state = "plaid_red"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "red", SLOT_ID_LEFT_HAND = "red")
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- worn_has_rolldown = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/skirt/outfit/plaid_purple
- name = "purple plaid skirt"
- desc = "A preppy purple skirt with a white blouse."
- icon_state = "plaid_purple"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "purple", SLOT_ID_LEFT_HAND = "purple")
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- worn_has_rolldown = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/skirt/outfit/plaid_green
- name = "green plaid skirt"
- desc = "A preppy purple skirt with a white blouse."
- icon_state = "plaid_green"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "green", SLOT_ID_LEFT_HAND = "green")
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- worn_has_rolldown = UNIFORM_HAS_ROLL
-
-/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."
- icon_state = "qmf"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "qm", SLOT_ID_LEFT_HAND = "qm")
-
-/obj/item/clothing/under/rank/cargotech/skirt
- name = "cargo technician's jumpskirt"
- desc = "Skirrrrrts! They're comfy and easy to wear!"
- icon_state = "cargof"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "cargo", SLOT_ID_LEFT_HAND = "cargo")
-
-/obj/item/clothing/under/rank/engineer/skirt
- desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding."
- name = "engineer's jumpskirt"
- icon_state = "enginef"
- armor_type = /datum/armor/engineering/jumpsuit
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "engine", SLOT_ID_LEFT_HAND = "engine")
-
-/obj/item/clothing/under/rank/chief_engineer/skirt
- desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
- name = "chief engineer's jumpskirt"
- icon_state = "chieff"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "chiefengineer", SLOT_ID_LEFT_HAND = "chiefengineer")
-
-/obj/item/clothing/under/rank/atmospheric_technician/skirt
- desc = "It's a jumpskirt worn by atmospheric technicians."
- name = "atmospheric technician's jumpskirt"
- icon_state = "atmosf"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "atmos", SLOT_ID_LEFT_HAND = "atmos")
-
-/obj/item/clothing/under/rank/roboticist/skirt
- desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work."
- name = "roboticist's jumpskirt"
- icon_state = "roboticsf"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "robotics", SLOT_ID_LEFT_HAND = "robotics")
-
-/obj/item/clothing/under/rank/scientist/skirt
- name = "scientist's jumpskirt"
- icon_state = "sciencef"
- permeability_coefficient = 0.50
- armor_type = /datum/armor/science/jumpsuit
-
-/obj/item/clothing/under/rank/medical/skirt
- name = "medical doctor's jumpskirt"
- icon_state = "medicalf"
-
-/obj/item/clothing/under/rank/chemist/skirt
- name = "chemist's jumpskirt"
- icon_state = "chemistryf"
-
-/obj/item/clothing/under/rank/chief_medical_officer/skirt
- desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
- name = "chief medical officer's jumpskirt"
- icon_state = "cmof"
-
-/obj/item/clothing/under/rank/geneticist/skirt
- name = "geneticist's jumpskirt"
- icon_state = "geneticsf"
-
-/obj/item/clothing/under/rank/virologist/skirt
- name = "virologist's jumpskirt"
- icon_state = "virologyf"
-
-/obj/item/clothing/under/rank/security/skirt
- name = "security officer's jumpskirt"
- desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts."
- icon_state = "securityf"
- armor_type = /datum/armor/station/padded
- siemens_coefficient = 0.9
-
-/obj/item/clothing/under/rank/warden/skirt
- desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders."
- name = "warden's jumpskirt"
- icon_state = "wardenf"
-
-/obj/item/clothing/under/rank/head_of_security/skirt
- desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
- name = "head of security's jumpskirt"
- icon_state = "hosf"
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
deleted file mode 100644
index d567f8191ed..00000000000
--- a/code/modules/clothing/under/syndicate.dm
+++ /dev/null
@@ -1,37 +0,0 @@
-//these need item states -S2-
-/obj/item/clothing/under/syndicate //Merc Tactleneck
- name = "tactical turtleneck"
- desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
- icon_state = "syndicate"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
- has_sensors = UNIFORM_HAS_NO_SENSORS
- armor_type = /datum/armor/agent/jumpsuit
- siemens_coefficient = 0.9
-
-/obj/item/clothing/under/syndicate/skirt_pleated
- name = "tactical pleated skirt"
- icon_state = "syndicate_skirt"
-
-/obj/item/clothing/under/syndicate/combat //ERT tactleneck
- name = "combat turtleneck"
- desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
- icon_state = "combat"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
- has_sensors = UNIFORM_HAS_SUIT_SENSORS
- siemens_coefficient = 0.9
-
-/obj/item/clothing/under/syndicate/tacticool
- name = "\improper Tacticool turtleneck"
- desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
- icon_state = "tactifool"
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "black", SLOT_ID_LEFT_HAND = "black")
- siemens_coefficient = 1
-
-/obj/item/clothing/under/syndicate/tacticool/skirt_pleated
- name = "tacticool pleated skirt"
- icon_state = "tactifool_skirt"
-
-/obj/item/clothing/under/syndicate/combat/suit
- name = "syndicate combat suit"
- desc = "This streamlined tactical suit is a cut above the tactical turtleneck. It has four more pockets."
- icon_state = "syndicate_combat"
diff --git a/code/modules/clothing/under/utility/utility.dm b/code/modules/clothing/under/utility/utility.dm
deleted file mode 100644
index acd2b932a10..00000000000
--- a/code/modules/clothing/under/utility/utility.dm
+++ /dev/null
@@ -1,20 +0,0 @@
-/obj/item/clothing/under/utility
- name = "utility uniform"
- desc = "A comfortable turtleneck and black utility trousers."
- icon = 'icons/clothing/uniform/rank/utility.dmi'
- icon_state = "black"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- armor_type = /datum/armor/none
- siemens_coefficient = 0.9
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
-
-/obj/item/clothing/under/utility/blue
- name = "utility uniform"
- desc = "A comfortable blue utility jumpsuit."
- icon_state = "navy"
-
-/obj/item/clothing/under/utility/grey
- name = "utility uniform"
- desc = "A comfortable grey utility jumpsuit."
- icon_state = "grey"
diff --git a/code/modules/clothing/under/workwear/bodysuits.dm b/code/modules/clothing/under/workwear/bodysuits.dm
new file mode 100644
index 00000000000..e25b4cec002
--- /dev/null
+++ b/code/modules/clothing/under/workwear/bodysuits.dm
@@ -0,0 +1,442 @@
+/**
+ * Body suits, Skin suits, etc
+ * Supposedly these are for 'use under hardsuits' however NT studies show this is rarely the actual usecase.
+ */
+
+/**
+ * Skinsuits
+ */
+
+/obj/item/clothing/under/skinsuit
+ name = "skinsuit"
+ desc = "Similar to other form-fitting latex bodysuits in design and function, skinsuits typically feature integrated hardpoints around common wear areas."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/skinsuit.dmi'
+ icon_state = "skinsuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skinsuit/gray
+ name = "gray skinsuit"
+ icon = 'icons/clothing/uniform/workwear/bodysuit/skinsuit_g.dmi'
+ icon_state = "skinsuit_g"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skinsuit/leotard
+ name = "leotard skinsuit"
+ desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/skinsuitleo.dmi'
+ icon_state = "skinsuitleo"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skinsuit/leotard/gray
+ name = "gray leotard skinsuit"
+ icon = 'icons/clothing/uniform/workwear/bodysuit/skinsuitleo_g.dmi'
+ icon_state = "skinsuitleo_g"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skinsuit_fem
+ name = "skinsuit"
+ desc = "Similar to other form-fitting latex bodysuits in design and function, skinsuits typically feature integrated hardpoints around common wear areas."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/skinsuitfem.dmi'
+ icon_state = "skinsuitfem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skinsuit_fem/gray
+ name = "gray skinsuit"
+ icon = 'icons/clothing/uniform/workwear/bodysuit/skinsuitfem_g.dmi'
+ icon_state = "skinsuitfem_g"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skinsuit_fem/leotard
+ name = "leotard skinsuit"
+ desc = "The skinsuit's leotard variant has long since eclipsed its initial function as a breathable undersuit for submersible hardsuits. Although still utilized in this role, it has become rather fashionable to wear outside of deep water operations."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/skinsuitfemleo.dmi'
+ icon_state = "skinsuitfemleo"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skinsuit_fem/leotard/gray
+ name = "gray leotard skinsuit"
+ icon = 'icons/clothing/uniform/workwear/bodysuit/skinsuitfemleo_g.dmi'
+ icon_state = "skinsuitfemleo_g"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/skinsuit_striped
+ name = "skinsuit striped"
+ desc = "A dark skinsuit with white stripe embellishments, covering the contours. The latest in the line of skintight outfits that this crew in particular greatly prefers, to the point they now take up 30% of the sector's demands among NT's facilities."
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
+ icon = 'icons/clothing/uniform/workwear/bodysuit/skinsuit_taped.dmi'
+ icon_state = "skinsuit_taped"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/**
+ * Alt Bodysuits
+ */
+
+/obj/item/clothing/under/bodysuit/alt
+ name = "alternate bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/altbodysuit.dmi'
+ icon_state = "altbodysuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/alt/sleeveless
+ name = "sleeveless alternate bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one is designed to stop at the mid-bicep, allowing total freedom to the wearer's forearms."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/altbodysuit_sleeves.dmi'
+ icon_state = "altbodysuit_sleeves"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/alt/pants
+ name = "alternate bodysuit pants"
+ desc = "Following complaints that bodysuits were too tight to roll down to the waist, production of bodysuit pants as singular items grew in popularity."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/altbodysuit_pants.dmi'
+ icon_state = "altbodysuit_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/alt_fem
+ name = "alternate bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/altbodysuitfem.dmi'
+ icon_state = "altbodysuitfem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/alt_fem/sleeveless
+ name = "sleeveless alternate bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one is designed to stop at the mid-bicep, allowing total freedom to the wearer's forearms."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/altbodysuitfem_sleeves.dmi'
+ icon_state = "altbodysuitfem_sleeves"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/alt_fem/pants
+ name = "bodysuit pants"
+ desc = "Following complaints that bodysuits were too tight to roll down to the waist, production of bodysuit pants as singular items grew in popularity."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/altbodysuitfem_pants.dmi'
+ icon_state = "altbodysuitfem_pants"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/**
+ * Bodysuits
+ */
+
+/obj/item/clothing/under/bodysuit
+ name = "standard bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit.dmi'
+ icon_state = "bodysuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit_fem
+ name = "standard bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This basic version is a sleek onyx grey comes with the standard induction ports."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_fem.dmi'
+ icon_state = "bodysuit_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuiteva
+ name = "\improper EVA bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one has bright white plating for easy visibility and thick cuffs to lock into your thrust controls."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_eva.dmi'
+ icon_state = "bodysuit_eva"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuiteva_fem
+ name = "\improper EVA bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one has bright white plating for easy visibility and thick cuffs to lock into your thrust controls."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_eva_fem.dmi'
+ icon_state = "bodysuit_eva_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitemt
+ name = "\improper EMT bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a deep blue base with white and blue coloration."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_emt.dmi'
+ icon_state = "bodysuit_emt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitemt_fem
+ name = "\improper EMT bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a deep blue base with white and blue colouration."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_emt_fem.dmi'
+ icon_state = "bodysuit_emt_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuithazard
+ name = "hazard bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking orange plating and reflective stripes."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_hazard.dmi'
+ icon_state = "bodysuit_hazard"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuithazard_fem
+ name = "hazard bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking orange plating and reflective stripes."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_hazard_fem.dmi'
+ icon_state = "bodysuit_hazard_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitexplocom
+ name = "exploration command bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking purple plating and eyecatching golden stripes."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_pathfinder.dmi'
+ icon_state = "bodysuit_pathfinder"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitexplocom_fem
+ name = "exploration command bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking purple plating and eyecatching golden stripes."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_pathfinder_fem.dmi'
+ icon_state = "bodysuit_pathfinder_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitexplo
+ name = "exploration bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking purple plating."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_explo.dmi'
+ icon_state = "bodysuit_explo"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitexplo_fem
+ name = "exploration bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a black base with striking purple plating."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_explo_fem.dmi'
+ icon_state = "bodysuit_explo_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitminer
+ name = "mining bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with tan and purple coloration."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_miner.dmi'
+ icon_state = "bodysuit_miner"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitminer_fem
+ name = "mining bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with tan and purple colouration."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_miner_fem.dmi'
+ icon_state = "bodysuit_miner_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitsec
+ name = "security bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with red and yellow coloration."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_security.dmi'
+ icon_state = "bodysuit_security"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitsec_fem
+ name = "security bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with red and yellow colouration."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_security_fem.dmi'
+ icon_state = "bodysuit_security_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitsecweewoo
+ name = "advanced security bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with red and yellow coloration. The flashing lights fill you with confidence."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_secweewoo.dmi'
+ icon_state = "bodysuit_secweewoo"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitsecweewoo_fem
+ name = "advanced security bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with red and yellow colouration. The flashing lights fill you with confidence."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_secweewoo_fem.dmi'
+ icon_state = "bodysuit_secweewoo_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitseccom
+ name = "security command bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with striking red plating and eyecatching golden stripes."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_seccom.dmi'
+ icon_state = "bodysuit_seccom"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitseccom_fem
+ name = "security command bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a dark grey base with striking red plating and eyecatching golden stripes."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_seccom_fem.dmi'
+ icon_state = "bodysuit_seccom_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitcommand
+ name = "command bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a flashy blue base with white plating and eyecatching golden stripes."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_command.dmi'
+ icon_state = "bodysuit_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitcommand_fem
+ name = "command bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a flashy blue base with white plating and eyecatching golden stripes."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_command_fem.dmi'
+ icon_state = "bodysuit_command_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitcentcom
+ name = "central command bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a sleek black base with an elegant golden trim and grey plating. It fits your corporate badges nicely."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_centcom.dmi'
+ icon_state = "bodysuit_centcom"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/bodysuit/bodysuitcentcom_fem
+ name = "central command bodysuit"
+ desc = "A skin-tight synthetic bodysuit designed for comfort and mobility underneath hardsuits and voidsuits. This one sports a sleek black base with an elegant golden trim and grey plating. It fits your corporate badges nicely."
+ icon = 'icons/clothing/uniform/workwear/bodysuit/bodysuit_centcom_fem.dmi'
+ icon_state = "bodysuit_centcom"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/centcom.dm b/code/modules/clothing/under/workwear/centcom.dm
new file mode 100644
index 00000000000..bdbf7288701
--- /dev/null
+++ b/code/modules/clothing/under/workwear/centcom.dm
@@ -0,0 +1,193 @@
+/**
+ * The refined uniforms of Central Command.
+ */
+
+/obj/item/clothing/under/rank/centcom
+ name = "\improper CentCom Officer uniform"
+ desc = "The formal uniform of the Central Command Officer. Striking and recognizable, it radiates authority."
+ icon = 'icons/clothing/uniform/workwear/centcom/officer.dmi'
+ icon_state = "officer"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/centcom/fem
+ icon = 'icons/clothing/uniform/workwear/centcom/officer_fem.dmi'
+ icon_state = "officer_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/centcom/representative
+ name = "\improper CentCom Representative uniform"
+ desc = "The formal uniform of the Central Command Representative. These guys must be really important."
+ icon = 'icons/clothing/uniform/workwear/centcom/centcom.dmi'
+ icon_state = "centcom"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/centcom/representative/fem
+ name = "\improper CentCom Representative uniform"
+ desc = "The formal uniform of the Central Command Representative. These guys must be really important."
+ icon = 'icons/clothing/uniform/workwear/centcom/centcom_fem.dmi'
+ icon_state = "centcom_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/centcom/green
+ displays_id = FALSE
+
+/obj/item/clothing/under/rank/centcom/green/commander
+ name = "\improper CentCom officer's suit"
+ desc = "It's a suit worn by CentCom's highest-tier Commanders."
+ icon = 'icons/clothing/uniform/workwear/centcom/centcom_commander.dmi'
+ icon_state = "centcom_commander"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/centcom/green/intern
+ name = "\improper CentCom intern's jumpsuit"
+ desc = "It's a jumpsuit worn by those interning for CentCom. The top is styled after a polo shirt for easy identification."
+ icon = 'icons/clothing/uniform/workwear/centcom/intern.dmi'
+ icon_state = "intern"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/centcom/green/officer
+ name = "\improper CentCom turtleneck suit"
+ desc = "A casual, yet refined green turtleneck, used by CentCom Officials. It has a fragrance of aloe."
+ icon = 'icons/clothing/uniform/workwear/centcom/officer_green.dmi'
+ icon_state = "officer_green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/centcom/green/officer_skirt
+ name = "\improper CentCom turtleneck skirt"
+ desc = "A skirt version of the CentCom turtleneck, rarer and more sought after than the original."
+ icon = 'icons/clothing/uniform/workwear/centcom/officer_skirt.dmi'
+ icon_state = "officer_skirt"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/centcom/green/centcom_skirt
+ name = "\improper CentCom officer's suitskirt"
+ desc = "It's a suitskirt worn by CentCom's highest-tier Commanders."
+ icon = 'icons/clothing/uniform/workwear/centcom/centcom_skirt.dmi'
+ icon_state = "centcom_skirt"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/centcom/military
+ name = "tactical combat uniform"
+ desc = "A dark colored uniform worn by CentCom's conscripted military forces."
+ icon = 'icons/clothing/uniform/workwear/centcom/military.dmi'
+ icon_state = "military"
+ armor_type = /datum/armor/military/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/centcom/military/eng
+ name = "tactical engineering uniform"
+ desc = "A dark colored uniform worn by CentCom's regular military engineers."
+ icon = 'icons/clothing/uniform/workwear/centcom/military_eng.dmi'
+ icon_state = "military_eng"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/ert
+ name = "ERT tactical uniform"
+ desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. It looks very tactical."
+ icon = 'icons/clothing/uniform/workwear/centcom/ert_uniform.dmi'
+ icon_state = "ert_uniform"
+ armor_type = /datum/armor/centcom/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/para
+ name = "PARA tactical uniform"
+ desc = "A standard grey jumpsuit, emblazoned with the Icon of the PMD. Close inspection of the embroidery reveals a complex web of glyphs written in an unknown language."
+ icon = 'icons/clothing/uniform/workwear/centcom/para_ert_uniform.dmi'
+ icon_state = "para_ert_uniform"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/pmd
+ name = "PMD uniform"
+ desc = "A black uniform whose back is emblazoned with the Icon of the PMD. Close inspection of the silver embroidery reveals a complex web of glyphs written in an unknown language."
+ icon = 'icons/clothing/uniform/workwear/centcom/pmd_uniform.dmi'
+ icon_state = "pmd_uniform"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/gov
+ desc = "A neat proper uniform of someone on offical business. The collar is immaculately starched."
+ name = "Green formal uniform"
+ icon = 'icons/clothing/uniform/workwear/centcom/greensuit.dmi'
+ icon_state = "greensuit"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/darkgreen)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/gov/skirt
+ name = "Green formal skirt uniform"
+ desc = "A neat proper uniform of someone on offical business. The top button is sewn shut."
+ icon = 'icons/clothing/uniform/workwear/centcom/greensuit_skirt.dmi'
+ icon_state = "greensuit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Customs
+ */
+
+/obj/item/clothing/under/customs
+ name = "customs uniform"
+ desc = "A standard OriCon customs uniform. Complete with epaulettes."
+ icon = 'icons/clothing/uniform/workwear/centcom/cu_suit.dmi'
+ icon_state = "cu_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/customs/khaki
+ icon = 'icons/clothing/uniform/workwear/centcom/cu_suit_kh.dmi'
+ icon_state = "cu_suit_kh"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/color_jumpskirt.dm b/code/modules/clothing/under/workwear/color_jumpskirt.dm
new file mode 100644
index 00000000000..033e4e846ed
--- /dev/null
+++ b/code/modules/clothing/under/workwear/color_jumpskirt.dm
@@ -0,0 +1,143 @@
+/**
+ * Base file for non-department jumpskirts e.g gray, red, purple, etc
+ */
+
+/obj/item/clothing/under/color/black_skirt
+ name = "black pleated skirt"
+ desc = "A pleated skirt, available in a variety of colors."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "black_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/blackjumpskirt
+ name = "black jumpskirt"
+ desc = "A slimming black jumpskirt."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "blackjumpskirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/blue_skirt
+ name = "blue pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "blue_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/brown_skirt
+ name = "brown pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "brown_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/green_skirt
+ name = "green pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "green_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/grey_skirt
+ name = "grey pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "grey_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/lblue_skirt
+ name = "light blue pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "lightblue_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/lbrown_skirt
+ name = "light brown pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "lightbrown_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/color/lgreen_skirt
+ name = "light green pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "lightgreen_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/lpurple_skirt
+ name = "light purple pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "lightpurple_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/maroon_skirt
+ name = "maroon pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "maroon_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/orange_skirt
+ name = "orange pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "orange_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/pink_skirt
+ name = "pink pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "pink_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/red_skirt
+ name = "red pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "red_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/teal_skirt
+ name = "teal pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "teal_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/white_skirt
+ name = "white pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "white_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/yellow_skirt
+ name = "yellow pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi'
+ icon_state = "yellow_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/workwear/color_jumpsuit.dm b/code/modules/clothing/under/workwear/color_jumpsuit.dm
new file mode 100644
index 00000000000..db025f14ed4
--- /dev/null
+++ b/code/modules/clothing/under/workwear/color_jumpsuit.dm
@@ -0,0 +1,183 @@
+/**
+ * Base file for non-department jumpsuits e.g gray, red, purple, etc
+ */
+
+/obj/item/clothing/under/color
+ name = "purple jumpsuit"
+ desc = "The latest in space fashion."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "purple"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/aqua
+ name = "aqua jumpsuit"
+ desc = "An aqua jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "aqua"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/black
+ name = "black jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "black"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/blackf
+ name = "feminine black jumpsuit"
+ desc = "It's very smart and in a ladies size!"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "blackf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/color/blue
+ name = "blue jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/brown
+ name = "brown jumpsuit"
+ desc = "A brown jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "brown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/darkblue
+ name = "darkblue jumpsuit"
+ desc = "A dark blue jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "darkblue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/darkred
+ name = "darkred jumpsuit"
+ desc = "A dark red jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "darkred"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/green
+ name = "green jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/grey
+ name = "grey jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "grey"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/lightblue
+ name = "lightblue jumpsuit"
+ desc = "A light blue jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "lightblue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/lightbrown
+ name = "lightbrown jumpsuit"
+ desc = "A light brown jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "lightbrown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/lightgreen
+ name = "lightgreen jumpsuit"
+ desc = "A light green jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "lightgreen"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/lightpurple
+ name = "lightpurple jumpsuit"
+ desc = "A light purple jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "lightpurple"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/lightred
+ name = "lightred jumpsuit"
+ desc = "A light red jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "lightred"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/orange
+ name = "orange jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "orange"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/pink
+ name = "pink jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "pink"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/red
+ name = "red jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/white
+ name = "white jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "white"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/yellow
+ name = "yellow jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "yellow"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/color/yellowgreen
+ name = "yellowgreen jumpsuit"
+ desc = "A... yellow green jumpsuit?"
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "yellowgreen"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
diff --git a/code/modules/clothing/under/workwear/dept_cargo.dm b/code/modules/clothing/under/workwear/dept_cargo.dm
new file mode 100644
index 00000000000..e96e8670489
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_cargo.dm
@@ -0,0 +1,103 @@
+/**
+ * Cargo department clothing
+ */
+
+/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."
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/qmf.dmi'
+ icon_state = "qmf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/cargotech/skirt
+ name = "cargo technician's jumpskirt"
+ desc = "Skirrrrrts! They're comfy and easy to wear!"
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/cargof.dmi'
+ icon_state = "cargof"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/cargo
+ name = "quartermaster's jumpsuit"
+ desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/qm.dmi'
+ icon_state = "qm"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/cargo/skirt_pleated
+ name = "quartermaster's pleated skirt"
+ desc = "Skiiiiiirt! It's pleated!"
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/qm_skirt.dmi'
+ icon_state = "qm_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/cargo/jeans
+ name = "quartermaster's jumpjeans"
+ desc = "Jeeeaaans! They're comfy!"
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/qmj.dmi'
+ icon_state = "qmj"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/cargo/jeans/female
+ name = "quartermaster's jumpjeans"
+ desc = "Jeeeaaans! They're comfy!"
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/qmjf.dmi'
+ icon_state = "qmjf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/cargotech
+ name = "cargo technician's jumpsuit"
+ desc = "Shooooorts! They're comfy and easy to wear!"
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/cargo.dmi'
+ icon_state = "cargo"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/cargotech/jeans
+ name = "cargo technician's jumpjeans"
+ desc = "Jeeeaaans! They're comfy!"
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/cargoj.dmi'
+ icon_state = "cargoj"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/cargotech/jeans/female
+ name = "cargo technician's jumpjeans"
+ desc = "Jeeeaaans! They're comfy!"
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/cargojf.dmi'
+ icon_state = "cargojf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/cargotech/skirt_pleated
+ name = "cargo technician's pleated skirt"
+ desc = "Skiiiiiirt! It's pleated!"
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/cargo_skirt.dmi'
+ icon_state = "cargo_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/miner
+ desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
+ name = "shaft miner's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_cargo/miner.dmi'
+ icon_state = "miner"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
diff --git a/code/modules/clothing/under/workwear/dept_civilian/dept_civilian.dm b/code/modules/clothing/under/workwear/dept_civilian/dept_civilian.dm
new file mode 100644
index 00000000000..e82bf5575b3
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_civilian/dept_civilian.dm
@@ -0,0 +1,92 @@
+/**
+ * Leftovers of the HoP and Pilots. Everything else has a different file in the dept_civilian folder. This department is broken up because its not a traditional single purpose department. IAA may be clowns but they dont wear Clown outfits.
+ */
+
+/obj/item/clothing/under/rank/head_of_personnel
+ desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
+ name = "head of personnel's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_civilian/hop.dmi'
+ icon_state = "hop"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/head_of_personnel/skirt_pleated
+ name = "head of personnel's pleated skirt"
+ desc = "A semi formal uniform given only to Heads of Personnel."
+ icon = 'icons/clothing/uniform/workwear/dept_civilian/hop_skirt.dmi'
+ icon_state = "hop_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/head_of_personnel_whimsy
+ desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
+ name = "head of personnel's suit"
+ icon = 'icons/clothing/uniform/workwear/dept_civilian/hopwhimsy.dmi'
+ icon_state = "hopwhimsy"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/dress_hop
+ name = "head of personnel dress uniform"
+ desc = "Feminine fashion for the style conscious HoP."
+ icon = 'icons/clothing/uniform/workwear/dept_civilian/dress_hop.dmi'
+ icon_state = "dress_hop"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/dress_hr
+ name = "human resources director uniform"
+ desc = "Superior class for the nosy H.R. Director."
+ icon = 'icons/clothing/uniform/workwear/dept_civilian/huresource.dmi'
+ icon_state = "huresource"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
+ name = "head of personnel's suit"
+ desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble."
+ icon = 'icons/clothing/uniform/workwear/dept_civilian/teal_suit.dmi'
+ icon_state = "teal_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt
+ name = "head of personnel's skirt suit"
+ icon = 'icons/clothing/uniform/workwear/dept_civilian/teal_suit_skirt.dmi'
+ icon_state = "teal_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//Pilots
+/obj/item/clothing/under/rank/pilot1
+ name = "\improper Nanotrasen flight suit"
+ desc = "A blue and grey Nanotrasen flight suit. Warm and practical, it feels cozy."
+ icon = 'icons/clothing/uniform/workwear/dept_civilian/flight1.dmi'
+ icon_state = "flight1"
+ starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/pilot2
+ name = "\improper Nanotrasen flight suit"
+ desc = "A dark blue Nanotrasen flight suit. Warm and practical, several patches are scattered across it."
+ icon = 'icons/clothing/uniform/workwear/dept_civilian/flight2.dmi'
+ icon_state = "flight2"
+ starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot2)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/dept_civilian/janitor.dm b/code/modules/clothing/under/workwear/dept_civilian/janitor.dm
new file mode 100644
index 00000000000..90f0ad176e5
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_civilian/janitor.dm
@@ -0,0 +1,52 @@
+/**
+ * Workwear for the janitors
+ */
+
+//This maid outfit is an actual janitor uniform, so it goes here instead of costumes.
+/obj/item/clothing/under/dress/maid/janitor
+ name = "maid uniform"
+ desc = "A simple maid uniform for housekeeping."
+ icon = 'icons/clothing/uniform/workwear/janitor/janimaid.dmi'
+ icon_state = "janimaid"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/janitor
+ desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
+ name = "janitor's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/janitor/janitor.dmi'
+ icon_state = "janitor"
+ armor_type = /datum/armor/civilian/jumpsuit/janitor
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/janitor_fem
+ name = "janitor's jumpsuit"
+ desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
+ icon = 'icons/clothing/uniform/workwear/janitor/janitor_fem.dmi'
+ icon_state = "janitor_fem"
+ armor_type = /datum/armor/civilian/jumpsuit/janitor
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/janitor/skirt_pleated
+ name = "janitor's pleated skirt"
+ desc = "The official pleated skirt of the local janitor. It bears minor protection from biohazards."
+ icon = 'icons/clothing/uniform/workwear/janitor/janitor_skirt.dmi'
+ icon_state = "janitor_skirt"
+ armor_type = /datum/armor/civilian/jumpsuit/janitor
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/janitor/starcon
+ name = "janitor's uniform"
+ desc = "It's the official uniform of the station's janitor with minor modifications. It has minor protection from biohazards, but not from the harshness of space."
+ icon = 'icons/clothing/uniform/workwear/janitor/janitor_sc.dmi'
+ icon_state = "janitor_sc"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/workwear/dept_civilian/service_clerical.dm b/code/modules/clothing/under/workwear/dept_civilian/service_clerical.dm
new file mode 100644
index 00000000000..80b4281db9b
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_civilian/service_clerical.dm
@@ -0,0 +1,49 @@
+/**
+ * Non-food related services like Chaplain, Librarian, IAA, aka dweebs.
+ */
+
+/obj/item/clothing/under/rank/chaplain
+ desc = "It's a black jumpsuit, often worn by religious folk."
+ name = "chaplain's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/service/chaplain.dmi'
+ icon_state = "chaplain"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/chaplain/skirt_pleated
+ name = "chaplain's pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/service/chaplain_skirt.dmi'
+ icon_state = "chaplain_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/internalaffairs
+ desc = "The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched."
+ name = "Internal Affairs uniform"
+ icon = 'icons/clothing/uniform/workwear/service/internalaffairs.dmi'
+ icon_state = "internalaffairs"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/black)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/internalaffairs/skirt
+ desc = "The plain, professional attire of an Internal Affairs Agent. The top button is sewn shut."
+ name = "Internal Affairs skirt"
+ icon = 'icons/clothing/uniform/workwear/service/internalaffairs_skirt.dmi'
+ icon_state = "internalaffairs_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//reuses spritesheet
+/obj/item/clothing/under/librarian
+ name = "sensible suit"
+ desc = "It's very... sensible."
+ icon = 'icons/clothing/uniform/formal/suits/red_suit.dmi'
+ icon_state = "red_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/workwear/dept_civilian/service_food.dm b/code/modules/clothing/under/workwear/dept_civilian/service_food.dm
new file mode 100644
index 00000000000..6e1a78c66d1
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_civilian/service_food.dm
@@ -0,0 +1,98 @@
+/**
+ * Bar, Kitchen, Hydroponics Uniforms
+ * Spiritual grouping of items, there aren't enough to give them their own file and they are arguably all closely related enough to go in the same file.
+ */
+
+/obj/item/clothing/under/rank/bartender
+ desc = "It looks like it could use some more flair."
+ name = "bartender's uniform"
+ icon = 'icons/clothing/uniform/workwear/service/ba_suit.dmi'
+ icon_state = "ba_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/bartender/skirt
+ desc = "Short and cute."
+ name = "bartender's skirt"
+ icon = 'icons/clothing/uniform/workwear/service/ba_suit_skirt.dmi'
+ icon_state = "ba_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/bartender/skirt_pleated
+ name = "bartender's pleated skirt"
+ desc = "Short, and to the point."
+ icon = 'icons/clothing/uniform/workwear/service/barman_skirt.dmi'
+ icon_state = "barman_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/btcbartender
+ name = "BTC Bartender"
+ desc = "For the classy bartender who converts their paychecks into Spesscoin."
+ icon = 'icons/clothing/uniform/workwear/service/btc_bartender.dmi'
+ icon_state = "btc_bartender"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/chef
+ desc = "It's an apron which is given only to the most hardcore chefs in space."
+ name = "chef's uniform"
+ icon = 'icons/clothing/uniform/workwear/service/chef.dmi'
+ icon_state = "chef"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/chef/skirt_pleated
+ name = "chef's pleated skirt"
+ desc = "It's a skirt of which is given only to the most ludicrous of spacebound chefs."
+ icon = 'icons/clothing/uniform/workwear/service/chef_skirt.dmi'
+ icon_state = "chef_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/hydroponics
+ desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
+ name = "botanist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/service/hydroponics.dmi'
+ icon_state = "hydroponics"
+ permeability_coefficient = 0.50
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/hydroponics/skirt_pleated
+ name = "botanist's pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/service/hydroponics_skirt.dmi'
+ icon_state = "hydroponics_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/waiter
+ name = "waiter's outfit"
+ desc = "It's a very smart uniform with a special pocket for tips."
+ icon = 'icons/clothing/uniform/workwear/service/waiter.dmi'
+ icon_state = "waiter"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/waiter_fem
+ name = "waiter's outfit"
+ desc = "It's a very smart uniform with a special pocket for tips."
+ icon = 'icons/clothing/uniform/workwear/service/waiter_fem.dmi'
+ icon_state = "waiter_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/dept_civilian/theatre.dm b/code/modules/clothing/under/workwear/dept_civilian/theatre.dm
new file mode 100644
index 00000000000..c88e521996f
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_civilian/theatre.dm
@@ -0,0 +1,77 @@
+/**
+ * Clowns and Mimes
+ */
+
+/obj/item/clothing/under/rank/clown
+ name = "clown suit"
+ desc = "Honk!"
+ icon = 'icons/clothing/uniform/workwear/theatre/clown.dmi'
+ icon_state = "clown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/clown/orange
+ name = "orange clown suit"
+ icon = 'icons/clothing/uniform/workwear/theatre/orangeclown.dmi'
+ icon_state = "orangeclown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/clown/yellow
+ name = "yellow clown suit"
+ icon = 'icons/clothing/uniform/workwear/theatre/yellowclown.dmi'
+ icon_state = "yellowclown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/clown/green
+ name = "green clown suit"
+ icon = 'icons/clothing/uniform/workwear/theatre/greenclown.dmi'
+ icon_state = "greenclown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/clown/blue
+ name = "blue clown suit"
+ icon = 'icons/clothing/uniform/workwear/theatre/blueclown.dmi'
+ icon_state = "blueclown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/clown/purple
+ name = "purple clown suit"
+ icon = 'icons/clothing/uniform/workwear/theatre/purpleclown.dmi'
+ icon_state = "purpleclown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/clown/rainbow
+ name = "rainbow clown suit"
+ icon = 'icons/clothing/uniform/workwear/theatre/rainbowclown.dmi'
+ icon_state = "rainbowclown"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/mime
+ name = "mime's outfit"
+ desc = "It's not very colourful."
+ icon = 'icons/clothing/uniform/workwear/theatre/mime.dmi'
+ icon_state = "mime"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/mime/skirt_pleated
+ name = "mime's pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/theatre/mime_skirt.dmi'
+ icon_state = "mime_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/workwear/dept_command.dm b/code/modules/clothing/under/workwear/dept_command.dm
new file mode 100644
index 00000000000..06118903369
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_command.dm
@@ -0,0 +1,81 @@
+/**
+ * The captain and bridge crew. This is NOT for department heads put them in their own department file.
+ */
+
+/**
+ * Captain uniforms
+ */
+
+/obj/item/clothing/under/rank/captain
+ desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Facility Director\"."
+ name = "Facility Director's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_command/captain.dmi'
+ icon_state = "captain"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/captain/skirt_pleated
+ name = "captain's pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/dept_command/captain_skirt.dmi'
+ icon_state = "captain_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/captainformal
+ name = "Facility Director's formal uniform"
+ desc = "A Facility Director's formal-wear, for special occasions."
+ icon = 'icons/clothing/uniform/workwear/dept_command/captain_formal.dmi'
+ icon_state = "captain_formal"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/dress/dress_cap
+ name = "Facility Director's dress uniform"
+ desc = "Feminine fashion for the style conscious Facility Director."
+ icon = 'icons/clothing/uniform/workwear/dept_command/dress_cap.dmi'
+ icon_state = "dress_cap"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/gimmick/rank/captain/suit
+ name = "Facility Director's suit"
+ desc = "A green suit and yellow necktie. Exemplifies authority."
+ icon = 'icons/clothing/uniform/workwear/dept_command/green_suit.dmi'
+ icon_state = "green_suit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/gimmick/rank/captain/suit/skirt
+ name = "Facility Director's skirt suit"
+ icon = 'icons/clothing/uniform/workwear/dept_command/green_suit_skirt.dmi'
+ icon_state = "green_suit_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Bridge Officer uniforms
+ */
+/obj/item/clothing/under/bridgeofficer
+ name = "bridge officer uniform"
+ desc = "A jumpsuit for those ranked high enough to stand at the bridge, but not high enough to touch any buttons."
+ icon = 'icons/clothing/uniform/workwear/dept_command/bridgeofficer.dmi'
+ icon_state = "bridgeofficer"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/bridgeofficerskirt
+ name = "bridge officer skirt"
+ desc = "A jumpskirt for those ranked high enough to stand at the bridge, but not high enough to touch any buttons."
+ icon = 'icons/clothing/uniform/workwear/dept_command/bridgeofficerskirt.dmi'
+ icon_state = "bridgeofficerskirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/workwear/dept_engineering.dm b/code/modules/clothing/under/workwear/dept_engineering.dm
new file mode 100644
index 00000000000..01c0234fb77
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_engineering.dm
@@ -0,0 +1,179 @@
+/**
+ * Engineering department workwear
+ */
+
+/obj/item/clothing/under/hazard
+ name = "hazard jumpsuit"
+ desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/hazard.dmi'
+ icon_state = "hazard"
+ siemens_coefficient = 0.8
+ armor_type = /datum/armor/engineering/jumpsuit
+ max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/engineer/skirt
+ desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding."
+ name = "engineer's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/enginef.dmi'
+ icon_state = "enginef"
+ armor_type = /datum/armor/engineering/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/chief_engineer/skirt
+ desc = "It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
+ name = "chief engineer's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/chieff.dmi'
+ icon_state = "chieff"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/atmospheric_technician/skirt
+ desc = "It's a jumpskirt worn by atmospheric technicians."
+ name = "atmospheric technician's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/atmosf.dmi'
+ icon_state = "atmosf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/chief_engineer
+ desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
+ name = "chief engineer's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/chief.dmi'
+ icon_state = "chief"
+ armor_type = /datum/armor/engineering/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/chief_engineer/jeans
+ name = "chief engineer's jumpjeans"
+ desc = "Casual jeans and a high visibility top given to those more insane than those with the average CE jumpsuit. It bears minor radiation shielding."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/chiefj.dmi'
+ icon_state = "chiefj"
+ armor_type = /datum/armor/engineering/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/chief_engineer/fem_jeans
+ name = "chief engineer's jumpjeans"
+ desc = "Casual jeans and a high visibility top given to those more insane than those with the average CE jumpsuit. It bears minor radiation shielding."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/chiefjf.dmi'
+ icon_state = "chiefjf"
+ armor_type = /datum/armor/engineering/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/chief_engineer/skirt_pleated
+ name = "chief engineer's pleated skirt"
+ desc = "It's a high visibility pleated skirt given to those insane enough to achieve the rank of 'Chief Engineer'. It comes with minor rediation shielding."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/chiefengineer_skirt.dmi'
+ icon_state = "chiefengineer_skirt"
+ armor_type = /datum/armor/engineering/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/atmospheric_technician
+ desc = "It's a jumpsuit worn by atmospheric technicians."
+ name = "atmospheric technician's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/atmos.dmi'
+ icon_state = "atmos"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/atmospheric_technician/jeans
+ name = "atmospheric technician's jumpjeans"
+ desc = "Casual jeans worn by atmospherics technicians"
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/atmosj.dmi'
+ icon_state = "atmosj"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/atmospheric_technician/fem_jeans
+ name = "atmospheric technician's jumpjeans"
+ desc = "Casual jeans worn by atmospherics technicians"
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/atmosjf.dmi'
+ icon_state = "atmosjf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/atmospheric_technician/skirt_pleated
+ name = "atmospheric technician's pleated skirt"
+ desc = "A pleated skirt occassionally work by atmospheric technicians. Nothing too fancy, but it gets the job done."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/atmos_skirt.dmi'
+ icon_state = "atmos_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/engineer
+ desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
+ name = "engineer's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/engine.dmi'
+ icon_state = "engine"
+ armor_type = /datum/armor/engineering/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/engineer/jeans
+ name = "engineer's jumpjeans"
+ desc = "Casual jeans and a sturdy shirt make for minor radiation shielding. The shirt has orange bands around the forearm, showing the wearer's an engineer."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/enginej.dmi'
+ icon_state = "enginej"
+ armor_type = /datum/armor/engineering/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/engineer/fem_jeans
+ name = "engineer's jumpjeans"
+ desc = "Casual jeans and a sturdy shirt make for minor radiation shielding. The shirt is high visibility, showing the wearer's an engineer."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/enginejf.dmi'
+ icon_state = "enginejf"
+ armor_type = /datum/armor/engineering/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/engineer/skirt_pleated
+ name = "engineer's pleated skirt"
+ desc = "It's a high visibility pleated skirt worn by some engineers. It has minor radiation shielding."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/engine_skirt.dmi'
+ icon_state = "engine_skirt"
+ armor_type = /datum/armor/engineering/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/engineer/turtleneck
+ name = "engineering turtleneck"
+ desc = "It's a stylish turtleneck with minor radiation shielding. Nobody's going to see it behind the voidsuit, though."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/turtle_eng.dmi'
+ icon_state = "turtle_eng"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/engineer/turtleneck_fem
+ name = "engineering turtleneck"
+ desc = "It's a stylish turtleneck with minor radiation shielding. Nobody's going to see it behind the voidsuit, thought."
+ icon = 'icons/clothing/uniform/workwear/dept_engineering/turtle_eng_fem.dmi'
+ icon_state = "turtle_eng_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/workwear/dept_medical.dm b/code/modules/clothing/under/workwear/dept_medical.dm
new file mode 100644
index 00000000000..3e956ecac09
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_medical.dm
@@ -0,0 +1,569 @@
+/**
+ * Medical department clothing
+ * Medsci is dead! Long live Medical!
+ */
+
+/obj/item/clothing/under/sterile
+ name = "sterile jumpsuit"
+ desc = "A sterile white jumpsuit with medical markings. Protects against all manner of biohazards."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/sterile.dmi'
+ icon_state = "sterile"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "white"
+
+/obj/item/clothing/under/medigown
+ name = "medical gown"
+ desc = "A flimsy examination gown, the back ties never close."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/medicalgown.dmi'
+ icon_state = "medicalgown"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/**
+ * Chemist
+ */
+
+/obj/item/clothing/under/rank/chemist
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
+ name = "chemist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/chemistry.dmi'
+ icon_state = "chemistry"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/chemist/skirt
+ name = "chemist's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/chemistryf.dmi'
+ icon_state = "chemistryf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/chemist/jeans
+ name = "chemist's jumpjeans"
+ desc = "Casual jeans and a coloured top with special protection against biohazards. It has chemist rank striping on the shoulders."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/chemistryj.dmi'
+ icon_state = "chemistryj"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/chemist/fem_jeans
+ name = "chemist's jumpjeans"
+ desc = "Casual jeans and a coloured top with special protectiona gainst biohazards. It has chemist rank striping on the shoulders."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/chemistryjf.dmi'
+ icon_state = "chemistryjf"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/chemist/skirt_pleated
+ name = "chemist's pleated skirt"
+ desc = "It's made of a special fiber that gives special protection against biohazards. It even has bonus pleating!"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/chemistry_skirt.dmi'
+ icon_state = "chemistry_skirt"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/chemist_new
+ desc = "It's made of a special fiber which provides minor protection against biohazards."
+ name = "chemist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/chemist_new.dmi'
+ icon_state = "chemist_new"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/**
+ * CMO
+ */
+
+/obj/item/clothing/under/rank/chief_medical_officer
+ desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
+ name = "chief medical officer's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/cmo.dmi'
+ icon_state = "cmo"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/chief_medical_officer/skirt
+ desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
+ name = "chief medical officer's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/cmof.dmi'
+ icon_state = "cmof"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+
+/obj/item/clothing/under/rank/chief_medical_officer/skirt_pleated
+ name = "chief medical officer's pleated skirt"
+ desc = "A pleated skirt for the fashion conscious CMO, now with minor biological protection!"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/cmo_skirt.dmi'
+ icon_state = "cmo_skirt"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/chief_medical_officer/turtleneck
+ desc = "It's a turtleneck worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection, for an officer with a superior sense of style and practicality."
+ name = "chief medical officer's turtleneck"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/cmoturtle.dmi'
+ icon_state = "cmoturtle"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/chief_medical_officer/jeans
+ name = "chief medical officer's jeans"
+ desc = "A high-stress workplace should never revoke one's right to dress casual. The minor biological protection should do the trick well enough."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/cmoj.dmi'
+ icon_state = "cmoj"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/chief_medical_officer/fem_jeans
+ name = "chief medical officer's jeans"
+ desc = "A high-stress workplace should never revoke one's right to dress casual. The minor biological protection should do the trick well enough."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/cmojf.dmi'
+ icon_state = "cmojf"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Geneticist
+ */
+
+/obj/item/clothing/under/rank/geneticist
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
+ name = "geneticist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/genetics.dmi'
+ icon_state = "genetics"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+
+/obj/item/clothing/under/rank/geneticist/skirt
+ name = "geneticist's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/geneticsf.dmi'
+ icon_state = "geneticsf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+
+/obj/item/clothing/under/rank/geneticist/skirt_pleated
+ name = "geneticist's pleated skirt"
+ desc = "A pleated skirt for the ever forgotten geneticist."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/genetics_skirt.dmi'
+ icon_state = "genetics_skirt"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+
+/obj/item/clothing/under/rank/geneticist_new
+ desc = "It's made of a special fiber which provides minor protection against biohazards."
+ name = "geneticist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/genetics_new.dmi'
+ icon_state = "genetics_new"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+
+/**
+ * Virologist
+ */
+
+/obj/item/clothing/under/rank/virologist
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
+ name = "virologist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/virology.dmi'
+ icon_state = "virology"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/virologist/skirt
+ name = "virologist's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/virologyf.dmi'
+ icon_state = "virologyf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/virologist/jeans
+ name = "virologist's jumpjeans"
+ desc = "A casual outfit made of special fibers that provide minor protection against biohazards. It has green striping on the shoulders that denote the wearer as a virologist."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/virologyj.dmi'
+ icon_state = "virologyj"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/virologist/fem_jeans
+ name = "virologist's jumpjeans"
+ desc = "A casual outfit made of special fibers that provide minor protection against biohazards. It has green striping on the shoulders that denote the wearer as a virologist."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/virologyjf.dmi'
+ icon_state = "virologyjf"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/virologist/skirt_pleated
+ name = "virologist's pleated skirt"
+ desc = "It's made of a special fiber that gives special protection against biohazards. It even has bonus pleating!"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/virology_skirt.dmi'
+ icon_state = "virology_skirt"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/virologist_new
+ desc = "Made of a special fiber that gives increased protection against biohazards."
+ name = "virologist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/virologist_new.dmi'
+ icon_state = "virologist_new"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/**
+ * Nurse
+ */
+
+/obj/item/clothing/under/rank/nursesuit
+ desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
+ name = "nurse's suit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/nursesuit.dmi'
+ icon_state = "nursesuit"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/nurse
+ desc = "A dress commonly worn by the nursing staff in the medical department."
+ name = "nurse's dress"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/nurse.dmi'
+ icon_state = "nurse"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/orderly
+ desc = "A white suit to be worn by medical attendants."
+ name = "orderly's uniform"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/orderly.dmi'
+ icon_state = "orderly"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/**
+ * Doctor
+ */
+
+/obj/item/clothing/under/rank/medical
+ desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
+ name = "medical doctor's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/medical.dmi'
+ icon_state = "medical"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/medical/skirt
+ name = "medical doctor's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/medicalf.dmi'
+ icon_state = "medicalf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/medical/jeans
+ name = "medical doctor's jeans"
+ desc = "A casual outfit made of special fibers that provide minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/medicalj.dmi'
+ icon_state = "medicalj"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/medical/fem_jeans
+ name = "medical doctor's jeans"
+ desc = "A casual outfit made of special fibers that provide minor protection against biohazards. It has a cross on the chest denoting that th wearer is trained medical personnel."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/medicaljf.dmi'
+ icon_state = "medicaljf"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/medical/skirt_pleated
+ name = "medical doctor's pleated skirt"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. Its themed pleating and the cross on the chest denotes that the wearer is trained medical personnel."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/medical_skirt.dmi'
+ icon_state = "medical_skirt"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/medical/turtleneck
+ name = "medical turtleneck"
+ desc = "It's a stylish turtleneck made of bioresistant fiber. Look good, save lives- what more could you want?"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/turtle_med.dmi'
+ icon_state = "turtle_med"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/medical/turtleneck_fem
+ name = "medical turtleneck"
+ desc = "It's a stylish turtleneck made of bioresistant fiber. Look good, save lives- what more could you want?"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/turtle_med_fem.dmi'
+ icon_state = "turtle_med_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/medical/paramedic
+ name = "short sleeve medical jumpsuit"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one has a cross on the chest denoting that the wearer is trained medical personnel."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/medical_short.dmi'
+ icon_state = "medical_short"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Scrubs
+ */
+
+/obj/item/clothing/under/rank/medical/scrubs
+ name = "blue scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubsblue.dmi'
+ icon_state = "scrubsblue"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/medical/scrubs_fem
+ name = "blue scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubsblue_fem.dmi'
+ icon_state = "scrubsblue_fem"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/medical/scrubs/green
+ name = "green scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubsgreen.dmi'
+ icon_state = "scrubsgreen"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/medical/scrubs_fem/green
+ name = "green scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubsgreen_fem.dmi'
+ icon_state = "scrubsgreen_fem"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/medical/scrubs/purple
+ name = "purple scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubspurple.dmi'
+ icon_state = "scrubspurple"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/medical/scrubs_fem/purple
+ name = "purple scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubspurple_fem.dmi'
+ icon_state = "scrubspurple_fem"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/medical/scrubs/black
+ name = "black scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in black."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubsblack.dmi'
+ icon_state = "scrubsblack"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/medical/scrubs_fem/black
+ name = "black scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in black."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubsblack_fem.dmi'
+ icon_state = "scrubsblack_fem"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/medical/scrubs/navyblue
+ name = "navy blue scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in navy blue."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubsnavyblue.dmi'
+ icon_state = "scrubsnavyblue"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/medical/scrubs_fem/navyblue
+ name = "navy blue scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in navy blue."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/scrubsnavyblue_fem.dmi'
+ icon_state = "scrubsnavyblue_fem"
+ armor_type = /datum/armor/medical/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Psychiatrist
+ */
+
+/obj/item/clothing/under/rank/psych
+ desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
+ name = "psychiatrist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/psych.dmi'
+ icon_state = "psych"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/psych/turtleneck
+ desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
+ name = "psychologist's turtleneck"
+ icon = 'icons/clothing/uniform/workwear/dept_medical/psychturtle.dmi'
+ icon_state = "psychturtle"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/rank/psych/turtleneck_fem
+ name = "psychologist's turtleneck"
+ desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/psychturtle_fem.dmi'
+ icon_state = "psychturtle_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/**
+ * Paramedic
+ */
+
+/obj/item/clothing/under/paramedunidark
+ name = "Paramedic Uniform"
+ desc = "A dark jumpsuit for those brave souls who have to deal with a CMO who thinks they're the do everything person."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/paramedic-dark.dmi'
+ icon_state = "paramedic-dark"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+
+/obj/item/clothing/under/parameduniskirtdark
+ name = "Paramedic Uniskirt"
+ desc = "A dark jumpskirt for those brave souls who have to deal with a CMO who thinks they're the do everything person."
+ icon = 'icons/clothing/uniform/workwear/dept_medical/paramedic-dark_skirt.dmi'
+ icon_state = "paramedic-dark_skirt"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/paramedunilight
+ name = "\improper Paramedic Uniform"
+ desc = "A light jumpsuit for those brave souls who have to deal with a CMO who thinks they're the do everything person."
+ icon_state = "paramedic-light"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/parameduniskirtlight
+ name = "\improper Paramedic Uniskirt"
+ desc = "A light jumpskirt for those brave souls who have to deal with a CMO who thinks they're the do everything person."
+ icon_state = "paramedic_skirt"
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/workwear/dept_science.dm b/code/modules/clothing/under/workwear/dept_science.dm
new file mode 100644
index 00000000000..ed7a633e877
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_science.dm
@@ -0,0 +1,229 @@
+/**
+ * Science department clothing
+ * Medsci is dead! Long live Science!
+ */
+
+/**
+ * Research Director
+ */
+
+/obj/item/clothing/under/rank/research_director
+ desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
+ name = "research director's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_science/director.dmi'
+ icon_state = "director"
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/research_director/skirt_pleated
+ name = "research director's pleated skirt"
+ desc = "Feminine fashion for the style conscious RD. Its fabric provides minor protection from biological contaminants, and its pleated skirt provides extra style points."
+ icon = 'icons/clothing/uniform/workwear/dept_science/director_skirt.dmi'
+ icon_state = "director_skirt"
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/research_director/skirt_pleated/whimsical
+ name = "whimsical research director's pleated skirt"
+ desc = "Whimsical attire for the more magical of RD's, providing minor protection from biological contaminants like it's nothing."
+ icon = 'icons/clothing/uniform/workwear/dept_science/rdwhimsy_skirt.dmi'
+ icon_state = "rdwhimsy_skirt"
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/research_director/skirt_pleated/turtleneck
+ name = "research director's turtleneck pleated skirt"
+ desc = "A dark purple purple turtleneck and a pleated tan skirt, for a director of superior authority."
+ icon = 'icons/clothing/uniform/workwear/dept_science/rdturtle_skirt.dmi'
+ icon_state = "rdturtle_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/research_director/rdalt
+ desc = "A dress suit and slacks stained with hard work and dedication to science. Perhaps other things as well, but mostly hard work and dedication."
+ name = "head researcher uniform"
+ icon = 'icons/clothing/uniform/workwear/dept_science/rdalt.dmi'
+ icon_state = "rdalt"
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/research_director/dress_rd
+ name = "research director dress uniform"
+ desc = "Feminine fashion for the style conscious RD. Its fabric provides minor protection from biological contaminants."
+ icon = 'icons/clothing/uniform/workwear/dept_science/dress_rd.dmi'
+ icon_state = "dress_rd"
+ armor_type = /datum/armor/science/jumpsuit
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/research_director/turtleneck
+ desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style."
+ name = "research director's turtleneck"
+ icon = 'icons/clothing/uniform/workwear/dept_science/rdturtle.dmi'
+ icon_state = "rdturtle"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/**
+ * Scientist
+ */
+
+/obj/item/clothing/under/rank/scientist
+ desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
+ name = "scientist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_science/science.dmi'
+ icon_state = "science"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/scientist/jeans
+ name = "scientist's jumpjeans"
+ desc = "The perfect getup for the more laid-back researcher. Sadly, it doesn't seem to be as protective as its jumpsuit counterpart."
+ icon = 'icons/clothing/uniform/workwear/dept_science/sciencej.dmi'
+ icon_state = "sciencej"
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/scientist/femjeans
+ name = "scientist's jumpjeans"
+ desc = "The perfect getup for the more laid-back researcher. Sadly, it doesn't seem to be as protective as it's jumpsuit counterpart"
+ icon = 'icons/clothing/uniform/workwear/dept_science/sciencejf.dmi'
+ icon_state = "sciencejf"
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/scientist/skirt
+ name = "scientist's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_science/sciencef.dmi'
+ icon_state = "sciencef"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/scientist_new
+ desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
+ name = "scientist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_science/scientist_new.dmi'
+ icon_state = "scientist_new"
+ permeability_coefficient = 0.50
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/scientist/skirt_pleated
+ name = "scientist's pleated skirt"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. Appropriately placed markings on the shoulders and pleated skirt denote the wearer as a scientist."
+ icon = 'icons/clothing/uniform/workwear/dept_science/toxins_skirt.dmi'
+ icon_state = "toxins_skirt"
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/scientist/turtleneck
+ name = "science turtleneck"
+ desc = "It's a stylish turtleneck weaved with an explosive-resistant, comfortable mesh. You don't have to look like a dork to be a dork."
+ icon = 'icons/clothing/uniform/workwear/dept_science/turtle_sci.dmi'
+ icon_state = "turtle_sci"
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/scientist/turtleneck_fem
+ name = "science turtleneck"
+ desc = "It's a stylish turtleneck weaved with an explosive-resistant, comfortable mesh. You don't have to look like a dork to be a dork."
+ icon = 'icons/clothing/uniform/workwear/dept_science/turtle_sci_fem.dmi'
+ icon_state = "turtle_sci_fem"
+ armor_type = /datum/armor/science/jumpsuit
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Roboticist
+ */
+
+/obj/item/clothing/under/rank/roboticist
+ desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work."
+ name = "roboticist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_science/robotics.dmi'
+ icon_state = "robotics"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/roboticist/alt
+ desc = "It's a slimming black jumpsuit with reinforced seams and a gold trim; great for industrial work."
+ name = "roboticist's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_science/robotics2.dmi'
+ icon_state = "robotics2"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/roboticist/skirt
+ desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work."
+ name = "roboticist's jumpskirt"
+ icon = 'icons/clothing/uniform/workwear/dept_science/roboticsf.dmi'
+ icon_state = "roboticsf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/roboticist/skirt_pleated
+ name = "roboticist's pleated skirt"
+ desc = "It's a slimming black pleated skirt with reinforced seams for a more active industrial workplace."
+ icon = 'icons/clothing/uniform/workwear/dept_science/robotics_skirt.dmi'
+ icon_state = "robotics_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Explorer
+ */
+
+/obj/item/clothing/under/explorer
+ desc = "A green uniform for operating in hazardous environments."
+ name = "explorer's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_science/explorer.dmi'
+ icon_state = "explorer"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/explorer_fem
+ desc = "A green uniform for operating in hazardous environments."
+ name = "explorer's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_science/explorer_fem.dmi'
+ icon_state = "explorer_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/dept_security.dm b/code/modules/clothing/under/workwear/dept_security.dm
new file mode 100644
index 00000000000..176437a35fa
--- /dev/null
+++ b/code/modules/clothing/under/workwear/dept_security.dm
@@ -0,0 +1,519 @@
+/**
+ * Security department clothing
+ */
+
+//Prisoners are technically members of the security department.
+/obj/item/clothing/under/color/prison
+ name = "prison jumpsuit"
+ desc = "It's standardized prisoner-wear. Its suit sensors are permanently set to the \"Tracking\" position."
+ icon = 'icons/clothing/uniform/workwear/dept_security/prison.dmi'
+ icon_state = "prison"
+ has_sensors = UNIFORM_HAS_LOCKED_SENSORS
+ sensor_mode = 3
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/color/prison/skirt
+ name = "prison pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/dept_security/prison_skirt.dmi'
+ icon_state = "prison_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Warden
+ */
+
+/obj/item/clothing/under/rank/warden
+ desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
+ name = "warden's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_security/warden.dmi'
+ icon_state = "warden"
+ armor_type = /datum/armor/station/padded
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/warden/skirt
+ name = "warden's jumpskirt"
+ desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders."
+ icon = 'icons/clothing/uniform/workwear/dept_security/wardenf.dmi'
+ icon_state = "wardenf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/warden_fem
+ name = "warden's jumpsuit"
+ desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
+ icon = 'icons/clothing/uniform/workwear/dept_security/warden_fem.dmi'
+ icon_state = "warden_fem"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/warden/skirt_pleated
+ name = "warden's pleated skirt"
+ desc = "A pleated skirt made up of a slightly sturdier material than your average jumpsuit. It has the word 'Warden' writton on the shoulders."
+ icon = 'icons/clothing/uniform/workwear/dept_security/rwarden_skirt.dmi'
+ icon_state = "rwarden_skirt"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/warden/corp
+ name = "warden's corporate uniform"
+ desc = "A corporate standard uniform made of a slightly sturdier material, to allow for robust protection. It has the word \"Warden\" on the shoulders."
+ armor_type = /datum/armor/station/padded
+ icon = 'icons/clothing/uniform/workwear/dept_security/warden_corporate.dmi'
+ icon_state = "warden_corporate"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/warden/corp_fem
+ name = "warden's corporate uniform"
+ desc = "A corporate standard uniform made of a slightly sturdier material, to allow for robust protection. It has the word \"Warden\" on the shoulders."
+ icon = 'icons/clothing/uniform/workwear/dept_security/warden_corporate_fem.dmi'
+ icon_state = "warden_corporate_fem"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/warden/navyblue
+ desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
+ name = "warden's uniform"
+ icon = 'icons/clothing/uniform/workwear/dept_security/wardenblueclothes.dmi'
+ icon_state = "wardenblueclothes"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/warden/navyblue_fem
+ name = "warden's uniform"
+ desc = "The insignia on this uniform tells you that this uniform belongs to the Warden."
+ icon = 'icons/clothing/uniform/workwear/dept_security/wardenblueclothes_fem.dmi'
+ icon_state = "wardenblueclothes_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Security
+ */
+
+/obj/item/clothing/under/rank/security
+ name = "security officer's jumpsuit"
+ desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
+ icon = 'icons/clothing/uniform/workwear/dept_security/security.dmi'
+ icon_state = "security"
+ armor_type = /datum/armor/station/padded
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/security/skirt
+ name = "security officer's jumpskirt"
+ desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts."
+ icon = 'icons/clothing/uniform/workwear/dept_security/securityf.dmi'
+ icon_state = "securityf"
+ armor_type = /datum/armor/station/padded
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/security_fem
+ name = "security officer's jumpsuit"
+ desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
+ icon = 'icons/clothing/uniform/workwear/dept_security/security_fem.dmi'
+ icon_state = "security_fem"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/security/skirt_pleated
+ name = "security officer's pleated skirt"
+ desc = "A pleated skirt made up of a slightly sturdier material than most jumpsuits, allowing more robust protection."
+ icon = 'icons/clothing/uniform/workwear/dept_security/sec_skirt.dmi'
+ icon_state = "sec_skirt"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/security/turtleneck
+ name = "security turtleneck"
+ desc = "It's a stylish turtleneck made of a robust nanoweave. Nobody said the Law couldn't be fashionable."
+ icon = 'icons/clothing/uniform/workwear/dept_security/turtle_sec.dmi'
+ icon_state = "turtle_sec"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+
+/obj/item/clothing/under/rank/security/turtleneck_fem
+ name = "security turtleneck"
+ desc = "It's a stylish turtleneckf made of a robust nanoweave. Nobody said the Law couldn't be fashionable."
+ icon = 'icons/clothing/uniform/workwear/dept_security/turtle_sec_fem.dmi'
+ icon_state = "turtle_sec_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+
+/obj/item/clothing/under/rank/dispatch
+ name = "dispatcher's uniform"
+ desc = "A dress shirt and khakis with a security patch sewn on."
+ icon = 'icons/clothing/uniform/workwear/dept_security/dispatch.dmi'
+ icon_state = "dispatch"
+ armor_type = /datum/armor/station/padded
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/security2
+ name = "security officer's uniform"
+ desc = "It's made of a slightly sturdier material, to allow for robust protection."
+ icon = 'icons/clothing/uniform/workwear/dept_security/redshirt2.dmi'
+ icon_state = "redshirt2"
+ armor_type = /datum/armor/station/padded
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/security2_fem
+ name = "security officer's uniform"
+ desc = "It's made of a slightly sturdier material, to allow for robust protection."
+ icon = 'icons/clothing/uniform/workwear/dept_security/redshirt2_fem.dmi'
+ icon_state = "redshirt2_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/security/corp
+ name = "security officer's corporate uniform"
+ desc = "A corporate standard uniform made of a slightly sturdier material, to allow for robust protection."
+ icon = 'icons/clothing/uniform/workwear/dept_security/sec_corporate.dmi'
+ icon_state = "sec_corporate"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/security/corp_fem
+ name = "security officer's corporate uniform"
+ desc = "A corporate standard uniform made of a slightly sturdier material, to allow for robust protection."
+ icon = 'icons/clothing/uniform/workwear/dept_security/sec_corporate_fem.dmi'
+ icon_state = "sec_corporate_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/security/navyblue
+ name = "security officer's uniform"
+ desc = "The latest in fashionable security outfits."
+ icon = 'icons/clothing/uniform/workwear/dept_security/officerblueclothes.dmi'
+ icon_state = "officerblueclothes"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/security/navyblue_fem
+ name = "security officer's uniform"
+ desc = "The latest in fashionable security outfits."
+ icon = 'icons/clothing/uniform/workwear/dept_security/officerblueclothes_fem.dmi'
+ icon_state = "officerblueclothes_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/tactical
+ name = "tactical jumpsuit"
+ desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
+ icon = 'icons/clothing/uniform/workwear/dept_security/swatunder.dmi'
+ icon_state = "swatunder"
+ armor_type = /datum/armor/station/padded
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/**
+ * Detective
+ */
+
+/obj/item/clothing/under/det
+ name = "detective's suit"
+ desc = "A rumpled white dress shirt paired with well-worn grey slacks."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective.dmi'
+ icon_state = "detective"
+ armor_type = /datum/armor/station/padded
+ siemens_coefficient = 0.9
+ starting_accessories = list(/obj/item/clothing/accessory/tie/blue_clip)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+
+/obj/item/clothing/under/det_fem
+ name = "detective's suit"
+ desc = "A rumpled white dress shirt paired with well-worn grey slacks."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective_fem.dmi'
+ icon_state = "detective_fem"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/det/grey
+ name = "detective's tan suit"
+ desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective2.dmi'
+ icon_state = "detective2"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/red_long)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+
+/obj/item/clothing/under/det/grey_fem
+ name = "detective's tan suit"
+ desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective2_fem.dmi'
+ icon_state = "detective2_fem"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/red_long)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/det/grey/skirt_pleated
+ name = "detective's grey pleated skirt"
+ desc = "A sertous-looking pleated skirt paired with a freshly-pressed white shirt and a gold-clipped tie."
+ icon = 'icons/clothing/uniform/workwear/dept_security/greydet_skirt.dmi'
+ icon_state = "greydet_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/det/black
+ name = "detective's spiffy suit"
+ desc = "An immaculate white dress shirt, paired with a pair of dark grey dress pants, a red tie, and a charcoal vest."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective3.dmi'
+ icon_state = "detective3"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/vest)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+
+/obj/item/clothing/under/det/black_fem
+ name = "detective's spiffy suit"
+ desc = "An immaculate white dress shirt, paired with a pair of dark grey dress pants, a red tie, and a charcoal vest."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective3_fem.dmi'
+ icon_state = "detective3_fem"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/vest)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/det/corporate
+ name = "detective's corporate jumpsuit"
+ desc = "A more modern uniform for corporate investigators."
+ icon = 'icons/clothing/uniform/workwear/dept_security/det_corporate.dmi'
+ icon_state = "det_corporate"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/det/corporate_fem
+ name = "detective's corporate jumpsuit"
+ desc = "A more modern uniform for coroprate investigators."
+ icon = 'icons/clothing/uniform/workwear/dept_security/det_corporate_fem.dmi'
+ icon_state = "det_corporate_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//Reuses spritesheet
+/obj/item/clothing/under/det/waistcoat
+ name = "detective's semi-tidy suit"
+ desc = "A rumpled white dress shirt paired with well-worn grey slacks, complete with a blue striped tie, faux-gold tie clip, and waistcoat."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective.dmi'
+ icon_state = "detective"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/blue_clip, /obj/item/clothing/accessory/wcoat)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+
+//Reuses spritesheet
+/obj/item/clothing/under/det/waistcoat_fem
+ name = "detective's semi-tidy suit"
+ desc = "A rumpled white dress shirt paired with well-worn grey slacks, complete with a blue striped tie, faux-gold tie clip, and waistcoat."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective_fem.dmi'
+ icon_state = "detective_fem"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/blue_clip, /obj/item/clothing/accessory/wcoat)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//Reuses spritesheet
+/obj/item/clothing/under/det/grey/waistcoat
+ name = "detective's serious suit"
+ desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie and waistcoat."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective2.dmi'
+ icon_state = "detective2"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/wcoat)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+
+//Reuses spritesheet
+/obj/item/clothing/under/det/grey/waistcoat_fem
+ name = "detective's serious suit"
+ desc = "A serious-looking tan dress shirt paired with freshly-pressed black slacks, complete with a red striped tie and waistcoat."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective2_fem.dmi'
+ icon_state = "detective2_fem"
+ starting_accessories = list(/obj/item/clothing/accessory/tie/red_long, /obj/item/clothing/accessory/wcoat)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/det/skirt
+ name = "detective's skirt"
+ desc = "A serious-looking white blouse paired with a formal black pencil skirt."
+ icon = 'icons/clothing/uniform/workwear/dept_security/detective_skirt.dmi'
+ icon_state = "detective_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/*
+ * Head of Security
+ */
+/obj/item/clothing/under/rank/head_of_security
+ desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
+ name = "head of security's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_security/hos.dmi'
+ icon_state = "hos"
+ armor_type = /datum/armor/station/padded
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/head_of_security/skirt
+ name = "head of security's jumpskirt"
+ desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
+ icon = 'icons/clothing/uniform/workwear/dept_security/hosf.dmi'
+ icon_state = "hosf"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/head_of_security_fem
+ name = "head of security's jumpsuit"
+ desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armour to protect the wearer."
+ icon = 'icons/clothing/uniform/workwear/dept_security/hos_fem.dmi'
+ icon_state = "hos_fem"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/head_of_security/skirt_pleated
+ name = "head of security's pleated skirt"
+ desc = "A pleated skirt worn by those few with the dedication to achieve the position of 'Head of Security'. It bears additional armour to protect the wearer."
+ icon = 'icons/clothing/uniform/workwear/dept_security/rhos_skirt.dmi'
+ icon_state = "rhos_skirt"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/head_of_security/skirt_pleated/alt
+ name = "dark head of security's pleated skirt"
+ desc = "A pleated skirt worn by those few with the dedication to achieve the position of 'Head of Security'. It bears additional armour to protect the wearer."
+ icon = 'icons/clothing/uniform/workwear/dept_security/hosalt_skirt.dmi'
+ icon_state = "hosalt_skirt"
+ armor_type = /datum/armor/station/padded
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+
+/obj/item/clothing/under/rank/head_of_security/corp
+ name = "head of security's corporate jumpsuit"
+ desc = "A clean jumpsuit to corporate standard, worn by those few with the dedication to achieve the position of \"Head of Security\"."
+ icon = 'icons/clothing/uniform/workwear/dept_security/hos_corporate.dmi'
+ icon_state = "hos_corporate"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/head_of_security/corp_fem
+ name = "head of security's corporate jumpsuit"
+ desc = "A clean jumpsuit to corporate standard, worn by those few with the dedication to achieve the position of \"Head of Security\""
+ icon = 'icons/clothing/uniform/workwear/dept_security/hos_corporate_fem.dmi'
+ icon_state = "hos_corporate_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/head_of_security/turtleneck
+ name = "head of security's turtleneck"
+ desc = "A stylish alternative to the normal head of security jumpsuit, complete with tactical pants."
+ icon = 'icons/clothing/uniform/workwear/dept_security/hosturtle.dmi'
+ icon_state = "hosturtle"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/rank/head_of_security/jensen
+ desc = "You never asked for anything that stylish."
+ name = "head of security's jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/dept_security/jensen.dmi'
+ icon_state = "jensen"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/rank/head_of_security/navyblue
+ desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security."
+ name = "head of security's uniform"
+ icon = 'icons/clothing/uniform/workwear/dept_security/hosblueclothes.dmi'
+ icon_state = "hosblueclothes"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/rank/head_of_security/navyblue_fem
+ name = "head of security's uniform"
+ desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security."
+ icon = 'icons/clothing/uniform/workwear/dept_security/hosblueclothes_fem.dmi'
+ icon_state = "hosblueclothes_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/hosformalmale
+ name = "head of security's formal uniform"
+ desc = "A male head of security's formal-wear, for special occasions."
+ icon = 'icons/clothing/uniform/workwear/dept_security/hos_formal_male.dmi'
+ icon_state = "hos_formal_male"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/hosformalfem
+ name = "head of security's formal uniform"
+ desc = "A female head of security's formal-wear, for special occasions."
+ icon = 'icons/clothing/uniform/workwear/dept_security/hos_formal_fem.dmi'
+ icon_state = "hos_formal_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/workwear/future_jumpsuit.dm b/code/modules/clothing/under/workwear/future_jumpsuit.dm
new file mode 100644
index 00000000000..d59cea89b0d
--- /dev/null
+++ b/code/modules/clothing/under/workwear/future_jumpsuit.dm
@@ -0,0 +1,57 @@
+/**
+ * FUUUTUUUREEE jumpsuits
+ */
+
+/obj/item/clothing/under/future_fashion
+ name = "Futuristic Dark Blue-Striped Jumpsuit"
+ desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has dark blue stripes."
+ icon = 'icons/clothing/uniform/workwear/futuristic.dmi'
+ icon_state = "dark_blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/future_fashion/green_striped
+ name = "Futuristic Green-Striped Jumpsuit"
+ desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has green stripes."
+ icon = 'icons/clothing/uniform/workwear/futuristic.dmi'
+ icon_state = "green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/future_fashion/light_blue_striped
+ name = "Futuristic Light Blue-Striped Jumpsuit"
+ desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has light blue stripes."
+ icon = 'icons/clothing/uniform/workwear/futuristic.dmi'
+ icon_state = "light_blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/future_fashion/orange_striped
+ name = "Futuristic Orange-Striped Jumpsuit"
+ desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has orange-brownish stripes."
+ icon = 'icons/clothing/uniform/workwear/futuristic.dmi'
+ icon_state = "orange"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/future_fashion/purple_striped
+ name = "Futuristic Purple-Striped Jumpsuit"
+ desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has purple stripes."
+ icon = 'icons/clothing/uniform/workwear/futuristic.dmi'
+ icon_state = "purple"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/future_fashion/red_striped
+ name = "Futuristic Red-Striped Jumpsuit"
+ desc = "Show your love for the fasion of today viewed through the lens of yesterday! All come in black, but this one has red stripes."
+ icon = 'icons/clothing/uniform/workwear/futuristic.dmi'
+ icon_state = "red"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/workwear/laborer.dm b/code/modules/clothing/under/workwear/laborer.dm
new file mode 100644
index 00000000000..f12c59575eb
--- /dev/null
+++ b/code/modules/clothing/under/workwear/laborer.dm
@@ -0,0 +1,121 @@
+/**
+ * The working mans clothes.
+ */
+
+/obj/item/clothing/under/overalls
+ name = "laborer's overalls"
+ desc = "A set of durable overalls for getting the job done."
+ icon = 'icons/clothing/uniform/workwear/laborer/overalls.dmi'
+ icon_state = "overalls"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/overalls_fem
+ name = "laborer's overalls"
+ desc = "A set of durable overalls for getting the job done."
+ icon = 'icons/clothing/uniform/workwear/laborer/overalls_fem.dmi'
+ icon_state = "overalls_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/overalls/sleek
+ name = "sleek overalls"
+ desc = "A set of modern pleather reinforced overalls."
+ icon = 'icons/clothing/uniform/workwear/laborer/overalls_sleek.dmi'
+ icon_state = "overalls_sleek"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/overalls/sleek_fem
+ name = "sleek overalls"
+ desc = "A set of modern pleather reinforced overalls."
+ icon = 'icons/clothing/uniform/workwear/laborer/overalls_sleek_fem.dmi'
+ icon_state = "overalls_sleek_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+//Reuses spritesheet
+/obj/item/clothing/under/serviceoveralls
+ name = "workman outfit"
+ desc = "The very image of a working man. Not that you're probably doing work."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/mechanic.dmi'
+ icon_state = "mechanic"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/frontier
+ name = "frontier clothes"
+ desc = "A rugged flannel shirt and denim overalls. A popular style among frontier colonists."
+ icon = 'icons/clothing/uniform/workwear/laborer/frontier.dmi'
+ icon_state = "frontier"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/utility_fur_pants
+ name = "Utility Fur Pants"
+ desc = "A pair of pants designed to match the Utility Fur coat."
+ icon = 'icons/clothing/uniform/workwear/laborer/furup.dmi'
+ icon_state = "furup"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//Reuses spritesheet
+/obj/item/clothing/under/utility
+ name = "utility uniform"
+ desc = "A comfortable turtleneck and black utility trousers."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black.dmi'
+ icon_state = "black"
+ armor_type = /datum/armor/none
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//Reuses spritesheet
+/obj/item/clothing/under/utility/blue
+ name = "utility uniform"
+ desc = "A comfortable blue utility jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/navy.dmi'
+ icon_state = "navy"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//Reuses spritesheet
+/obj/item/clothing/under/utility/grey
+ name = "utility uniform"
+ desc = "A comfortable grey utility jumpsuit."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/grey.dmi'
+ icon_state = "grey"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//Reuses spritesheet
+/obj/item/clothing/under/navy_gray
+ name = "navy gray jumpsuit"
+ desc = "A light grey-blue jumpsuit resembling those worn in the Navy, without any of the traditional markings."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/lightnavy.dmi'
+ icon_state = "lightnavy"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/military.dm b/code/modules/clothing/under/workwear/military.dm
new file mode 100644
index 00000000000..64c7a2ff27a
--- /dev/null
+++ b/code/modules/clothing/under/workwear/military.dm
@@ -0,0 +1,47 @@
+/**
+ * Military Uniforms
+ */
+
+/**
+ * Military Surplus
+ */
+/obj/item/clothing/under/surplus
+ name = "surplus fatigues"
+ desc = "Old military fatigues like these are very common across the Frontier. Sturdy and somewhat comfortable, they hold up to the harsh working environments many colonists face, while also adding a little flair - regardless of prior military service."
+ icon = 'icons/clothing/uniform/workwear/military/bdu_olive.dmi'
+ icon_state = "bdu_olive"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/surplus/desert
+ icon = 'icons/clothing/uniform/workwear/military/bdu_desert.dmi'
+ icon_state = "bdu_desert"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/surplus/russoblue
+ icon = 'icons/clothing/uniform/workwear/military/bdu_russoblue.dmi'
+ icon_state = "bdu_russoblue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//Reuses spritesheet
+/obj/item/clothing/under/worn_fatigues
+ name = "special ops fatigues"
+ desc = "These worn fatigues match the pattern known to be used by JSDF Marine Corps special forces."
+ icon = 'icons/clothing/uniform/workwear/military/bdu_russoblue.dmi'
+ icon_state = "bdu_russoblue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/misc_corporations.dm b/code/modules/clothing/under/workwear/misc_corporations.dm
new file mode 100644
index 00000000000..10d401b3817
--- /dev/null
+++ b/code/modules/clothing/under/workwear/misc_corporations.dm
@@ -0,0 +1,139 @@
+/**
+ * Workwear for corporations other than NT. If one corporation gets many items split it off into its own file.
+ */
+
+/obj/item/clothing/under/brandjumpsuit/aether
+ name = "\improper Aether jumpsuit"
+ desc = "A jumpsuit belonging to Aether Atmospherics and Recycling, a Trans-Stellar that supplies recycling and atmospheric systems to colonies."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/aether.dmi'
+ icon_state = "aether"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pcrc
+ name = "\improper PCRC uniform"
+ desc = "A uniform belonging to Proxima Centauri Risk Control, a private security firm."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/pcrc.dmi'
+ icon_state = "pcrc"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/pcrc_fem
+ name = "\improper PCRC uniform"
+ desc = "A uniform belonging to Proxima Centauri Risk Control, a private security firm."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/pcrc_fem.dmi'
+ icon_state = "pcrc_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/brandjumpsuit/grayson
+ name = "\improper Grayson overalls"
+ desc = "A set of overalls belonging to Grayson Manufactories, a mining Trans-Stellar."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/mechanic.dmi'
+ icon_state = "mechanic"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+//Reuses spritesheet
+/obj/item/clothing/under/trader_coveralls
+ name = "nebula gas outfit"
+ desc = "A hardy and practical uniform distributed to Nebula Gas employees, meant to provide protection and comfort in industrial environments."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/mechanic.dmi'
+ icon_state = "mechanic"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+//Reuses spritesheet
+/obj/item/clothing/under/brandjumpsuit/wardt
+ name = "\improper Ward-Takahashi jumpsuit"
+ desc = "A jumpsuit belonging to Ward-Takahashi, a Trans-Stellar in the consumer goods market."
+ icon = 'icons/clothing/uniform/workwear/dept_science/robotics2.dmi'
+ icon_state = "robotics2"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/brandjumpsuit/mbill
+ name = "\improper Major Bill's uniform"
+ desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/mbill.dmi'
+ icon_state = "mbill"
+ catalogue_data = list(/datum/category_item/catalogue/information/organization/major_bills)
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/confederacy
+ name = "\improper Confederacy uniform"
+ desc = "A military uniform belonging to the Confederacy of Man, an independent human government." //Name pending review
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/confed.dmi'
+ icon_state = "confed"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/saare
+ name = "SAARE uniform"
+ desc = "A dress uniform belonging to Stealth Assault Enterprises, a minor private military corporation." //Name pending review
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/saare.dmi'
+ icon_state = "saare"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/saare_fem
+ name = "SAARE uniform"
+ desc = "A dress uniform belonging to Stealth Assault Enterprises, a minor private military corporation."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/saare_fem.dmi'
+ icon_state = "saare_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/brandjumpsuit/focal
+ name = "\improper Focal Point jumpsuit"
+ desc = "A jumpsuit belonging to Focal Point Energistics, an engineering megacorporation."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/focal.dmi'
+ icon_state = "focal"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/brandjumpsuit/hephaestus
+ name = "\improper Hephaestus jumpsuit"
+ desc = "A jumpsuit belonging to Hephaestus Industries, a Trans-Stellar best known for its arms production."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/heph.dmi'
+ icon_state = "heph"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/brandjumpsuit/hephaestus_fem
+ name = "\improper Hephaestus jumpsuit (female)"
+ desc = "A jumpsuit belonging to Hephaestus Industries, a Trans-Stellar best known for its arms production."
+ icon = 'icons/clothing/uniform/workwear/misc_corporations/heph_fem.dmi'
+ icon_state = "heph_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/miscellaneous.dm b/code/modules/clothing/under/workwear/miscellaneous.dm
new file mode 100644
index 00000000000..ce5c7facc50
--- /dev/null
+++ b/code/modules/clothing/under/workwear/miscellaneous.dm
@@ -0,0 +1,104 @@
+/**
+ * Tiny leftovers that don't fit anywhere else
+ */
+
+//Technically workwear lmao
+/obj/item/clothing/under/permit
+ name = "public nudity permit"
+ desc = "This permit entitles the bearer to conduct their duties without a uniform, so long as they are furred or have no visible genitalia."
+ icon = 'icons/clothing/uniform/workwear/npass.dmi'
+ icon_state = "npass"
+ body_cover_flags = 0
+ equip_sound = null
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/gear_harness
+ name = "gear harness"
+ desc = "How... minimalist."
+ icon = 'icons/clothing/uniform/workwear/gear_harness.dmi'
+ icon_state = "gear_harness"
+ body_cover_flags = NONE
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/gear_harness/style_repick_query(mob/user)
+ . = ..()
+ var/image/normal_image = image(icon, "gear_harness")
+ normal_image.maptext = MAPTEXT("normal")
+ .["normal"] = normal_image
+ var/image/invisible_image = image('icons/system/blank_32x32.dmi', "")
+ invisible_image.maptext = MAPTEXT("invisible")
+ .["invisible"] = invisible_image
+
+/obj/item/clothing/under/gear_harness/style_repick_set(style, mob/user)
+ switch(style)
+ if("normal")
+ worn_render_flags = initial(worn_render_flags)
+ return TRUE
+ if("invisible")
+ worn_render_flags |= WORN_RENDER_SLOT_NO_RENDER
+ return TRUE
+ else
+ return FALSE
+
+
+//Reuses spritesheet
+/obj/item/clothing/under/space
+ name = "\improper NASA jumpsuit"
+ desc = "It has a NASA logo on it and is made of space-proofed materials."
+ icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ icon_state = "black"
+ w_class = WEIGHT_CLASS_BULKY//bulky item
+ gas_transfer_coefficient = 0.01
+ permeability_coefficient = 0.02
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+ cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected.
+ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+//Reuses spritesheet
+//Admin abuse suit
+/obj/item/clothing/under/acj
+ name = "administrative cybernetic jumpsuit"
+ icon = 'icons/clothing/uniform/workwear/syndicate/syndicate.dmi'
+ icon_state = "syndicate"
+ desc = "it's a cybernetically enhanced jumpsuit used for administrative duties."
+ gas_transfer_coefficient = 0.01
+ permeability_coefficient = 0.01
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+ armor_type = /datum/armor/invulnerable
+ cold_protection_cover = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
+ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
+ siemens_coefficient = 0
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/smooth_gray
+ name = "smooth gray jumpsuit"
+ desc = "An ironed version of the famous, bold, and bald apparel. As smooth as it looks, it does not guarantee being able to slip away."
+ icon = 'icons/clothing/uniform/workwear/gray_smooth_jumpsuit.dmi'
+ icon_state = "gray_smooth_jumpsuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/tracksuit_blue
+ name = "blue tracksuit"
+ desc = "A dark blue tracksuit. It calls to mind images of excercise, particularly squats."
+ icon = 'icons/clothing/uniform/workwear/tracksuit_blue.dmi'
+ icon_state = "tracksuit_blue"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/oricon/_oricon.dm b/code/modules/clothing/under/workwear/oricon/_oricon.dm
new file mode 100644
index 00000000000..95b3eee4894
--- /dev/null
+++ b/code/modules/clothing/under/workwear/oricon/_oricon.dm
@@ -0,0 +1,12 @@
+/**
+ * Oricon clothing
+ * This stuff is much newer so I'm not going to bother resorting these -S
+ */
+
+/obj/item/clothing/under/oricon
+ name = "master oricon uniform"
+ desc = "You shouldn't be seeing this."
+ armor_type = /datum/armor/station/padded
+ siemens_coefficient = 0.8
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/oricon/crew.dm b/code/modules/clothing/under/workwear/oricon/crew.dm
similarity index 54%
rename from code/modules/clothing/under/oricon/crew.dm
rename to code/modules/clothing/under/workwear/oricon/crew.dm
index c062546a753..7c3c2629ad5 100644
--- a/code/modules/clothing/under/oricon/crew.dm
+++ b/code/modules/clothing/under/workwear/oricon/crew.dm
@@ -1,23 +1,29 @@
/obj/item/clothing/under/oricon/utility/sysguard/crew
name = "crew uniform"
desc = "A comfortable turtleneck and black utility trousers, made from biohazard resistant material. This one has silver trim."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_crew.dmi'
icon_state = "black_crew"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/crew/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/crew)
name = "crew command uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
icon_state = "black_command" // todo: actual state
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/crew/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/crew)
name = "crew engineering uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_eng.dmi'
icon_state = "black_eng"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/crew/security
desc = "A comfortable turtleneck and black utility trousers, made from a slightly sturdy, biohazard resistant material. This one has silver trim."
@@ -25,71 +31,85 @@
siemens_coefficient = 0.9
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/crew)
name = "crew security uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sec.dmi'
icon_state = "black_sec"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/crew/blueshield
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/blueshield/crew)
name = "blueshield's utility uniform"
desc = "A comfortable turtleneck and black utility trousers, made from a slightly sturdy, biohazard resistant material. This one has silver trim."
armor_type = /datum/armor/station/padded
- icon = 'icons/clothing/uniform/rank/utility/blueshield.dmi'
- icon_state = "black"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_blueshield.dmi'
+ icon_state = "black_blueshield"
worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_VOX)
worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
/obj/item/clothing/under/oricon/utility/sysguard/crew/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/crew)
name = "crew medical uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_med.dmi'
icon_state = "black_med"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/crew/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/crew)
name = "crew logistics uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sup.dmi'
icon_state = "black_sup"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/crew/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/crew)
name = "crew explorer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black.dmi'
icon_state = "black"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/crew/research
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research/crew)
name = "crew science uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sci.dmi'
icon_state = "black_sci"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew
name = "crew officer uniform"
desc = "A comfortable turtleneck and black utility trousers, made from biohazard resistant material. This one has gold trim."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
icon_state = "black_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/crew)
name = "command officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
icon_state = "black_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/crew)
name = "engineering officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_eng_command.dmi'
icon_state = "black_eng_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/security
desc = "A comfortable turtleneck and black utility trousers, made from a slightly sturdy, biohazard resistant material. This one has gold trim."
@@ -97,34 +117,44 @@
siemens_coefficient = 0.9
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/crew)
name = "security officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sec_command.dmi'
icon_state = "black_sec_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/crew)
name = "medical officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_med_command.dmi'
icon_state = "black_med_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/crew)
name = "logistics officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
icon_state = "black_command" // todo: actual state
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/crew)
name = "explorer officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
icon_state = "black_command" // todo: actual state
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/research
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research/crew)
name = "science officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sci_command.dmi'
icon_state = "black_sci_command"
- worn_has_rolldown = UNIFORM_HAS_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
diff --git a/code/modules/clothing/under/oricon/dress.dm b/code/modules/clothing/under/workwear/oricon/dress.dm
similarity index 79%
rename from code/modules/clothing/under/oricon/dress.dm
rename to code/modules/clothing/under/workwear/oricon/dress.dm
index 4b6900dc6b1..a22c2d0efd1 100644
--- a/code/modules/clothing/under/oricon/dress.dm
+++ b/code/modules/clothing/under/workwear/oricon/dress.dm
@@ -1,17 +1,22 @@
/obj/item/clothing/under/oricon/mildress
name = "dress uniform"
- icon = 'icons/clothing/uniform/rank/dress.dmi'
+ icon = 'icons/clothing/uniform/workwear/oricon/dress/grey.dmi'
desc = "A dress uniform of some kind."
icon_state = "grey"
armor_type = /datum/armor/none
siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/oricon/mildress/sysguard
name = "explorer's dress uniform"
desc = "The dress uniform of the Society of Universal Cartographers in silver trim."
+ icon = 'icons/clothing/uniform/workwear/oricon/dress/grey.dmi'
icon_state = "grey"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/oricon/mildress/sysguard/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/service)
@@ -40,7 +45,11 @@
/obj/item/clothing/under/oricon/mildress/sysguard/officer
name = "explorer's command dress uniform"
desc = "The dress uniform of the Society of Universal Cartographers in gold trim."
+ icon = 'icons/clothing/uniform/workwear/oricon/dress/grey_command.dmi'
icon_state = "grey_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/oricon/mildress/sysguard/officer/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/service)
@@ -69,11 +78,17 @@
/obj/item/clothing/under/oricon/mildress/marine
name = "marine dress uniform"
desc = "The dress uniform of the JSDF Marine Corps, class given form."
+ icon = 'icons/clothing/uniform/workwear/oricon/dress/black.dmi'
icon_state = "black"
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/mildress/marine/command
name = "marine command dress uniform"
desc = "The dress uniform of the JSDF Marine Corps, even classier in gold."
+ icon = 'icons/clothing/uniform/workwear/oricon/dress/black_command.dmi'
icon_state = "black_command"
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
diff --git a/code/modules/clothing/under/oricon/pt.dm b/code/modules/clothing/under/workwear/oricon/pt.dm
similarity index 73%
rename from code/modules/clothing/under/oricon/pt.dm
rename to code/modules/clothing/under/workwear/oricon/pt.dm
index 02472dcef3c..c67bfbde9fd 100644
--- a/code/modules/clothing/under/oricon/pt.dm
+++ b/code/modules/clothing/under/workwear/oricon/pt.dm
@@ -1,12 +1,11 @@
/obj/item/clothing/under/oricon/pt
name = "pt uniform"
- icon = 'icons/clothing/uniform/rank/pt.dmi'
+ icon = 'icons/clothing/uniform/workwear/oricon/pt/miami.dmi'
desc = "Shorts! Shirt! Miami! Sexy!"
icon_state = "miami"
armor_type = /datum/armor/none
siemens_coefficient = 0.9
body_cover_flags = UPPER_TORSO|LOWER_TORSO
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_NO_RENDER
worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
@@ -14,20 +13,26 @@
/obj/item/clothing/under/oricon/pt/sysguard
name = "explorer's pt uniform"
desc = "A baggy shirt bearing the seal of the Society of Universal Cartographers and some dorky looking blue shorts."
+ icon = 'icons/clothing/uniform/workwear/oricon/pt/expedition.dmi'
icon_state = "expedition"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/oricon/pt/fleet
name = "fleet pt uniform"
desc = "A pair of black shorts and two tank tops, seems impractical. Looks good though."
+ icon = 'icons/clothing/uniform/workwear/oricon/pt/fleet.dmi'
icon_state = "fleet"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/oricon/pt/marine
name = "marine pt uniform"
desc = "Does NOT leave much to the imagination."
+ icon = 'icons/clothing/uniform/workwear/oricon/pt/marine.dmi'
icon_state = "marine"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/oricon/service.dm b/code/modules/clothing/under/workwear/oricon/service.dm
similarity index 56%
rename from code/modules/clothing/under/oricon/service.dm
rename to code/modules/clothing/under/workwear/oricon/service.dm
index 7793ff18fcc..302a1b43f84 100644
--- a/code/modules/clothing/under/oricon/service.dm
+++ b/code/modules/clothing/under/workwear/oricon/service.dm
@@ -1,30 +1,37 @@
/obj/item/clothing/under/oricon/service
name = "service uniform"
- icon = 'icons/clothing/uniform/rank/service.dmi'
+ icon = 'icons/clothing/uniform/workwear/oricon/service/white.dmi'
desc = "A service uniform of some kind."
icon_state = "white"
siemens_coefficient = 0.9
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_NO_RENDER
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
/obj/item/clothing/under/oricon/service/fleet
name = "fleet service uniform"
desc = "The service uniform of the JSDF Fleet, made from immaculate white fabric."
+ icon = 'icons/clothing/uniform/workwear/oricon/service/white.dmi'
icon_state = "white"
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/service/marine
name = "marine service uniform"
desc = "The service uniform of the JSDF Marine Corps. Slimming."
+ icon = 'icons/clothing/uniform/workwear/oricon/service/green.dmi'
icon_state = "green"
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
/obj/item/clothing/under/oricon/service/marine/command
name = "marine command service uniform"
desc = "The service uniform of the JSDF Marine Corps. Slimming and stylish."
+ icon = 'icons/clothing/uniform/workwear/oricon/service/green_command.dmi'
icon_state = "green_command"
- worn_has_rollsleeve = UNIFORM_HAS_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
diff --git a/code/modules/clothing/under/workwear/oricon/utility.dm b/code/modules/clothing/under/workwear/oricon/utility.dm
new file mode 100644
index 00000000000..9975e448cd3
--- /dev/null
+++ b/code/modules/clothing/under/workwear/oricon/utility.dm
@@ -0,0 +1,319 @@
+/obj/item/clothing/under/oricon/utility
+
+
+/obj/item/clothing/under/oricon/utility/sysguard
+ name = "explorer's uniform"
+ desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim."
+ armor_type = /datum/armor/uniform/utility
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_crew.dmi'
+ icon_state = "black_crew"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/command
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command)
+ name = "explorer's command uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
+ icon_state = "black_command" // todo: actual state
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/engineering
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering)
+ name = "explorer's engineering uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_eng.dmi'
+ icon_state = "black_eng"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/security
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security)
+ name = "explorer's security uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sec.dmi'
+ icon_state = "black_sec"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/medical
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical)
+ name = "explorer's medical uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_med.dmi'
+ icon_state = "black_med"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/supply
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply)
+ name = "explorer's logistics uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sup.dmi'
+ icon_state = "black_sup"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/exploration
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration)
+ name = "explorer's uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black.dmi'
+ icon_state = "black" // todo: actual state
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/research
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research)
+ name = "explorer's research uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sci.dmi'
+ icon_state = "black_sci"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/officer
+ name = "explorer's officer uniform"
+ desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has gold trim."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
+ icon_state = "black_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/officer/command
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command)
+ name = "explorer's command officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
+ icon_state = "black_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/officer/engineering
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering)
+ name = "explorer's engineering officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
+ icon_state = "black_eng_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/officer/security
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security)
+ name = "explorer's security officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sec_command.dmi'
+ icon_state = "black_sec_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/officer/medical
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical)
+ name = "explorer's medical officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_med_command.dmi'
+ icon_state = "black_med_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/officer/supply
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply)
+ name = "explorer's logistics officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
+ icon_state = "black_command" // todo: actual state
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+// todo: you actual memes why does this exist
+/obj/item/clothing/under/oricon/utility/sysguard/officer/exploration
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration)
+ name = "explorer's expeditionary officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_command.dmi'
+ icon_state = "black_command" // todo: actual state
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/sysguard/officer/research
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research)
+ name = "explorer's science officer uniform"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/black_sci_command.dmi'
+ icon_state = "black_sci_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/fleet
+ name = "fleet coveralls"
+ desc = "The utility uniform of the JSDF Fleet, made from an insulated material."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/navy.dmi'
+ icon_state = "navy"
+ siemens_coefficient = 0.7
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/fleet/command
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/fleet)
+ name = "fleet command coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/navy_command.dmi'
+ icon_state = "navy_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/fleet/command/pilot
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/specialty/pilot)
+ name = "fleet pilot coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/navy_officer.dmi'
+ icon_state = "navy_officer"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/fleet/engineering
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/fleet)
+ name = "fleet engineer coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/navy_eng.dmi'
+ icon_state = "navy_eng"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/oricon/utility/fleet/security
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/fleet)
+ name = "fleet security coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/navy_sec.dmi'
+ icon_state = "navy_sec"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/oricon/utility/fleet/medical
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/fleet)
+ name = "fleet medical coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/navy_med.dmi'
+ icon_state = "navy_med"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/oricon/utility/fleet/supply
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/fleet)
+ name = "fleet logistics coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/navy_sup.dmi'
+ icon_state = "navy_sup"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/oricon/utility/fleet/exploration
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/fleet)
+ name = "fleet explorer coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/navy_combat.dmi'
+ icon_state = "navy_combat"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/marine
+ name = "marine fatigues"
+ desc = "The utility uniform of the JSDF Marine Corps, made from durable material."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/grey.dmi'
+ icon_state = "grey"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/marine/command
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/marine)
+ name = "marine command coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/grey_command.dmi'
+ icon_state = "grey_command"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/marine/engineering
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/marine)
+ name = "marine engineering coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/grey_eng.dmi'
+ icon_state = "grey_eng"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/marine/security
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/marine)
+ name = "marine security coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/grey_sec.dmi'
+ icon_state = "grey_sec"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/oricon/utility/marine/medical
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/marine)
+ name = "marine medical coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/grey_med.dmi'
+ icon_state = "grey_med"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/oricon/utility/marine/supply
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/marine)
+ name = "marine logistics coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/grey_sup.dmi'
+ icon_state = "grey_sup"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/oricon/utility/marine/exploration
+ starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/marine)
+ name = "marine explorer coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/terran.dmi'
+ icon_state = "terran"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/marine/research
+ name = "marine researcher coveralls"
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/grey_sci.dmi'
+ icon_state = "grey_sci"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/marine/green
+ name = "green fatigues"
+ desc = "A green version of the JSDF marine utility uniform, made from durable material."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/green.dmi'
+ icon_state = "green"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/marine/tan
+ name = "tan fatigues"
+ desc = "A tan version of the JSDF marine utility uniform, made from durable material."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/tan.dmi'
+ icon_state = "tan"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+
+/obj/item/clothing/under/oricon/utility/marine/lightnavy
+ name = "light navy fatigues"
+ desc = "A lighty navy version of the JSDF marine utility uniform, made from durable material."
+ icon = 'icons/clothing/uniform/workwear/oricon/utility/lightnavy.dmi'
+ icon_state = "lightnavy"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
diff --git a/code/modules/clothing/under/workwear/promethean_cohesion_suits.dm b/code/modules/clothing/under/workwear/promethean_cohesion_suits.dm
new file mode 100644
index 00000000000..f38a205eccf
--- /dev/null
+++ b/code/modules/clothing/under/workwear/promethean_cohesion_suits.dm
@@ -0,0 +1,113 @@
+/**
+ * Promethean Cohesion suits
+ */
+
+/obj/item/clothing/under/cohesion
+ name = "black cohesion suit"
+ desc = "A plain black cohesion suit intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit.dmi'
+ icon_state = "cohesionsuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cohesion_fem
+ name = "black cohesion suit (female)"
+ desc = "A plain black cohesion suit intended to assist Prometheans in maintaining their form and prevent direct sken exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_fem.dmi'
+ icon_state = "cohesionsuit_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cohesion/striped
+ name = "red striped cohesion suit"
+ desc = "A black cohesion suit with red stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_striped.dmi'
+ icon_state = "cohesionsuit_striped"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cohesion/striped_fem
+ name = "red striped cohesion suit (female)"
+ desc = "A black cohesion suit with red striped intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_striped_fem.dmi'
+ icon_state = "cohesionsuit_striped_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cohesion/decal
+ name = "purple decaled cohesion suit"
+ desc = "A white cohesion suit with purple decals intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_decal.dmi'
+ icon_state = "cohesionsuit_decal"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cohesion/decal_fem
+ name = "purple decaled cohesion suit (female)"
+ desc = "A white cohesion suit with purple decals intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_decal_fem.dmi'
+ icon_state = "cohesionsuit_decal_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cohesion/pattern
+ name = "blue patterned cohesion suit"
+ desc = "A white cohesion suit with blue patterns intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_pattern.dmi'
+ icon_state = "cohesionsuit_pattern"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cohesion/pattern_fem
+ name = "blue patterned cohesion suit (female)"
+ desc = "A white cohesion suit with blue patterns intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_pattern_fem.dmi'
+ icon_state = "cohesionsuit_pattern_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cohesion/hazard
+ name = "hazard cohesion suit"
+ desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_hazard.dmi'
+ icon_state = "cohesionsuit_hazard"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/cohesion/hazard_fem
+ name = "hazard cohesion suit (female)"
+ desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
+ icon = 'icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_hazard_fem.dmi'
+ icon_state = "cohesionsuit_hazard_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/replika.dm b/code/modules/clothing/under/workwear/replika.dm
new file mode 100644
index 00000000000..42a61178cd4
--- /dev/null
+++ b/code/modules/clothing/under/workwear/replika.dm
@@ -0,0 +1,155 @@
+/**
+ * Replika clothing
+ */
+
+/obj/item/clothing/under/replika/arar
+ name = "repair-worker replikant bodysuit"
+ desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the engineering variety. Comes with multiple interfacing ports, arm protectors, and a conspicuous lack of leg coverage."
+ description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
+ icon = 'icons/clothing/uniform/workwear/replika/arar.dmi'
+ icon_state = "arar"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/replika/lstr
+ name = "land-survey replikant bodysuit"
+ desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the exploration variety. Comes with several interfacing ports and a conspicuous lack of leg coverage."
+ description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
+ icon = 'icons/clothing/uniform/workwear/replika/lstr.dmi'
+ icon_state = "lstr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/replika/sakr
+ name = "medical replikant bodysuit"
+ desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the medical variety. Comes with default interfacing ports and a conspicuous lack of leg coverage."
+ description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
+ icon = 'icons/clothing/uniform/workwear/replika/sakr.dmi'
+ icon_state = "sakr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/replika/fklr
+ name = "command replikant bodysuit"
+ desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the command variety. Comes with interfacing ports, an air of formality, and a conspicuous lack of leg coverage."
+ description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
+ icon = 'icons/clothing/uniform/workwear/replika/fklr.dmi'
+ icon_state = "fklr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/replika/eulr
+ name = "general-purpose replikant bodysuit"
+ desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of multipurpose variety. Comes with default interfacing ports and a conspicuous lack of leg coverage."
+ description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
+ icon = 'icons/clothing/uniform/workwear/replika/eulr.dmi'
+ icon_state = "eulr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/replika/klbr
+ name = "controller replikant bodysuit"
+ desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the controller variety. Comes with several interfacing ports and a conspicuous lack of leg coverage."
+ description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
+ icon = 'icons/clothing/uniform/workwear/replika/klbr.dmi'
+ icon_state = "klbr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/replika/stcr
+ name = "security-technician replikant bodysuit"
+ desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the security variety. Comes with multiple interfacing ports and a conspicuous lack of leg coverage."
+ description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
+ icon = 'icons/clothing/uniform/workwear/replika/stcr.dmi'
+ icon_state = "stcr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/replika/adlr
+ name = "administration replikant bodysuit"
+ desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the administrative variety. Comes with several interfacing ports and a conspicuous lack of leg coverage."
+ description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
+ icon = 'icons/clothing/uniform/workwear/replika/adlr.dmi'
+ icon_state = "adlr"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/replika/lstr_alt
+ name = "combat-engineer replikant bodysuit"
+ desc = "A skin-tight bodysuit designed for 2nd generation biosynthetics of the exploration variety. Comes with extra interfacing ports, white armpads, and a familiar lack of leg coverage."
+ description_fluff = "These purpose-made interfacing bodysuits are designed and produced by the Singheim Bureau of Biosynthetic Development for their long-running second generation of Biosynthetics, commonly known by the term Replikant. Although anyone could wear these, their overall cut and metallic ports along the spine make it rather uncomfortable to most."
+ icon = 'icons/clothing/uniform/workwear/replika/lstr_alt.dmi'
+ icon_state = "lstr_alt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/gestalt/sleek_skirt
+ name = "sleek crew skirt"
+ desc = "A tight-fitting black uniform with a narrow skirt and striking crimson trim."
+ icon = 'icons/clothing/uniform/workwear/replika/gestalt_skirt.dmi'
+ icon_state = "gestalt_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/gestalt/sleek
+ name = "sleek crew uniform"
+ desc = "A tight-fitting black uniform with striking crimson trim."
+ icon = 'icons/clothing/uniform/workwear/replika/gestalt.dmi'
+ icon_state = "gestalt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/gestalt/sleek_fem
+ name = "sleek female crew uniform"
+ desc = "A tight-fitting black uniform with striking crimson trim."
+ icon = 'icons/clothing/uniform/workwear/replika/gestalt_fem.dmi'
+ icon_state = "gestalt_fem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/gestalt/sleeveless
+ name = "sleeveless sleek crew uniform"
+ desc = "A tight-fitting, sleeveless single-piece black uniform with striking crimson trim."
+ icon = 'icons/clothing/uniform/workwear/replika/gestalt_sleeveless.dmi'
+ icon_state = "gestalt_sleeveless"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/syndicate.dm b/code/modules/clothing/under/workwear/syndicate.dm
new file mode 100644
index 00000000000..c333d2c84fb
--- /dev/null
+++ b/code/modules/clothing/under/workwear/syndicate.dm
@@ -0,0 +1,61 @@
+/**
+ * "Former" Syndicate workwear
+ */
+
+/obj/item/clothing/under/syndicate //Merc Tactleneck
+ name = "tactical turtleneck"
+ desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
+ icon = 'icons/clothing/uniform/workwear/syndicate/syndicate.dmi'
+ icon_state = "syndicate"
+ has_sensors = UNIFORM_HAS_NO_SENSORS
+ armor_type = /datum/armor/agent/jumpsuit
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/syndicate/skirt_pleated
+ name = "tactical pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/syndicate/syndicate_skirt.dmi'
+ icon_state = "syndicate_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+
+/obj/item/clothing/under/syndicate/combat //ERT tactleneck
+ name = "combat turtleneck"
+ desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
+ icon = 'icons/clothing/uniform/workwear/syndicate/combat.dmi'
+ icon_state = "combat"
+ has_sensors = UNIFORM_HAS_SUIT_SENSORS
+ siemens_coefficient = 0.9
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/syndicate/tacticool
+ name = "\improper Tacticool turtleneck"
+ desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
+ icon = 'icons/clothing/uniform/workwear/syndicate/tactifool.dmi'
+ icon_state = "tactifool"
+ siemens_coefficient = 1
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI, BODYTYPE_VOX)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_UNATHI_DIGI)
+
+/obj/item/clothing/under/syndicate/tacticool/skirt_pleated
+ name = "tacticool pleated skirt"
+ icon = 'icons/clothing/uniform/workwear/syndicate/tactifool_skirt.dmi'
+ icon_state = "tactifool_skirt"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+
+/obj/item/clothing/under/syndicate/combat/suit
+ name = "syndicate combat suit"
+ desc = "This streamlined tactical suit is a cut above the tactical turtleneck. It has four more pockets."
+ icon = 'icons/clothing/uniform/workwear/syndicate/syndicate_combat.dmi'
+ icon_state = "syndicate_combat"
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
diff --git a/code/modules/clothing/under/xenos/tajaran.dm b/code/modules/clothing/under/workwear/tajaran_workwear.dm
similarity index 55%
rename from code/modules/clothing/under/xenos/tajaran.dm
rename to code/modules/clothing/under/workwear/tajaran_workwear.dm
index 86891fb4500..875cf68e9b0 100644
--- a/code/modules/clothing/under/xenos/tajaran.dm
+++ b/code/modules/clothing/under/workwear/tajaran_workwear.dm
@@ -1,419 +1,406 @@
-//Lowers
+/**
+ * Catpeople workwear clothing
+ */
/obj/item/clothing/under/tajaran
name = "laborer cloths"
desc = "A rough but thin outfit, providing air flow but also protection from working hazards."
- icon = 'icons/mob/clothing/species/tajaran/uniform.dmi'
+ icon = 'icons/clothing/uniform/workwear/tajaran/taj_labor.dmi'
icon_state = "taj_labor"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/tajaran/fancy
- name = "fancy uniform"
- desc = "Worn by princes, barons and lords of Adhomai, now in stores near you!"
- icon_state = "male_taj_fancy"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/tajaran/fancy/alt1
- icon_state = "male_taj_fancy_alt1"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/tajaran/fancy/alt2
- icon_state = "male_taj_fancy_alt2"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/nt
name = "Nanotrasen overalls"
desc = "Overalls meant for Nanotrasen employees of xeno descent, modified to prevent overheating."
+ icon = 'icons/clothing/uniform/workwear/tajaran/ntoveralls.dmi'
icon_state = "ntoveralls"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/matake
name = "Mata'ke priest garments"
desc = "Simple linen garments worn by Mata'ke priests."
+ icon = 'icons/clothing/uniform/workwear/tajaran/matakeuniform.dmi'
icon_state = "matakeuniform"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/cosmonaut
name = "kosmostrelki uniform"
desc = "A military uniform used by the forces of the People's Republic of Adhomai orbital fleet."
+ icon = 'icons/clothing/uniform/workwear/tajaran/cosmonaut.dmi'
icon_state = "cosmonaut"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/cosmonaut/commissar
name = "kosmostrelki commissar uniform"
desc = "A military uniform used by Party Commissars attached to kosmostrelki units."
+ icon = 'icons/clothing/uniform/workwear/tajaran/space_commissar.dmi'
icon_state = "space_commissar"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/cosmonaut/captain
name = "orbital fleet captain uniform"
desc = "A military uniform used by a captain of the People's Republic of Adhomai orbital fleet."
+ icon = 'icons/clothing/uniform/workwear/tajaran/orbital_captain.dmi'
icon_state = "orbital_captain"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/database_freighter
name = "orbital fleet surveyor uniform"
desc = "A pratical uniform used by the crew of the orbital fleet's database freighters."
+ icon = 'icons/clothing/uniform/workwear/tajaran/database_freighter.dmi'
icon_state = "database_freighter"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/database_freighter/captain
name = "orbital fleet head surveyor uniform"
desc = "A pratical uniform used by the captains of the orbital fleet's database freighters."
+ icon = 'icons/clothing/uniform/workwear/tajaran/database_freighter_captain.dmi'
icon_state = "database_freighter_captain"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/tajaran/summer
- name = "adhomian summerwear"
- desc = "A simple piece of adhomian summerwear made with linen."
- icon_state = "summerwear"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/mechanic
name = "machinist uniform"
desc = "A simple and robust overall used by Adhomian urban workers."
+ icon = 'icons/clothing/uniform/workwear/tajaran/mechanic.dmi'
icon_state = "mechanic"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/raakti_shariim
name = "\improper Raakti Shariim uniform"
desc = "A blue and lilac adhomian uniform with pale-gold insignia, worn by members of the NKA's Raakti Shariim."
+ icon = 'icons/clothing/uniform/workwear/tajaran/raakti_shariim_uniform.dmi'
icon_state = "raakti_shariim_uniform"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/tajaran
- name = "fancy adhomian dress"
- desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is white."
- icon = 'icons/mob/clothing/species/tajaran/uniform.dmi'
- icon_state = "taj_dress_white"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/tajaran/blue
- name = "blue fancy adhomian dress"
- desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is blue."
- icon_state = "taj_dress_skyblue"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/tajaran/green
- name = "green fancy adhomian dress"
- desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is green."
- icon_state = "taj_dress_green"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/tajaran/red
- name = "red fancy adhomian dress"
- desc = "Created for the rich and party-loving circles of Adhomai, this dress is fashioned from smooth silk and is see through at parts. This one is red."
- icon_state = "taj_dress_red"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/tajaran/fancy
- name = "red noble adhomian dress"
- desc = "The classical dress of the Adhomian royalty, only to be worn during the special occassions. This one is crimson red."
- icon_state = "taj_dress_fancy"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/tajaran/fancy/black
- name = "black noble adhomian dress"
- desc = "The classical dress of the Adhomian royalty, only to be worn during the special occassions. This one is dark black."
- icon_state = "taj_dress_fancy_dark"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/tajaran/formal
- name = "fancy adhomian uniform with skirt"
- desc = "Formal Tajaran clothing with a skirt."
- icon_state = "female_taj_fancy"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/tajaran/formal/alt1
- name = "fancy adhomian uniform with skirt, alt1"
- icon_state = "female_taj_fancy_alt1"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/dress/tajaran/formal/alt2
- name = "fancy adhomian uniform with skirt, alt2"
- icon_state = "female_taj_fancy_alt2"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-/obj/item/clothing/under/tajaran/summer/dress
- name = "adhomian summer dress"
- desc = "An Adhomian dress usually worn during the summer."
- icon_state = "summer-dress"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- body_cover_flags = LOWER_TORSO
- starting_accessories = list(/obj/item/clothing/accessory/tajaran/summershirt)
-
-/obj/item/clothing/under/tajaran/summer/pants
- name = "adhomian summer pants"
- desc = "A pair of adhomian pants usually worn during the summer."
- icon_state = "summer-pants"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
- starting_accessories = list(/obj/item/clothing/accessory/tajaran/summershirt)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
//Military uniforms no armor protection
/obj/item/clothing/under/tajaran/pra_uniform
name = "republican army uniform"
desc = "A military uniform used by the forces of Grand People's Army."
+ icon = 'icons/clothing/uniform/workwear/tajaran/prauniform.dmi'
icon_state = "prauniform"
armor_type = /datum/armor/station/padded
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/nka_uniform
name = "imperial adhomian army uniform"
desc = "A military uniform used by the forces of the New Kingdom of Adhomai's army."
+ icon = 'icons/clothing/uniform/workwear/tajaran/nka_uniform.dmi'
icon_state = "nka_uniform"
armor_type = /datum/armor/station/padded
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/nka_uniform/commander
name = "imperial adhomian army officer uniform"
desc = "A military uniform used by the officers of the New Kingdom of Adhomai's army."
+ icon = 'icons/clothing/uniform/workwear/tajaran/nka_commander.dmi'
icon_state = "nka_commander"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/nka_uniform/sailor
name = "royal navy sailor uniform"
desc = "A military uniform used by the sailor of the New Kingdom of Adhomai's navy."
+ icon = 'icons/clothing/uniform/workwear/tajaran/nka_sailor.dmi'
icon_state = "nka_sailor"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/consular
name = "people's republic consular uniform"
desc = "An olive uniform used by the diplomatic service of the People's Republic of Adhomai."
+ icon = 'icons/clothing/uniform/workwear/tajaran/pra_consular.dmi'
icon_state = "pra_consular"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/consular/female
+ icon = 'icons/clothing/uniform/workwear/tajaran/pra_con_f.dmi'
icon_state = "pra_con_f"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/consular/dpra
name = "democratic people's republic consular uniform"
desc = "A grey uniform used by the diplomatic service of the Democratic People's Republic of Adhomai."
+ icon = 'icons/clothing/uniform/workwear/tajaran/dpra_consular.dmi'
icon_state = "dpra_consular"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/consular/dpra/female
+ icon = 'icons/clothing/uniform/workwear/tajaran/dpra_con_f.dmi'
icon_state = "dpra_con_f"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/consular/nka
name = "new kingdom consular uniform"
desc = "A blue uniform used by the diplomatic service of the New Kingdom of Adhomai."
+ icon = 'icons/clothing/uniform/workwear/tajaran/nka_consular.dmi'
icon_state = "nka_consular"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/hadiifolly
name = "Hadii's Folly Governement uniform"
desc = "Those modest uniform are made out of corporate prison jumpsuits, and the new uniform of members of the haddi's folley authority governement. Those uniform are worn by civilians working in the gouvernement."
- icon_state = "hadiisgov_uniform"
+ icon = 'icons/clothing/uniform/workwear/tajaran/hadiisgov.dmi'
+ icon_state = "hadiisgov"
armor_type = /datum/armor/station/padded
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/hadiifolly/soldier
name = "Hadii's Folly SDF uniform"
desc = "Those modest uniform are made out of corporate prison jumpsuits, and the new uniform of members of the haddi's folley authority governement. Those uniform are worn by soldiers."
- icon_state = "SDFhadiisgov_uniform"
+ icon = 'icons/clothing/uniform/workwear/tajaran/SDFhadiisgov.dmi'
+ icon_state = "SDFhadiisgov"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/hadiifolly/officer
name = "Hadii's Folly SDF officer uniform"
desc = "Those modest uniform are made out of corporate prison jumpsuits, and the new uniform of members of the haddi's folley authority governement. Those uniform are worn by officers."
- icon_state = "SDFhadiisgovofficer_uniform"
+ icon = 'icons/clothing/uniform/workwear/tajaran/SDFhadiisgovofficer.dmi'
+ icon_state = "SDFhadiisgovofficer"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
//Check this
/obj/item/clothing/under/tajaran/dpra
name = "al'mariist laborer clothes"
desc = "Clothes commonly used by Das'nrra's workers. Due to their ubiquitousness, they became a symbol of the common Al'mariist people."
+ icon = 'icons/clothing/uniform/workwear/tajaran/dpra_worker.dmi'
icon_state = "dpra_worker"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/dpra/alt
+ icon = 'icons/clothing/uniform/workwear/tajaran/dpra_worker_alt.dmi'
icon_state = "dpra_worker_alt"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
-
-//Missing linings
-/obj/item/clothing/under/tajaran/nka_noble //Has issues
- name = "noble adhomian clothes"
- desc = "Clothes frequently worn by the New Kingdom's nobles. Likely a hand-me-down."
- icon_state = "nka_noble_uniform"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/nka_merchant_navy
name = "his majesty's mercantile flotilla crew uniform"
desc = "An uniform used by the crew of the New Kingdom's merchant space ships. It is clearly inspired by the ones used back on Adhomai."
+ icon = 'icons/clothing/uniform/workwear/tajaran/nka_merchant_navy.dmi'
icon_state = "nka_merchant_navy"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/nka_merchant_navy/alt
+ icon = 'icons/clothing/uniform/workwear/tajaran/nka_merchant_navy_alt.dmi'
icon_state = "nka_merchant_navy_alt"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/nka_merchant_navy/captain
name = "his majesty's mercantile flotilla captain uniform"
desc = "An uniform used by the captain of the New Kingdom's merchant space ships. Not as fancy as the ones used in the Royal Navy."
+ icon = 'icons/clothing/uniform/workwear/tajaran/nka_merchant_captain.dmi'
icon_state = "nka_merchant_captain"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/pvsm
name = "people's volunteer spacer militia uniform"
desc = "A military uniform used by the forces of the People's Volunteer Spacer Militia."
+ icon = 'icons/clothing/uniform/workwear/tajaran/pvsm_crewman.dmi'
icon_state = "pvsm_crewman"
armor_type = /datum/armor/station/padded
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
- worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rollsleeve_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/pvsm/captain
name = "people's volunteer spacer militia captain uniform"
desc = "A military uniform used by the captains of the People's Volunteer Spacer Militia."
+ icon = 'icons/clothing/uniform/workwear/tajaran/pvsm_captain.dmi'
icon_state = "pvsm_captain"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
- worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_rolldown_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
//Should this be here?
/obj/item/clothing/under/tajaran/ala
name = "adhomai liberation army uniform"
desc = "A military uniform issued to soldiers of the adhomai liberation army."
+ icon = 'icons/clothing/uniform/workwear/tajaran/ala-soldier-civ.dmi'
icon_state = "ala-soldier-civ"
armor_type = /datum/armor/station/padded
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/ala/wraps
+ icon = 'icons/clothing/uniform/workwear/tajaran/ala-grunt-wraps.dmi'
icon_state = "ala-grunt-wraps"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/ala/black
+ icon = 'icons/clothing/uniform/workwear/tajaran/ala-soldat.dmi'
icon_state = "ala-soldat"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/ala/black/dress
name = "adhomai liberation army dress uniform"
+ icon = 'icons/clothing/uniform/workwear/tajaran/ala-soldatdress.dmi'
icon_state = "ala-soldatdress"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/ala/black/officer
name = "adhomai liberation army officer uniform"
desc = "A military uniform issued to officers of the adhomai liberation army."
+ icon = 'icons/clothing/uniform/workwear/tajaran/ala-officer.dmi'
icon_state = "ala-officer"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/archeologist
name = "archaeologist uniform"
desc = "A rugged uniform used by Adhomian archaeologists. It is already covered in dirt and ancient dust."
+ icon = 'icons/clothing/uniform/workwear/tajaran/explorer_uniform.dmi'
icon_state = "explorer_uniform"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/army_commissar
name = "army commissar uniform"
desc = "A military uniform used by Party Commissars attached to military units."
+ icon = 'icons/clothing/uniform/workwear/tajaran/pracommisar.dmi'
icon_state = "pracommisar"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
/obj/item/clothing/under/tajaran/psis
name = "people's strategic intelligence service uniform"
desc = "An uniform used by the agents of the People's Strategic Intelligence Service. The sight of this uniform is feared by most Tajara."
+ icon = 'icons/clothing/uniform/workwear/tajaran/psis.dmi'
icon_state = "psis"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
worn_has_rolldown = UNIFORM_HAS_NO_ROLL
worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/teshari_workwear.dm b/code/modules/clothing/under/workwear/teshari_workwear.dm
new file mode 100644
index 00000000000..1ef77d2abc2
--- /dev/null
+++ b/code/modules/clothing/under/workwear/teshari_workwear.dm
@@ -0,0 +1,490 @@
+/**
+ * Teshari workwear clothing
+ */
+
+//Smocks
+/obj/item/clothing/under/teshari/smock/medical
+ name = "small medical uniform"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_smock_medical.dmi'
+ icon_state = "tesh_smock_medical"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/science
+ name = "small research uniform"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_smock_science.dmi'
+ icon_state = "tesh_smock_science"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/security
+ name = "small security uniform"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_smock_security.dmi'
+ icon_state = "tesh_smock_security"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/engine
+ name = "small engineering uniform"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_smock_engine.dmi'
+ icon_state = "tesh_smock_engine"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/rainbow
+ name = "small rainbow smock"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_smock_rainbow.dmi'
+ icon_state = "tesh_smock_rainbow"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/cap
+ name = "small command smock"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_smock_captain.dmi'
+ icon_state = "tesh_smock_captain"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/blackutilitysmock
+ name = "black utility smock"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_blackutility_com.dmi'
+ icon_state = "teshari_blackutility_com"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/greydress
+ name = "small grey dress"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_greydress.dmi'
+ icon_state = "teshari_greydress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/blackutility
+ name = "Teshari utility uniform"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_blackutility.dmi'
+ icon_state = "teshari_blackutility"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/smock/bluegreydress
+ name = "small blue and grey dress"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_bluegreydress.dmi'
+ icon_state = "teshari_bluegreydress"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//Dresses
+
+/obj/item/clothing/under/teshari/dresssmock/command
+ name = "small command dress"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_dress_cap.dmi'
+ icon_state = "tesh_dress_cap"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/dresssmock/science
+ name = "small science dress"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_dress_science.dmi'
+ icon_state = "tesh_dress_science"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/dresssmock/engine
+ name = "small engineering dress"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_dress_engine.dmi'
+ icon_state = "tesh_dress_engine"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/dresssmock/security
+ name = "small security dress"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_dress_security.dmi'
+ icon_state = "tesh_dress_security"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/dresssmock/medical
+ name = "small medical dress"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_dress_medical.dmi'
+ icon_state = "tesh_dress_medical"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+// Worksuits
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/
+ name = "small black and red worksuit"
+ desc = "A small worksuit designed for a Teshari"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_black_red_worksuit.dmi'
+ icon_state = "teshari_black_red_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackpurple
+ name = "small black and purple worksuit"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_black_purple_worksuit.dmi'
+ icon_state = "teshari_black_purple_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackorange
+ name = "small black and orange worksuit"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_black_orange_worksuit.dmi'
+ icon_state = "teshari_black_orange_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackblue
+ name = "small black and blue worksuit"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_black_blue_worksuit.dmi'
+ icon_state = "teshari_black_blue_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackgreen
+ name = "small black and greeen worksuit"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_black_green_worksuit.dmi'
+ icon_state = "teshari_black_green_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitered
+ name = "small white and red worksuit"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_white_red_worksuit.dmi'
+ icon_state = "teshari_white_red_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitepurple
+ name = "small white and purple worksuit"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_white_purple_worksuit.dmi'
+ icon_state = "teshari_white_purple_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteorange
+ name = "small white and orange worksuit"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_white_orange_worksuit.dmi'
+ icon_state = "teshari_white_orange_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteblue
+ name = "small white and blue worksuit"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_white_blue_worksuit.dmi'
+ icon_state = "teshari_white_blue_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitegreen
+ name = "small white and green worksuit"
+ icon = 'icons/clothing/uniform/workwear/teshari/teshari_white_green_worksuit.dmi'
+ icon_state = "teshari_white_green_worksuit"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+//Job Undercoats
+/obj/item/clothing/under/teshari/undercoat/jobs/cap
+ name = "facility director undercoat"
+ desc = "A traditional Teshari garb made for the Facility Director"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_cap.dmi'
+ icon_state = "tesh_uniform_cap"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/hop
+ name = "head of personnel undercoat"
+ desc = "A traditional Teshari garb made for the Head of Personnel"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_hop.dmi'
+ icon_state = "tesh_uniform_hop"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/ce
+ name = "chief engineer undercoat"
+ desc = "A traditional Teshari garb made for the Chief Engineer"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_ce.dmi'
+ icon_state = "tesh_uniform_ce"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/hos
+ name = "head of security undercoat"
+ desc = "A traditional Teshari garb made for the Head of Security"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_hos.dmi'
+ icon_state = "tesh_uniform_hos"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/rd
+ name = "research director undercoat"
+ desc = "A traditional Teshari garb made for the Research Director"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_rd.dmi'
+ icon_state = "tesh_uniform_rd"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/engineer
+ name = "engineering undercoat"
+ desc = "A traditional Teshari garb made for the Engineering department"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_engie.dmi'
+ icon_state = "tesh_uniform_engie"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/atmos
+ name = "atmospherics undercoat"
+ desc = "A traditional Teshari garb made for the Atmospheric Technician"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_atmos.dmi'
+ icon_state = "tesh_uniform_atmos"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/cmo
+ name = "chief medical officer undercoat"
+ desc = "A traditional Teshari garb made for the Cheif Medical Officer"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_cmo.dmi'
+ icon_state = "tesh_uniform_cmo"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/qm
+ name = "quartermaster undercoat"
+ desc = "A traditional Teshari garb made for the Quartermaster"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_qm.dmi'
+ icon_state = "tesh_uniform_qm"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/cargo
+ name = "cargo undercoat"
+ desc = "A traditional Teshari garb made for the Cargo department"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_car.dmi'
+ icon_state = "tesh_uniform_car"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/mining
+ name = "mining undercoat"
+ desc = "A traditional Teshari garb made for Mining"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_mine.dmi'
+ icon_state = "tesh_uniform_mine"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/medical
+ name = "medical undercoat"
+ desc = "A traditional Teshari garb made for the Medical department"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_doc.dmi'
+ icon_state = "tesh_uniform_doc"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/chemistry
+ name = "chemist undercoat"
+ desc = "A traditional Teshari garb made for the Chemist"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_chem.dmi'
+ icon_state = "tesh_uniform_chem"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/viro
+ name = "virologist undercoat"
+ desc = "A traditional Teshari garb made for the Virologist"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_viro.dmi'
+ icon_state = "tesh_uniform_viro"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/psych
+ name = "psychiatrist undercoat"
+ desc = "A traditional Teshari garb made for the Psychiatrist"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_psych.dmi'
+ icon_state = "tesh_uniform_psych"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/para
+ name = "paramedic undercoat"
+ desc = "A traditional Teshari garb made for the Paramedic"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_para.dmi'
+ icon_state = "tesh_uniform_para"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/sci
+ name = "scientist undercoat"
+ desc = "A traditional Teshari garb made for the Science department"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_sci.dmi'
+ icon_state = "tesh_uniform_sci"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/robo
+ name = "roboticist undercoat"
+ desc = "A traditional Teshari garb made for the Roboticist"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_robo.dmi'
+ icon_state = "tesh_uniform_robo"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/sec
+ name = "security undercoat"
+ desc = "A traditional Teshari garb made for the Security department"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_sec.dmi'
+ icon_state = "tesh_uniform_sec"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/service
+ name = "service undercoat"
+ desc = "A traditional Teshari garb made for the Service department"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_serv.dmi'
+ icon_state = "tesh_uniform_serv"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/teshari/undercoat/jobs/iaa
+ name = "internal affairs undercoat"
+ desc = "A traditional Teshari garb made for the Internal Affairs Agent"
+ icon = 'icons/clothing/uniform/workwear/teshari/tesh_uniform_iaa.dmi'
+ icon_state = "tesh_uniform_iaa"
+ worn_bodytypes = BODYTYPES(BODYTYPE_TESHARI)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/workwear/vox_pressuresuit.dm b/code/modules/clothing/under/workwear/vox_pressuresuit.dm
new file mode 100644
index 00000000000..b2a6c24355e
--- /dev/null
+++ b/code/modules/clothing/under/workwear/vox_pressuresuit.dm
@@ -0,0 +1,136 @@
+/**
+ * Vox Pressure Suits
+ */
+
+/obj/item/clothing/under/pressuresuit
+ name = "vox pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame. Now in classic grey!"
+ inv_hide_flags = HIDEGLOVES|HIDESHOES
+ body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ atom_flags = PHORONGUARD
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivassistant
+ name = "assistant pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame. Now in classic grey!"
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-assistant.dmi'
+ icon_state = "vox-civ-assistant"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivbartender
+ name = "bartender pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame. Sylish black, complete with a little bowtie."
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-bartender.dmi'
+ icon_state = "vox-civ-bartender"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivchef
+ name = "chef pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame. Comes with an integrated apron!"
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-chef.dmi'
+ icon_state = "vox-civ-chef"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivchaplain
+ name = "chaplain pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame. Religious advice from a Vox should be taken with several grains of salt."
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-chaplain.dmi'
+ icon_state = "vox-civ-chaplain"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivlibrarian
+ name = "librarian pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame. More stylish than others. Don't eat the books."
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-librarian.dmi'
+ icon_state = "vox-civ-librarian"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivsecurity
+ name = "ecurity pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame."
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-security.dmi'
+ icon_state = "vox-civ-security"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivmedical
+ name = "medical pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame."
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-medical.dmi'
+ icon_state = "vox-civ-medical"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivengineer
+ name = "engineer pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame."
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-engineer.dmi'
+ icon_state = "vox-civ-engineer"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivscience
+ name = "scientist pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame."
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-science.dmi'
+ icon_state = "vox-civ-science"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivrd
+ name = "research director pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame."
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-rd.dmi'
+ icon_state = "vox-civ-rd"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
+
+/obj/item/clothing/under/pressuresuit/voxcivce
+ name = "chief engineer pressure suit"
+ desc = "A lightly-plated jumpsuit, fitted to an alien frame."
+ icon = 'icons/clothing/uniform/workwear/pressuresuit/vox-civ-ce.dmi'
+ icon_state = "vox-civ-ce"
+ worn_bodytypes = BODYTYPES(BODYTYPE_VOX)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
+ inhand_icon = 'icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi'
+ inhand_state = "grey"
diff --git a/code/modules/clothing/under/xenos/teshari.dm b/code/modules/clothing/under/xenos/teshari.dm
deleted file mode 100644
index a1b130097ef..00000000000
--- a/code/modules/clothing/under/xenos/teshari.dm
+++ /dev/null
@@ -1,405 +0,0 @@
-//Smocks
-/obj/item/clothing/under/teshari
- icon = 'icons/obj/clothing/species/teshari/uniform.dmi'
- icon_state = "tesh_smock_grey"
- species_restricted = list(SPECIES_TESHARI)
-
-/obj/item/clothing/under/teshari/smock
- name = "small grey smock"
- desc = "It looks fitted to nonhuman proportions."
- icon_state = "tesh_smock_grey"
- body_cover_flags = 0 // It's a thin piece of cloth with a neck hole.
-
-/obj/item/clothing/under/teshari/smock/red
- name = "small red smock"
- icon_state = "tesh_smock_red"
-
-/obj/item/clothing/under/teshari/smock/yellow
- name = "small yellow smock"
- icon_state = "tesh_smock_yellow"
-
-/obj/item/clothing/under/teshari/smock/white
- name = "small white smock"
- icon_state = "tesh_smock_white"
-
-/obj/item/clothing/under/teshari/smock/medical
- name = "small medical uniform"
- icon_state = "tesh_smock_medical"
-
-/obj/item/clothing/under/teshari/smock/science
- name = "small research uniform"
- icon_state = "tesh_smock_science"
-
-/obj/item/clothing/under/teshari/smock/security
- name = "small security uniform"
- icon_state = "tesh_smock_security"
-
-/obj/item/clothing/under/teshari/smock/engine
- name = "small engineering uniform"
- icon_state = "tesh_smock_engine"
-
-/obj/item/clothing/under/teshari/smock/rainbow
- name = "small rainbow smock"
- icon_state = "tesh_smock_rainbow"
-
-/obj/item/clothing/under/teshari/smock/cap
- name = "small command smock"
- icon_state = "tesh_smock_captain"
-
-/obj/item/clothing/under/teshari/smock/blackutilitysmock
- name = "black utility smock"
- icon_state = "teshari_blackutility_com"
-
-/obj/item/clothing/under/teshari/smock/greydress
- name = "small grey dress"
- icon_state = "teshari_greydress"
-
-/obj/item/clothing/under/teshari/smock/blackutility
- name = "Teshari utility uniform"
- icon_state = "teshari_blackutility"
-
-/obj/item/clothing/under/teshari/smock/bluegreydress
- name = "small blue and grey dress"
- icon_state = "teshari_bluegreydress"
-
-//Dresses
-
-/obj/item/clothing/under/teshari/dresssmock/command
- name = "small command dress"
- icon = 'icons/obj/clothing/species/teshari/uniform.dmi'
- icon_override = 'icons/mob/clothing/species/teshari/teshari_uniform.dmi'
- icon_state = "tesh_dress_cap"
- item_state = "tesh_dress_cap"
-
-/obj/item/clothing/under/teshari/dresssmock/science
- name = "small science dress"
- icon_state = "tesh_dress_science"
- item_state = "tesh_dress_science"
-
-/obj/item/clothing/under/teshari/dresssmock/engine
- name = "small engineering dress"
- icon_state = "tesh_dress_engine"
- item_state = "tesh_dress_engine"
-
-/obj/item/clothing/under/teshari/dresssmock/security
- name = "small security dress"
- icon_state = "tesh_dress_security"
- item_state = "tesh_dress_security"
-
-/obj/item/clothing/under/teshari/dresssmock/medical
- name = "small medical dress"
- icon_state = "tesh_dress_medical"
- item_state = "tesh_dress_medical"
-
-// Worksuits
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/
- name = "small black and red worksuit"
- icon_state = "teshari_black_red_worksuit"
- item_state = "teshari_black_red_worksuit"
- desc = "A small worksuit designed for a Teshari"
-
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackpurple
- name = "small black and purple worksuit"
- icon_state = "teshari_black_purple_worksuit"
- item_state = "teshari_black_purple_worksuit"
-
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackorange
- name = "small black and orange worksuit"
- icon_state = "teshari_black_orange_worksuit"
- item_state = "teshari_black_orange_worksuit"
-
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackblue
- name = "small black and blue worksuit"
- icon_state = "teshari_black_blue_worksuit"
- item_state = "teshari_black_blue_worksuit"
-
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackgreen
- name = "small black and greeen worksuit"
- icon_state = "teshari_black_green_worksuit"
- item_state = "teshari_black_green_worksuit"
-
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitered
- name = "small white and red worksuit"
- icon_state = "teshari_white_red_worksuit"
- item_state = "teshari_white_red_worksuit"
-
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitepurple
- name = "small white and purple worksuit"
- icon_state = "teshari_white_purple_worksuit"
- item_state = "teshari_white_purple_worksuit"
-
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteorange
- name = "small white and orange worksuit"
- icon_state = "teshari_white_orange_worksuit"
- item_state = "teshari_white_orange_worksuit"
-
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteblue
- name = "small white and blue worksuit"
- icon_state = "teshari_white_blue_worksuit"
- item_state = "teshari_white_blue_worksuit"
-
-/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitegreen
- name = "small white and green worksuit"
- icon_state = "teshari_white_green_worksuit"
- item_state = "teshari_white_green_worksuit"
-
-
-
-
-//Standard Undercoats
-
-/obj/item/clothing/under/teshari/undercoat
- name = "Undercoat"
- desc = "A Teshari traditional garb, with a modern twist! Made of micro and nanofibres to make it light and billowy, perfect for going fast and stylishly!"
- icon = 'icons/mob/clothing/species/teshari/teshari_uniform.dmi'
- icon_override = 'icons/mob/clothing/species/teshari/teshari_uniform.dmi'
- icon_state = "tesh_uniform_bo"
- item_state = "tesh_uniform_bo"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_orange
- name = "black and orange undercoat"
- icon_state = "tesh_uniform_bo"
- item_state = "tesh_uniform_bo"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_grey
- name = "black and grey undercoat"
- icon_state = "tesh_uniform_bg"
- item_state = "tesh_uniform_bg"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_white
- name = "black and white undercoat"
- icon_state = "tesh_uniform_bw"
- item_state = "tesh_uniform_bw"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_red
- name = "black and red undercoat"
- icon_state = "tesh_uniform_br"
- item_state = "tesh_uniform_br"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black
- name = "black undercoat"
- icon_state = "tesh_uniform_bn"
- item_state = "tesh_uniform_bn"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_yellow
- name = "black and yellow undercoat"
- icon_state = "tesh_uniform_by"
- item_state = "tesh_uniform_by"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_green
- name = "black and green undercoat"
- icon_state = "tesh_uniform_bgr"
- item_state = "tesh_uniform_bgr"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_blue
- name = "black and blue undercoat"
- icon_state = "tesh_uniform_bbl"
- item_state = "tesh_uniform_bbl"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_purple
- name = "black and purple undercoat"
- icon_state = "tesh_uniform_bp"
- item_state = "tesh_uniform_bp"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_pink
- name = "black and pink undercoat"
- icon_state = "tesh_uniform_bpi"
- item_state = "tesh_uniform_bpi"
-
-/obj/item/clothing/under/teshari/undercoat/standard/black_brown
- name = "black and brown undercoat"
- icon_state = "tesh_uniform_bbr"
- item_state = "tesh_uniform_bbr"
-
-/obj/item/clothing/under/teshari/undercoat/standard/orange_grey
- name = "orange and grey undercoat"
- icon_state = "tesh_uniform_og"
- item_state = "tesh_uniform_og"
-
-/obj/item/clothing/under/teshari/undercoat/standard/rainbow
- name = "rainbow undercoat"
- icon_state = "tesh_uniform_rainbow"
- item_state = "tesh_uniform_rainbow"
-
-/obj/item/clothing/under/teshari/undercoat/standard/lightgrey_grey
- name = "light grey and grey undercoat"
- icon_state = "tesh_uniform_lgg"
- item_state = "tesh_uniform_lgg"
-
-/obj/item/clothing/under/teshari/undercoat/standard/white_grey
- name = "white and grey undercoat"
- icon_state = "tesh_uniform_wg"
- item_state = "tesh_uniform_wg"
-
-/obj/item/clothing/under/teshari/undercoat/standard/red_grey
- name = "red and grey undercoat"
- icon_state = "tesh_uniform_rg"
- item_state = "tesh_uniform_rg"
-
-/obj/item/clothing/under/teshari/undercoat/standard/orange
- name = "orange undercoat"
- icon_state = "tesh_uniform_on"
- item_state = "tesh_uniform_on"
-
-/obj/item/clothing/under/teshari/undercoat/standard/yellow_grey
- name = "yellow and grey undercoat"
- icon_state = "tesh_uniform_yg"
- item_state = "tesh_uniform_yg"
-
-/obj/item/clothing/under/teshari/undercoat/standard/green_grey
- name = "green and grey undercoat"
- icon_state = "tesh_uniform_gg"
- item_state = "tesh_uniform_gg"
-
-/obj/item/clothing/under/teshari/undercoat/standard/blue_grey
- name = "blue and grey undercoat"
- icon_state = "tesh_uniform_blug"
- item_state = "tesh_uniform_blug"
-
-/obj/item/clothing/under/teshari/undercoat/standard/purple_grey
- name = "purple and grey undercoat"
- icon_state = "tesh_uniform_pg"
- item_state = "tesh_uniform_pg"
-
-/obj/item/clothing/under/teshari/undercoat/standard/pink_grey
- name = "pink and grey undercoat"
- icon_state = "tesh_uniform_pig"
- item_state = "tesh_uniform_pig"
-
-/obj/item/clothing/under/teshari/undercoat/standard/brown_grey
- name = "brown and grey undercoat"
- icon_state = "tesh_uniform_brg"
- item_state = "tesh_uniform_brg"
-
-//Job Undercoats
-
-/obj/item/clothing/under/teshari/undercoat/jobs/
- icon = 'icons/mob/clothing/species/teshari/deptjacket.dmi'
- icon_override = 'icons/mob/clothing/species/teshari/deptjacket.dmi'
-
-/obj/item/clothing/under/teshari/undercoat/jobs/cap
- name = "facility director undercoat"
- desc = "A traditional Teshari garb made for the Facility Director"
- icon_state = "tesh_uniform_cap"
- item_state = "tesh_uniform_cap"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/hop
- name = "head of personnel undercoat"
- desc = "A traditional Teshari garb made for the Head of Personnel"
- icon_state = "tesh_uniform_hop"
- item_state = "tesh_uniform_hop"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/ce
- name = "chief engineer undercoat"
- desc = "A traditional Teshari garb made for the Chief Engineer"
- icon_state = "tesh_uniform_ce"
- item_state = "tesh_uniform_ce"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/hos
- name = "head of security undercoat"
- desc = "A traditional Teshari garb made for the Head of Security"
- icon_state = "tesh_uniform_hos"
- item_state = "tesh_uniform_hos"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/rd
- name = "research director undercoat"
- desc = "A traditional Teshari garb made for the Research Director"
- icon_state = "tesh_uniform_rd"
- item_state = "tesh_uniform_rd"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/engineer
- name = "engineering undercoat"
- desc = "A traditional Teshari garb made for the Engineering department"
- icon_state = "tesh_uniform_engie"
- item_state = "tesh_uniform_engie"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/atmos
- name = "atmospherics undercoat"
- desc = "A traditional Teshari garb made for the Atmospheric Technician"
- icon_state = "tesh_uniform_atmos"
- item_state = "tesh_uniform_atmos"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/cmo
- name = "chief medical officer undercoat"
- desc = "A traditional Teshari garb made for the Cheif Medical Officer"
- icon_state = "tesh_uniform_cmo"
- item_state = "tesh_uniform_cmo"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/qm
- name = "quartermaster undercoat"
- desc = "A traditional Teshari garb made for the Quartermaster"
- icon_state = "tesh_uniform_qm"
- item_state = "tesh_uniform_qm"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/cargo
- name = "cargo undercoat"
- desc = "A traditional Teshari garb made for the Cargo department"
- icon_state = "tesh_uniform_car"
- item_state = "tesh_uniform_car"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/mining
- name = "mining undercoat"
- desc = "A traditional Teshari garb made for Mining"
- icon_state = "tesh_uniform_mine"
- item_state = "tesh_uniform_mine"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/medical
- name = "medical undercoat"
- desc = "A traditional Teshari garb made for the Medical department"
- icon_state = "tesh_uniform_doc"
- item_state = "tesh_uniform_doc"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/chemistry
- name = "chemist undercoat"
- desc = "A traditional Teshari garb made for the Chemist"
- icon_state = "tesh_uniform_chem"
- item_state = "tesh_uniform_chem"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/viro
- name = "virologist undercoat"
- desc = "A traditional Teshari garb made for the Virologist"
- icon_state = "tesh_uniform_viro"
- item_state = "tesh_uniform_viro"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/psych
- name = "psychiatrist undercoat"
- desc = "A traditional Teshari garb made for the Psychiatrist"
- icon_state = "tesh_uniform_psych"
- item_state = "tesh_uniform_psych"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/para
- name = "paramedic undercoat"
- desc = "A traditional Teshari garb made for the Paramedic"
- icon_state = "tesh_uniform_para"
- item_state = "tesh_uniform_para"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/sci
- name = "scientist undercoat"
- desc = "A traditional Teshari garb made for the Science department"
- icon_state = "tesh_uniform_sci"
- item_state = "tesh_uniform_sci"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/robo
- name = "roboticist undercoat"
- desc = "A traditional Teshari garb made for the Roboticist"
- icon_state = "tesh_uniform_robo"
- item_state = "tesh_uniform_robo"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/sec
- name = "security undercoat"
- desc = "A traditional Teshari garb made for the Security department"
- icon_state = "tesh_uniform_sec"
- item_state = "tesh_uniform_sec"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/service
- name = "service undercoat"
- desc = "A traditional Teshari garb made for the Service department"
- icon_state = "tesh_uniform_serv"
- item_state = "tesh_uniform_serv"
-
-/obj/item/clothing/under/teshari/undercoat/jobs/iaa
- name = "internal affairs undercoat"
- desc = "A traditional Teshari garb made for the Internal Affairs Agent"
- icon_state = "tesh_uniform_iaa"
- item_state = "tesh_uniform_iaa"
diff --git a/code/modules/clothing/under/xenos/vox.dm b/code/modules/clothing/under/xenos/vox.dm
deleted file mode 100644
index 571432ffbd3..00000000000
--- a/code/modules/clothing/under/xenos/vox.dm
+++ /dev/null
@@ -1,113 +0,0 @@
-/obj/item/clothing/under/vox
- has_sensors = UNIFORM_HAS_NO_SENSORS
- species_restricted = list(SPECIES_VOX)
- starting_accessories = list(/obj/item/clothing/accessory/storage/vox) // Dont' start with a backback, so free webbing
- atom_flags = PHORONGUARD
-
-/obj/item/clothing/under/vox/vox_casual
- name = "alien clothing"
- desc = "This doesn't look very comfortable."
- icon_state = "vox-casual-1"
- item_state = "vox-casual-1"
- body_cover_flags = LEGS
-
-/obj/item/clothing/under/vox/vox_robes
- name = "alien robes"
- desc = "Weird and flowing!"
- icon_state = "vox-casual-2"
- item_state = "vox-casual-2"
-
-/obj/item/clothing/under/vox/simonpants
- name = "simon pants"
- desc = "Based off the clothing of a hero so famous, even the Vox had to emulate his style."
- icon_state = "simonpants"
- item_state = "simonpants"
-
-//Vox Accessories
-/obj/item/clothing/accessory/storage/vox
- name = "alien mesh"
- desc = "An alien mesh. Seems to be made up mostly of pockets and writhing flesh."
- icon_state = "webbing-vox"
-
- atom_flags = PHORONGUARD
-
- max_items = 3
- max_combined_volume = 3 * WEIGHT_VOLUME_NORMAL
- max_single_weight_class = WEIGHT_CLASS_NORMAL
-
-//Vox Pressure Suits
-/obj/item/clothing/under/pressuresuit
- species_restricted = list(SPECIES_VOX)
- name = "vox pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame. Now in classic grey!"
- icon = 'icons/obj/clothing/uniforms.dmi'
- icon_override = 'icons/mob/clothing/species/vox/uniform.dmi'
- inv_hide_flags = HIDEGLOVES|HIDESHOES
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- atom_flags = PHORONGUARD
-
-/obj/item/clothing/under/pressuresuit/voxcivassistant
- name = "assistant pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame. Now in classic grey!"
- icon_state = "vox-civ-assistant"
- item_state = "vox-civ-assistant"
-
-/obj/item/clothing/under/pressuresuit/voxcivbartender
- name = "bartender pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame. Sylish black, complete with a little bowtie."
- icon_state = "vox-civ-bartender"
- item_state = "vox-civ-bartender"
-
-/obj/item/clothing/under/pressuresuit/voxcivchef
- name = "chef pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame. Comes with an integrated apron!"
- icon_state = "vox-civ-chef"
- item_state = "vox-civ-chef"
-
-/obj/item/clothing/under/pressuresuit/voxcivchaplain
- name = "chaplain pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame. Religious advice from a Vox should be taken with several grains of salt."
- icon_state = "vox-civ-chaplain"
- item_state = "vox-civ-chaplain"
-
-/obj/item/clothing/under/pressuresuit/voxcivlibrarian
- name = "librarian pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame. More stylish than others. Don't eat the books."
- icon_state = "vox-civ-librarian"
- item_state = "vox-civ-librarian"
-
-/obj/item/clothing/under/pressuresuit/voxcivsecurity
- name = "ecurity pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame."
- icon_state = "vox-civ-security"
- item_state = "vox-civ-security"
-
-/obj/item/clothing/under/pressuresuit/voxcivmedical
- name = "medical pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame."
- icon_state = "vox-civ-medical"
- item_state = "vox-civ-medical"
-
-/obj/item/clothing/under/pressuresuit/voxcivengineer
- name = "engineer pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame."
- icon_state = "vox-civ-engineer"
- item_state = "vox-civ-engineer"
-
-/obj/item/clothing/under/pressuresuit/voxcivscience
- name = "scientist pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame."
- icon_state = "vox-civ-science"
- item_state = "vox-civ-science"
-
-/obj/item/clothing/under/pressuresuit/voxcivrd
- name = "research director pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame."
- icon_state = "vox-civ-rd"
- item_state = "vox-civ-rd"
-
-/obj/item/clothing/under/pressuresuit/voxcivce
- name = "chief engineer pressure suit"
- desc = "A lightly-plated jumpsuit, fitted to an alien frame."
- icon_state = "vox-civ-ce"
- item_state = "vox-civ-ce"
diff --git a/code/modules/holidays/halloween_loadout_masquarade.dm b/code/modules/holidays/halloween_loadout_masquarade.dm
index 81970e6bb5e..4eafa86b5db 100644
--- a/code/modules/holidays/halloween_loadout_masquarade.dm
+++ b/code/modules/holidays/halloween_loadout_masquarade.dm
@@ -49,11 +49,11 @@
STD_DEF("cloth uniform")
icon_state = "under"
icon = 'icons/antagonists/syndicate/items/clothing/sneaksuit.dmi'
- inhand_default_type = INHAND_DEFAULT_ICON_UNIFORMS
- inhand_state = "black"
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT
body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
cold_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/datum/loadout_entry/seasonal/masquarade/syndicate/sneaksuit_armor
display_name = "Sneaksuit Armor"
diff --git a/code/modules/integrated_electronics/core/assemblies/clothing.dm b/code/modules/integrated_electronics/core/assemblies/clothing.dm
index 91f80ee4aba..0ebe919e706 100644
--- a/code/modules/integrated_electronics/core/assemblies/clothing.dm
+++ b/code/modules/integrated_electronics/core/assemblies/clothing.dm
@@ -112,9 +112,12 @@
/obj/item/clothing/under/circuitry
name = "electronic jumpsuit"
desc = "It's a wearable case for electronics. This one is a black jumpsuit with wiring woven into the fabric."
+ icon = 'icons/clothing/uniform/workwear/circuitry.dmi'
icon_state = "circuitry"
- snowflake_worn_state = "circuitry"
EA_Installed = 1
+ worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/obj/item/clothing/under/circuitry/Initialize(mapload)
setup_integrated_circuit(/obj/item/electronic_assembly/clothing)
diff --git a/code/modules/loadout/loadout_uniform.dm b/code/modules/loadout/loadout_uniform.dm
index 948ae633737..8b47a1d6a1b 100644
--- a/code/modules/loadout/loadout_uniform.dm
+++ b/code/modules/loadout/loadout_uniform.dm
@@ -420,19 +420,19 @@
/datum/loadout_entry/uniform/pyjamas_red
name = "Pyjamas - Red"
- path = /obj/item/clothing/under/redpyjamas
+ path = /obj/item/clothing/under/pj/red
/datum/loadout_entry/uniform/pyjamas_blue
name = "Pyjamas - Blue"
- path = /obj/item/clothing/under/bluepyjamas
+ path = /obj/item/clothing/under/pj/blue
/datum/loadout_entry/uniform/pyjamas_red_fem
name = "Pyjamas - Red - Female"
- path = /obj/item/clothing/under/redpyjamas_fem
+ path = /obj/item/clothing/under/pj/red_fem
/datum/loadout_entry/uniform/pyjamas_blue_fem
name = "Pyjamas - Blue - Female"
- path = /obj/item/clothing/under/bluepyjamas_fem
+ path = /obj/item/clothing/under/pj/blue_fem
/datum/loadout_entry/uniform/wrappedcoat
name = "Modern Wrapped Coat"
diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm
index 1e180ff1924..032428c9189 100644
--- a/code/modules/mob/living/carbon/human/npcs.dm
+++ b/code/modules/mob/living/carbon/human/npcs.dm
@@ -1,9 +1,12 @@
/obj/item/clothing/under/punpun
name = "fancy uniform"
desc = "It looks like it was tailored for a monkey."
+ icon = 'icons/clothing/uniform/workwear/service/punpun.dmi'
icon_state = "punpun"
- snowflake_worn_state = "punpun"
species_restricted = list(SPECIES_MONKEY)
+ worn_bodytypes = BODYTYPES(BODYTYPES_ALL)
+ worn_has_rolldown = UNIFORM_HAS_NO_ROLL
+ worn_has_rollsleeve = UNIFORM_HAS_NO_ROLL
/mob/living/carbon/human/monkey/punpun/Initialize(mapload)
. = ..()
diff --git a/code/modules/vore/fluffstuff/custom_clothes.dm b/code/modules/vore/fluffstuff/custom_clothes.dm
index 608add366e0..78e8f9edd64 100644
--- a/code/modules/vore/fluffstuff/custom_clothes.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes.dm
@@ -41,19 +41,6 @@
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_override = 'icons/vore/custom_onmob_vr.dmi'
-//Natje: Awen Henry
-/obj/item/clothing/under/fluff/wolfgirl
- name = "Wolfgirl Clothes"
- desc = "A set of clothes almost identical to those Wolf Girls always wear..."
-
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_state = "wolfgirluni"
- snowflake_worn_state = "wolfgirluni_mob"
-
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- item_state = "wolfgirluni_mob"
- body_cover_flags = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-
//! ## For general use
/obj/item/clothing/accessory/fluff/smilepin
name = "Smiley Pin"
@@ -219,113 +206,6 @@
desc = "Ankle coverings for digitigrade creatures. Blue!"
icon_state = "bluecuffs"
-/obj/item/clothing/under/swimsuit/fluff/
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- siemens_coefficient = 1
-
-/obj/item/clothing/under/swimsuit/fluff/engineering
- name = "Engineering Swimsuit"
- desc = "It's an orange high visibility swimsuit worn by engineers. It lacks radiation, or any, shielding."
- icon_state = "swimsuit_engineering"
- item_state = "swimsuit_engineering_mob"
-
-/obj/item/clothing/under/swimsuit/fluff/science
- name = "Science Swimsuit"
- desc = "It's made of a special fiber that provides no protection whatsoever, but its hydrophobic. It has markings that denote the wearer as a scientist."
- icon_state = "swimsuit_science"
- item_state = "swimsuit_science_mob"
-
-/obj/item/clothing/under/swimsuit/fluff/security
- name = "Security Swimsuit"
- desc = "It's made of a slightly sturdier material than standard swimsuits, to allow for a more robust appearance."
- icon_state = "swimsuit_security"
- item_state = "swimsuit_security_mob"
-
-/obj/item/clothing/under/swimsuit/fluff/medical
- name = "Medical Swimsuit"
- desc = "It's made of a special fiber that provides no protection whatsoever, but its elastic. It has a cross on the back denoting that the wearer is trained medical personnel."
- icon_state = "swimsuit_medical"
- item_state = "swimsuit_medical_mob"
-
-/obj/item/clothing/under/rank/trek
- name = "Section 31 Uniform"
- desc = "Oooh... right."
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- item_state = ""
-
-//TOS
-/obj/item/clothing/under/rank/trek/command
- name = "Command Uniform"
- desc = "The uniform worn by command officers in the mid 2260s."
- icon_state = "trek_command"
- item_state = "trek_command"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/trek/engsec
- name = "Operations Uniform"
- desc = "The uniform worn by operations officers of the mid 2260s. You feel strangely vulnerable just seeing this..."
- icon_state = "trek_engsec"
- item_state = "trek_engsec"
- armor_type = /datum/armor/station/padded
-
-/obj/item/clothing/under/rank/trek/medsci
- name = "MedSci Uniform"
- desc = "The uniform worn by medsci officers in the mid 2260s."
- icon_state = "trek_medsci"
- item_state = "trek_medsci"
- permeability_coefficient = 0.50
- armor_type = /datum/armor/medical/jumpsuit
-
-//TNG
-/obj/item/clothing/under/rank/trek/command/next
- desc = "The uniform worn by command officers. This one's from the mid 2360s."
- icon_state = "trek_next_command"
- item_state = "trek_next_command"
-
-/obj/item/clothing/under/rank/trek/engsec/next
- desc = "The uniform worn by operation officers. This one's from the mid 2360s."
- icon_state = "trek_next_engsec"
- item_state = "trek_next_engsec"
-
-/obj/item/clothing/under/rank/trek/medsci/next
- desc = "The uniform worn by medsci officers. This one's from the mid 2360s."
- icon_state = "trek_next_medsci"
- item_state = "trek_next_medsci"
-
-//ENT
-/obj/item/clothing/under/rank/trek/command/ent
- desc = "The uniform worn by command officers of the 2140s."
- icon_state = "trek_ent_command"
- item_state = "trek_ent_command"
-
-/obj/item/clothing/under/rank/trek/engsec/ent
- desc = "The uniform worn by operations officers of the 2140s."
- icon_state = "trek_ent_engsec"
- item_state = "trek_ent_engsec"
-
-/obj/item/clothing/under/rank/trek/medsci/ent
- desc = "The uniform worn by medsci officers of the 2140s."
- icon_state = "trek_ent_medsci"
- item_state = "trek_ent_medsci"
-
-//VOY
-/obj/item/clothing/under/rank/trek/command/voy
- desc = "The uniform worn by command officers of the 2370s."
- icon_state = "trek_voy_command"
- item_state = "trek_voy_command"
-
-/obj/item/clothing/under/rank/trek/engsec/voy
- desc = "The uniform worn by operations officers of the 2370s."
- icon_state = "trek_voy_engsec"
- item_state = "trek_voy_engsec"
-
-/obj/item/clothing/under/rank/trek/medsci/voy
- desc = "The uniform worn by medsci officers of the 2370s."
- icon_state = "trek_voy_medsci"
- item_state = "trek_voy_medsci"
-
//DS9
/obj/item/clothing/suit/storage/trek/ds9
@@ -364,61 +244,7 @@
item_state = "trek_ds9_coat_adm_mob"
armor_type = /datum/armor/security/hos
-
-/obj/item/clothing/under/rank/trek/command/ds9
- desc = "The uniform worn by command officers of the 2380s."
- icon_state = "trek_command"
- item_state = "trek_ds9_command"
-
-/obj/item/clothing/under/rank/trek/command/ds9/equipped(mob/user, slot, flags) // Cit change to take into account weirdness with defines. When put on it forces the correct sprite sheet. However when removed it shows a missing sprite for either uniform or suit depending on if it's the overcoat or uniform. Don't know how to fix
- ..()
- var/mob/living/carbon/human/H = loc
- if(istype(H) && H.w_uniform == src)
- if(H.species.get_species_id() == SPECIES_ID_VOX)
- icon_override = 'icons/mob/clothing/species/vox/uniform.dmi'
- else
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- update_worn_icon()
-
-/obj/item/clothing/under/rank/trek/engsec/ds9
- desc = "The uniform worn by operations officers of the 2380s."
- icon_state = "trek_engsec"
- item_state = "trek_ds9_engsec"
-
-/obj/item/clothing/under/rank/trek/engsec/ds9/equipped(mob/user, slot, flags) // Cit change, ditto
- ..()
- var/mob/living/carbon/human/H = loc
- if(istype(H) && H.w_uniform == src)
- if(H.species.get_species_id() == SPECIES_ID_VOX)
- icon_override = 'icons/mob/clothing/species/vox/uniform.dmi'
- else
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- update_worn_icon()
-
-/obj/item/clothing/under/rank/trek/medsci/ds9
- desc = "The uniform undershit worn by medsci officers of the 2380s."
- icon_state = "trek_medsci"
- item_state = "trek_ds9_medsci"
-
-/obj/item/clothing/under/rank/trek/medsci/ds9/equipped(mob/user, slot, flags) // Cit change, ditto
- ..()
- var/mob/living/carbon/human/H = loc
- if(istype(H) && H.w_uniform == src)
- if(H.species.get_species_id() == SPECIES_ID_VOX)
- icon_override = 'icons/mob/clothing/species/vox/uniform.dmi'
- else
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- update_worn_icon()
-
//For general use maybe
-/obj/item/clothing/under/batter //I guess we're going OFF limits.
- name = "Worn baseball outfit"
- desc = "Purification in progress..."
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- icon_state = "batter"
- item_state = "batter_mob"
-
/obj/item/clothing/suit/storage/hooded/wintercoat/jessie
name = "Handmade Winter Suit"
desc = "A durable, but somewhat ragged lower portion of a snow suit fitted for a wolftaur."
@@ -521,22 +347,6 @@
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "gntop"
-/obj/item/clothing/under/fluff/gnshorts
- name = "GN shorts"
- desc = "Stylish white shorts with pockets, stripes, and even a belt."
- icon = 'icons/vore/custom_items_vr.dmi'
- icon_state = "gnshorts"
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- item_state = "gnshorts"
-
-/obj/item/clothing/under/fluff/v_nanovest
- name = "Varmacorp nanovest"
- desc = "A nifty little vest optimized for nanite contact."
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_state = "nanovest"
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- item_state = "nanovest"
-
//General use
/obj/item/clothing/suit/storage/fluff/loincloth
name = "Loincloth"
@@ -548,30 +358,7 @@
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "loincloth"
-//KotetsuRedwood:Latex Maid Dresses, for everyone to 'enjoy'. :3c
-/obj/item/clothing/under/fluff/latexmaid
- name = "latex maid dress"
- desc = "Squeak! A shiny outfit for cleaning, made by people with dirty minds."
-
- icon = 'icons/clothing/uniform/costume/maid.dmi'
- icon_state = "latex"
- worn_bodytypes = BODYTYPES(BODYTYPE_DEFAULT, BODYTYPE_TESHARI)
- worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
-
- body_cover_flags = UPPER_TORSO|LOWER_TORSO
-
//Aztectornado:Tron inspired Siren outfit
-/obj/item/clothing/under/fluff/siren
- name = "Siren Jumpsuit"
- desc = "An advanced jumpsuit with inlaid neon highlighting, and a port on the back."
- description_fluff = "Unlike other competitor suits, the Ward Takahashi Siren jumpsuit features a whole host of extra sensors for augmented reality use, and features a non-invasive neural sensor/stimulator for a fully immersive experience."
-
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- icon_state = "tronsiren"
- snowflake_worn_state = "tronsiren_mob"
- item_state = "tronsiren_mob"
-
/obj/item/clothing/gloves/fluff/siren
name = "Siren Gloves"
desc = "A set of white and neon blue gloves."
@@ -604,33 +391,6 @@
name = "[signet_name]'s Bone Signet Ring"
desc = "A signet ring belonging to [signet_name], carved from the bones of something long extinct, as a ward against bad luck."
-//General definition for bracer items. No icons.
-/obj/item/clothing/accessory/bracer
- name = "bracer"
- desc = "A bracer."
- icon_state = null
- item_state = null
- icon_override = null
- slot_flags = SLOT_GLOVES | SLOT_TIE
- w_class = WEIGHT_CLASS_SMALL
- slot = ACCESSORY_SLOT_ARMBAND
-
-//AegisOA:Xander Bevin
-//WanderingDeviant:S'thasha Tavakdavi
-/obj/item/clothing/accessory/bracer/fluff/xander_sthasha
- name = "Plasteel Bracer"
- desc = "A sturdy arm-guard of polished plasteel that sports gold trimming, silver tribal-looping etchings, and a single cut diamond set into its side. Attached to one's forearm with a small, magnetic clasp."
- icon = 'icons/vore/custom_items_vr.dmi'
- icon_state = "bracer_xander_sthasha"
- icon_override = 'icons/vore/custom_onmob_vr.dmi'
- item_state = "bracer_xander_sthasha"
-
-/obj/item/clothing/accessory/bracer/fluff/xander_sthasha/digest_act(var/atom/movable/item_storage = null)
- return FALSE
-
-/obj/item/clothing/accessory/bracer/fluff/xander_sthasha/gurgle_contaminate(var/atom/movable/item_storage = null)
- return FALSE
-
//Heroman3003:Lauren Zackson
/obj/item/clothing/accessory/collar/fluff/goldenstring
name = "golden string"
@@ -641,52 +401,3 @@
item_state = "goldenstring"
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_TIE
-
-//Chaoko99: Aika Hisakawa
-/obj/item/clothing/suit/fluff/blue_trimmed_coat
- name = "blue-trimmed greatcoat"
- desc = "A heavy, form-obscuring coat with gilded buttons and azure trim."
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_state = "aika_coat"
-
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- item_state = "aika_coat_mob"
- inv_hide_flags = HIDEJUMPSUIT | HIDETIE
-
- item_icons = list(
- SLOT_ID_LEFT_HAND = 'icons/vore/custom_clothes_vr.dmi',
- SLOT_ID_RIGHT_HAND = 'icons/vore/custom_clothes_vr.dmi',
- )
- item_state_slots = list(SLOT_ID_RIGHT_HAND = "aika_coat_mob_r", SLOT_ID_LEFT_HAND = "aika_coat_mob_l")
-
-//Burrito Justice: Jayda Wilson
-/obj/item/clothing/under/oricon/utility/sysguard/medical/fluff
- desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This is an older issuing of the uniform, with integrated department markings."
-
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
-
- icon_state = "blackutility_med"
- snowflake_worn_state = "blackutility_med"
- item_state = "blackutility_med"
-
- starting_accessories = null
- item_icons = list()
-
-//Vorrarkul: Melanie Farmer
-/obj/item/clothing/under/fluff/slime_skeleton
- name = "Melanie's Skeleton"
- desc = "The skeleton of a promethean, still covered in residual slime. Upon closer inspection, they're not even real bones!"
-
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
-
- icon_state = "melanie_skeleton"
- item_state = "melanie_skeleton_mob"
-
- body_cover_flags = NONE
-
- species_restricted = list("exclude", SPECIES_TESHARI)
-
-/obj/item/clothing/under/fluff/slime_skeleton/digest_act(atom/movable/item_storage = null)
- return FALSE //Indigestible
diff --git a/icons/README.md b/icons/README.md
index 2753c29eb75..3fc1aaa596a 100644
--- a/icons/README.md
+++ b/icons/README.md
@@ -15,7 +15,7 @@ Yes, this currently includes all turfs, mobs, objs, and misc things. Sorry. We'l
- /clothing - general, non-module clothing items placed in here
- /{type} - uniform, head, shoes, suit, etc
- /costumes - vanity costumes like kilts, mime outfits, clown outfits, cueball outfits, etc
- - /formal - formalwear like siuts, dresses, etc
+ - /formal - formalwear like suits, dresses, etc
- /job - basic job uniforms
- /misc - unsorted things
- /rank - "formal" "rank"-wear like flight suits, military/naval, etc
diff --git a/icons/clothing/donator/uniform/chayse.dmi b/icons/clothing/donator/uniform/chayse.dmi
index f1649c512d5..3017aa6e27a 100644
Binary files a/icons/clothing/donator/uniform/chayse.dmi and b/icons/clothing/donator/uniform/chayse.dmi differ
diff --git a/icons/clothing/event/foxmiko.dmi b/icons/clothing/event/foxmiko.dmi
new file mode 100644
index 00000000000..1f48a54d529
Binary files /dev/null and b/icons/clothing/event/foxmiko.dmi differ
diff --git a/icons/clothing/head/aquiline.dmi b/icons/clothing/head/aquiline.dmi
new file mode 100644
index 00000000000..07a040b5168
Binary files /dev/null and b/icons/clothing/head/aquiline.dmi differ
diff --git a/icons/clothing/shoes/tourist.dmi b/icons/clothing/shoes/tourist.dmi
new file mode 100644
index 00000000000..a5c740900f5
Binary files /dev/null and b/icons/clothing/shoes/tourist.dmi differ
diff --git a/icons/clothing/suit/costume/spiral.dmi b/icons/clothing/suit/costume/spiral.dmi
new file mode 100644
index 00000000000..1bf9391c27c
Binary files /dev/null and b/icons/clothing/suit/costume/spiral.dmi differ
diff --git a/icons/clothing/uniform/README.md b/icons/clothing/uniform/README.md
new file mode 100644
index 00000000000..9f122bf7078
--- /dev/null
+++ b/icons/clothing/uniform/README.md
@@ -0,0 +1,10 @@
+# Icons/clothing/uniform
+
+## Hierarchy
+- /icons
+ - /clothing
+ - /uniform - << YOU ARE HERE
+ - /casual - casual clothing like t-shirts, pants, etc. if it does not fit in any of the other categories it likely goes here.
+ - /costumes - vanity costumes like mime outfits, clown outfits, cueball outfits, etc
+ - /formal - formalwear like suits, dresses, fancy clothes etc. If the item is meant to be a uniform for a job put it in workwear
+ - /workwear - Clothing intended to be worn for a job like jumpsuits, uniforms, captain suits, etc. Anything that spawns for a job or on station will likely go here.
diff --git a/icons/clothing/uniform/casual/ascetic.dmi b/icons/clothing/uniform/casual/ascetic.dmi
new file mode 100644
index 00000000000..6600776e3c4
Binary files /dev/null and b/icons/clothing/uniform/casual/ascetic.dmi differ
diff --git a/icons/clothing/uniform/casual/ascetic_fem.dmi b/icons/clothing/uniform/casual/ascetic_fem.dmi
new file mode 100644
index 00000000000..392929c7eb5
Binary files /dev/null and b/icons/clothing/uniform/casual/ascetic_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/bathrobe.dmi b/icons/clothing/uniform/casual/bathrobe.dmi
new file mode 100644
index 00000000000..e9257bf3452
Binary files /dev/null and b/icons/clothing/uniform/casual/bathrobe.dmi differ
diff --git a/icons/clothing/uniform/casual/bluespace.dmi b/icons/clothing/uniform/casual/bluespace.dmi
new file mode 100644
index 00000000000..bfbf5e298d6
Binary files /dev/null and b/icons/clothing/uniform/casual/bluespace.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/baggy_jeans.dmi b/icons/clothing/uniform/casual/jeans/baggy_jeans.dmi
new file mode 100644
index 00000000000..9c5e58b8861
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/baggy_jeans.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/baggy_pants.dmi b/icons/clothing/uniform/casual/jeans/baggy_pants.dmi
new file mode 100644
index 00000000000..deb7af7f6e8
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/baggy_pants.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/blackpants.dmi b/icons/clothing/uniform/casual/jeans/blackpants.dmi
new file mode 100644
index 00000000000..1a32375d925
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/blackpants.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/camopants.dmi b/icons/clothing/uniform/casual/jeans/camopants.dmi
new file mode 100644
index 00000000000..1bece18ed8b
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/camopants.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/chapsb.dmi b/icons/clothing/uniform/casual/jeans/chapsb.dmi
new file mode 100644
index 00000000000..840f83e9d21
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/chapsb.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/chapsbl.dmi b/icons/clothing/uniform/casual/jeans/chapsbl.dmi
new file mode 100644
index 00000000000..5139391eeff
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/chapsbl.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/jeans.dmi b/icons/clothing/uniform/casual/jeans/jeans.dmi
new file mode 100644
index 00000000000..d61bad056fc
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/jeans.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/khaki.dmi b/icons/clothing/uniform/casual/jeans/khaki.dmi
new file mode 100644
index 00000000000..598629d544f
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/khaki.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/redpants.dmi b/icons/clothing/uniform/casual/jeans/redpants.dmi
new file mode 100644
index 00000000000..409719f7fbb
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/redpants.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/tanpants.dmi b/icons/clothing/uniform/casual/jeans/tanpants.dmi
new file mode 100644
index 00000000000..07b31d711cb
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/tanpants.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/trackpants.dmi b/icons/clothing/uniform/casual/jeans/trackpants.dmi
new file mode 100644
index 00000000000..3f609ff6922
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/trackpants.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/whitepants.dmi b/icons/clothing/uniform/casual/jeans/whitepants.dmi
new file mode 100644
index 00000000000..b967a8177f1
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/whitepants.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/workpants.dmi b/icons/clothing/uniform/casual/jeans/workpants.dmi
new file mode 100644
index 00000000000..9831bc959b2
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/workpants.dmi differ
diff --git a/icons/clothing/uniform/casual/jeans/yogapants.dmi b/icons/clothing/uniform/casual/jeans/yogapants.dmi
new file mode 100644
index 00000000000..f96a6afdf5a
Binary files /dev/null and b/icons/clothing/uniform/casual/jeans/yogapants.dmi differ
diff --git a/icons/clothing/uniform/casual/kilt.dmi b/icons/clothing/uniform/casual/kilt.dmi
new file mode 100644
index 00000000000..11841e781c6
Binary files /dev/null and b/icons/clothing/uniform/casual/kilt.dmi differ
diff --git a/icons/clothing/uniform/casual/leotard/bunny_f.dmi b/icons/clothing/uniform/casual/leotard/bunny_f.dmi
new file mode 100644
index 00000000000..943658d7828
Binary files /dev/null and b/icons/clothing/uniform/casual/leotard/bunny_f.dmi differ
diff --git a/icons/clothing/uniform/casual/leotard/bunny_m.dmi b/icons/clothing/uniform/casual/leotard/bunny_m.dmi
new file mode 100644
index 00000000000..8b167d69ae7
Binary files /dev/null and b/icons/clothing/uniform/casual/leotard/bunny_m.dmi differ
diff --git a/icons/clothing/uniform/casual/leotard/leotard.dmi b/icons/clothing/uniform/casual/leotard/leotard.dmi
new file mode 100644
index 00000000000..1df8f897b3e
Binary files /dev/null and b/icons/clothing/uniform/casual/leotard/leotard.dmi differ
diff --git a/icons/clothing/uniform/casual/leotard/leotard_color.dmi b/icons/clothing/uniform/casual/leotard/leotard_color.dmi
new file mode 100644
index 00000000000..66a15d30231
Binary files /dev/null and b/icons/clothing/uniform/casual/leotard/leotard_color.dmi differ
diff --git a/icons/clothing/uniform/casual/leotard/leotard_window.dmi b/icons/clothing/uniform/casual/leotard/leotard_window.dmi
new file mode 100644
index 00000000000..7693a695332
Binary files /dev/null and b/icons/clothing/uniform/casual/leotard/leotard_window.dmi differ
diff --git a/icons/clothing/uniform/casual/lindenoak/asmodai.dmi b/icons/clothing/uniform/casual/lindenoak/asmodai.dmi
new file mode 100644
index 00000000000..7bdf23e3c15
Binary files /dev/null and b/icons/clothing/uniform/casual/lindenoak/asmodai.dmi differ
diff --git a/icons/clothing/uniform/casual/lindenoak/belial.dmi b/icons/clothing/uniform/casual/lindenoak/belial.dmi
new file mode 100644
index 00000000000..a9a7904fb19
Binary files /dev/null and b/icons/clothing/uniform/casual/lindenoak/belial.dmi differ
diff --git a/icons/clothing/uniform/casual/lindenoak/hueyskirt.dmi b/icons/clothing/uniform/casual/lindenoak/hueyskirt.dmi
new file mode 100644
index 00000000000..5e0b9f31656
Binary files /dev/null and b/icons/clothing/uniform/casual/lindenoak/hueyskirt.dmi differ
diff --git a/icons/clothing/uniform/casual/lindenoak/sitri.dmi b/icons/clothing/uniform/casual/lindenoak/sitri.dmi
new file mode 100644
index 00000000000..e83727a37ee
Binary files /dev/null and b/icons/clothing/uniform/casual/lindenoak/sitri.dmi differ
diff --git a/icons/clothing/uniform/casual/loincloth.dmi b/icons/clothing/uniform/casual/loincloth.dmi
new file mode 100644
index 00000000000..f5a85f9d234
Binary files /dev/null and b/icons/clothing/uniform/casual/loincloth.dmi differ
diff --git a/icons/clothing/uniform/casual/moderncoat.dmi b/icons/clothing/uniform/casual/moderncoat.dmi
new file mode 100644
index 00000000000..126f32b18ca
Binary files /dev/null and b/icons/clothing/uniform/casual/moderncoat.dmi differ
diff --git a/icons/clothing/uniform/casual/moth/puffy_pants.dmi b/icons/clothing/uniform/casual/moth/puffy_pants.dmi
new file mode 100644
index 00000000000..e397a63becc
Binary files /dev/null and b/icons/clothing/uniform/casual/moth/puffy_pants.dmi differ
diff --git a/icons/clothing/uniform/casual/moth/skirt.dmi b/icons/clothing/uniform/casual/moth/skirt.dmi
new file mode 100644
index 00000000000..d5ac150f607
Binary files /dev/null and b/icons/clothing/uniform/casual/moth/skirt.dmi differ
diff --git a/icons/clothing/uniform/casual/moth/tight_pants.dmi b/icons/clothing/uniform/casual/moth/tight_pants.dmi
new file mode 100644
index 00000000000..efd4cf22aad
Binary files /dev/null and b/icons/clothing/uniform/casual/moth/tight_pants.dmi differ
diff --git a/icons/clothing/uniform/casual/nanovest.dmi b/icons/clothing/uniform/casual/nanovest.dmi
new file mode 100644
index 00000000000..c997f94466d
Binary files /dev/null and b/icons/clothing/uniform/casual/nanovest.dmi differ
diff --git a/icons/clothing/uniform/casual/psyche.dmi b/icons/clothing/uniform/casual/psyche.dmi
new file mode 100644
index 00000000000..238cf3d81fb
Binary files /dev/null and b/icons/clothing/uniform/casual/psyche.dmi differ
diff --git a/icons/clothing/uniform/casual/rainbow_jumpsuit.dmi b/icons/clothing/uniform/casual/rainbow_jumpsuit.dmi
new file mode 100644
index 00000000000..6622414dcaf
Binary files /dev/null and b/icons/clothing/uniform/casual/rainbow_jumpsuit.dmi differ
diff --git a/icons/clothing/uniform/casual/rainbow_skirt.dmi b/icons/clothing/uniform/casual/rainbow_skirt.dmi
new file mode 100644
index 00000000000..103fb4a1249
Binary files /dev/null and b/icons/clothing/uniform/casual/rainbow_skirt.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/black_shorts_ripped.dmi b/icons/clothing/uniform/casual/shorts/black_shorts_ripped.dmi
new file mode 100644
index 00000000000..7e3faca33d1
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/black_shorts_ripped.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/blackshorts.dmi b/icons/clothing/uniform/casual/shorts/blackshorts.dmi
new file mode 100644
index 00000000000..8d92f888317
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/blackshorts.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/blackskirt.dmi b/icons/clothing/uniform/casual/shorts/blackskirt.dmi
new file mode 100644
index 00000000000..fd37791dfec
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/blackskirt.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/blueshorts.dmi b/icons/clothing/uniform/casual/shorts/blueshorts.dmi
new file mode 100644
index 00000000000..70f6ba3341a
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/blueshorts.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/blueshortskirt_female.dmi b/icons/clothing/uniform/casual/shorts/blueshortskirt_female.dmi
new file mode 100644
index 00000000000..ff9c54fc86d
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/blueshortskirt_female.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/blueskirt.dmi b/icons/clothing/uniform/casual/shorts/blueskirt.dmi
new file mode 100644
index 00000000000..16fc9271125
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/blueskirt.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/croptop.dmi b/icons/clothing/uniform/casual/shorts/croptop.dmi
new file mode 100644
index 00000000000..327b5217ce2
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/croptop.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/croptop_grey.dmi b/icons/clothing/uniform/casual/shorts/croptop_grey.dmi
new file mode 100644
index 00000000000..fb6f2ebac39
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/croptop_grey.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/croptop_red.dmi b/icons/clothing/uniform/casual/shorts/croptop_red.dmi
new file mode 100644
index 00000000000..8f83bf26946
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/croptop_red.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/cuttop.dmi b/icons/clothing/uniform/casual/shorts/cuttop.dmi
new file mode 100644
index 00000000000..2b23259f5a1
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/cuttop.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/cuttop_red.dmi b/icons/clothing/uniform/casual/shorts/cuttop_red.dmi
new file mode 100644
index 00000000000..96952e97eb5
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/cuttop_red.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/gnshorts.dmi b/icons/clothing/uniform/casual/shorts/gnshorts.dmi
new file mode 100644
index 00000000000..5f12bfabe21
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/gnshorts.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/greenshorts.dmi b/icons/clothing/uniform/casual/shorts/greenshorts.dmi
new file mode 100644
index 00000000000..83fbc4bfacd
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/greenshorts.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/greyshorts.dmi b/icons/clothing/uniform/casual/shorts/greyshorts.dmi
new file mode 100644
index 00000000000..4fb3fab7f20
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/greyshorts.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/greyskirt_female.dmi b/icons/clothing/uniform/casual/shorts/greyskirt_female.dmi
new file mode 100644
index 00000000000..f3c64e23a7a
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/greyskirt_female.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/jean_shorts.dmi b/icons/clothing/uniform/casual/shorts/jean_shorts.dmi
new file mode 100644
index 00000000000..123ab0f2c58
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/jean_shorts.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/khaki_shorts_f.dmi b/icons/clothing/uniform/casual/shorts/khaki_shorts_f.dmi
new file mode 100644
index 00000000000..88842f40693
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/khaki_shorts_f.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/miniskirt_fashion.dmi b/icons/clothing/uniform/casual/shorts/miniskirt_fashion.dmi
new file mode 100644
index 00000000000..56d9e7c9832
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/miniskirt_fashion.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/plaid_blue.dmi b/icons/clothing/uniform/casual/shorts/plaid_blue.dmi
new file mode 100644
index 00000000000..f638f46abc5
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/plaid_blue.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/plaid_green.dmi b/icons/clothing/uniform/casual/shorts/plaid_green.dmi
new file mode 100644
index 00000000000..b3a68a61f96
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/plaid_green.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/plaid_purple.dmi b/icons/clothing/uniform/casual/shorts/plaid_purple.dmi
new file mode 100644
index 00000000000..30d93d281e8
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/plaid_purple.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/plaid_red.dmi b/icons/clothing/uniform/casual/shorts/plaid_red.dmi
new file mode 100644
index 00000000000..ebbf8d94d67
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/plaid_red.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/pleated.dmi b/icons/clothing/uniform/casual/shorts/pleated.dmi
new file mode 100644
index 00000000000..c84d7d40793
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/pleated.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/redshorts.dmi b/icons/clothing/uniform/casual/shorts/redshorts.dmi
new file mode 100644
index 00000000000..eee7f99d5bc
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/redshorts.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/redskirt.dmi b/icons/clothing/uniform/casual/shorts/redskirt.dmi
new file mode 100644
index 00000000000..be673bdeab9
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/redskirt.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/skirt_khaki.dmi b/icons/clothing/uniform/casual/shorts/skirt_khaki.dmi
new file mode 100644
index 00000000000..58311dd86f6
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/skirt_khaki.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/skirt_short_black.dmi b/icons/clothing/uniform/casual/shorts/skirt_short_black.dmi
new file mode 100644
index 00000000000..1ba9cd5995d
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/skirt_short_black.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/skirt_short_blue.dmi b/icons/clothing/uniform/casual/shorts/skirt_short_blue.dmi
new file mode 100644
index 00000000000..0ab9c1881c2
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/skirt_short_blue.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/skirt_short_denim.dmi b/icons/clothing/uniform/casual/shorts/skirt_short_denim.dmi
new file mode 100644
index 00000000000..cf0a4fa6b13
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/skirt_short_denim.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/skirt_short_red.dmi b/icons/clothing/uniform/casual/shorts/skirt_short_red.dmi
new file mode 100644
index 00000000000..2bd34d2e944
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/skirt_short_red.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/skirt_swept.dmi b/icons/clothing/uniform/casual/shorts/skirt_swept.dmi
new file mode 100644
index 00000000000..7698bc6e6de
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/skirt_swept.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/tanpants_shorts.dmi b/icons/clothing/uniform/casual/shorts/tanpants_shorts.dmi
new file mode 100644
index 00000000000..ed8ba6a244a
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/tanpants_shorts.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/whiteshorts.dmi b/icons/clothing/uniform/casual/shorts/whiteshorts.dmi
new file mode 100644
index 00000000000..b250fcbe35f
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/whiteshorts.dmi differ
diff --git a/icons/clothing/uniform/casual/shorts/whiteshorts_f.dmi b/icons/clothing/uniform/casual/shorts/whiteshorts_f.dmi
new file mode 100644
index 00000000000..6aa0cc8c3c6
Binary files /dev/null and b/icons/clothing/uniform/casual/shorts/whiteshorts_f.dmi differ
diff --git a/icons/clothing/uniform/casual/sleepwear/blue_pajamas.dmi b/icons/clothing/uniform/casual/sleepwear/blue_pajamas.dmi
new file mode 100644
index 00000000000..a8c54633b9e
Binary files /dev/null and b/icons/clothing/uniform/casual/sleepwear/blue_pajamas.dmi differ
diff --git a/icons/clothing/uniform/casual/sleepwear/blue_pajamas_fem.dmi b/icons/clothing/uniform/casual/sleepwear/blue_pajamas_fem.dmi
new file mode 100644
index 00000000000..acf3dcd7543
Binary files /dev/null and b/icons/clothing/uniform/casual/sleepwear/blue_pajamas_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/sleepwear/red_pajamas.dmi b/icons/clothing/uniform/casual/sleepwear/red_pajamas.dmi
new file mode 100644
index 00000000000..4b9736394e8
Binary files /dev/null and b/icons/clothing/uniform/casual/sleepwear/red_pajamas.dmi differ
diff --git a/icons/clothing/uniform/casual/sleepwear/red_pajamas_fem.dmi b/icons/clothing/uniform/casual/sleepwear/red_pajamas_fem.dmi
new file mode 100644
index 00000000000..f4ede862f10
Binary files /dev/null and b/icons/clothing/uniform/casual/sleepwear/red_pajamas_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/swimwear/swimsuit.dmi b/icons/clothing/uniform/casual/swimwear/swimsuit.dmi
new file mode 100644
index 00000000000..103a390005e
Binary files /dev/null and b/icons/clothing/uniform/casual/swimwear/swimsuit.dmi differ
diff --git a/icons/clothing/uniform/casual/swimwear/swimsuit_dept.dmi b/icons/clothing/uniform/casual/swimwear/swimsuit_dept.dmi
new file mode 100644
index 00000000000..4952491b114
Binary files /dev/null and b/icons/clothing/uniform/casual/swimwear/swimsuit_dept.dmi differ
diff --git a/icons/clothing/uniform/casual/swimwear/swimsuit_skimpy.dmi b/icons/clothing/uniform/casual/swimwear/swimsuit_skimpy.dmi
new file mode 100644
index 00000000000..c601c2f5e67
Binary files /dev/null and b/icons/clothing/uniform/casual/swimwear/swimsuit_skimpy.dmi differ
diff --git a/icons/clothing/uniform/casual/teshari/teshari_smock.dmi b/icons/clothing/uniform/casual/teshari/teshari_smock.dmi
new file mode 100644
index 00000000000..588bcde8628
Binary files /dev/null and b/icons/clothing/uniform/casual/teshari/teshari_smock.dmi differ
diff --git a/icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi b/icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi
new file mode 100644
index 00000000000..853e91463cc
Binary files /dev/null and b/icons/clothing/uniform/casual/teshari/teshari_undercoat.dmi differ
diff --git a/icons/clothing/uniform/casual/tourist.dmi b/icons/clothing/uniform/casual/tourist.dmi
new file mode 100644
index 00000000000..303215894a2
Binary files /dev/null and b/icons/clothing/uniform/casual/tourist.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/acolyte_hunter.dmi b/icons/clothing/uniform/casual/tribal/acolyte_hunter.dmi
new file mode 100644
index 00000000000..98cffb3b8ec
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/acolyte_hunter.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/acolyte_hunter_fem.dmi b/icons/clothing/uniform/casual/tribal/acolyte_hunter_fem.dmi
new file mode 100644
index 00000000000..6a545a79a5e
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/acolyte_hunter_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/druidic_gown.dmi b/icons/clothing/uniform/casual/tribal/druidic_gown.dmi
new file mode 100644
index 00000000000..4eeeeb84b75
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/druidic_gown.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/druidic_gown_fem.dmi b/icons/clothing/uniform/casual/tribal/druidic_gown_fem.dmi
new file mode 100644
index 00000000000..20f409913a4
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/druidic_gown_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/gatherer.dmi b/icons/clothing/uniform/casual/tribal/gatherer.dmi
new file mode 100644
index 00000000000..5b855c4f576
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/gatherer.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/gatherer_fem.dmi b/icons/clothing/uniform/casual/tribal/gatherer_fem.dmi
new file mode 100644
index 00000000000..2b8ab43d565
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/gatherer_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/hunter.dmi b/icons/clothing/uniform/casual/tribal/hunter.dmi
new file mode 100644
index 00000000000..36c6bf233cd
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/hunter.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/hunter_fem.dmi b/icons/clothing/uniform/casual/tribal/hunter_fem.dmi
new file mode 100644
index 00000000000..afdcfe99e69
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/hunter_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/shamanblue.dmi b/icons/clothing/uniform/casual/tribal/shamanblue.dmi
new file mode 100644
index 00000000000..900f7d4dc73
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/shamanblue.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/shamanblue_fem.dmi b/icons/clothing/uniform/casual/tribal/shamanblue_fem.dmi
new file mode 100644
index 00000000000..08d5551e238
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/shamanblue_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/shamanred.dmi b/icons/clothing/uniform/casual/tribal/shamanred.dmi
new file mode 100644
index 00000000000..f644006795a
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/shamanred.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/shamanred_fem.dmi b/icons/clothing/uniform/casual/tribal/shamanred_fem.dmi
new file mode 100644
index 00000000000..cedaf5dcdb6
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/shamanred_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/tribal_tunic.dmi b/icons/clothing/uniform/casual/tribal/tribal_tunic.dmi
new file mode 100644
index 00000000000..3147a588fd2
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/tribal_tunic.dmi differ
diff --git a/icons/clothing/uniform/casual/tribal/tribal_tunic_fem.dmi b/icons/clothing/uniform/casual/tribal/tribal_tunic_fem.dmi
new file mode 100644
index 00000000000..f0cb56968f7
Binary files /dev/null and b/icons/clothing/uniform/casual/tribal/tribal_tunic_fem.dmi differ
diff --git a/icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi b/icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi
new file mode 100644
index 00000000000..dce8522f4d9
Binary files /dev/null and b/icons/clothing/uniform/casual/turtleneck/baggy_turtleneck.dmi differ
diff --git a/icons/clothing/uniform/casual/turtleneck/turtleneck.dmi b/icons/clothing/uniform/casual/turtleneck/turtleneck.dmi
new file mode 100644
index 00000000000..2673b38dd65
Binary files /dev/null and b/icons/clothing/uniform/casual/turtleneck/turtleneck.dmi differ
diff --git a/icons/clothing/uniform/casual/vox/simonpants.dmi b/icons/clothing/uniform/casual/vox/simonpants.dmi
new file mode 100644
index 00000000000..4a34aca4fde
Binary files /dev/null and b/icons/clothing/uniform/casual/vox/simonpants.dmi differ
diff --git a/icons/clothing/uniform/casual/vox/vox-casual-1.dmi b/icons/clothing/uniform/casual/vox/vox-casual-1.dmi
new file mode 100644
index 00000000000..163b9140098
Binary files /dev/null and b/icons/clothing/uniform/casual/vox/vox-casual-1.dmi differ
diff --git a/icons/clothing/uniform/casual/vox/vox-casual-2.dmi b/icons/clothing/uniform/casual/vox/vox-casual-2.dmi
new file mode 100644
index 00000000000..9573ffb88e2
Binary files /dev/null and b/icons/clothing/uniform/casual/vox/vox-casual-2.dmi differ
diff --git a/icons/clothing/uniform/casual/women/black_corset.dmi b/icons/clothing/uniform/casual/women/black_corset.dmi
new file mode 100644
index 00000000000..7f5fcdfb75c
Binary files /dev/null and b/icons/clothing/uniform/casual/women/black_corset.dmi differ
diff --git a/icons/clothing/uniform/casual/women/half_moon.dmi b/icons/clothing/uniform/casual/women/half_moon.dmi
new file mode 100644
index 00000000000..05005080c98
Binary files /dev/null and b/icons/clothing/uniform/casual/women/half_moon.dmi differ
diff --git a/icons/clothing/uniform/casual/women/haltertop.dmi b/icons/clothing/uniform/casual/women/haltertop.dmi
new file mode 100644
index 00000000000..1a4576f7b44
Binary files /dev/null and b/icons/clothing/uniform/casual/women/haltertop.dmi differ
diff --git a/icons/clothing/uniform/casual/women/hasie.dmi b/icons/clothing/uniform/casual/women/hasie.dmi
new file mode 100644
index 00000000000..fe44f9a0c8f
Binary files /dev/null and b/icons/clothing/uniform/casual/women/hasie.dmi differ
diff --git a/icons/clothing/uniform/costume/animeschool/schoolgirl.dmi b/icons/clothing/uniform/costume/animeschool/schoolgirl.dmi
new file mode 100644
index 00000000000..7bec21125a4
Binary files /dev/null and b/icons/clothing/uniform/costume/animeschool/schoolgirl.dmi differ
diff --git a/icons/clothing/uniform/costume/animeschool/schoolgirlgreen.dmi b/icons/clothing/uniform/costume/animeschool/schoolgirlgreen.dmi
new file mode 100644
index 00000000000..4331f5c981d
Binary files /dev/null and b/icons/clothing/uniform/costume/animeschool/schoolgirlgreen.dmi differ
diff --git a/icons/clothing/uniform/costume/animeschool/schoolgirlorange.dmi b/icons/clothing/uniform/costume/animeschool/schoolgirlorange.dmi
new file mode 100644
index 00000000000..ecd78d0cf8e
Binary files /dev/null and b/icons/clothing/uniform/costume/animeschool/schoolgirlorange.dmi differ
diff --git a/icons/clothing/uniform/costume/animeschool/schoolgirlpink.dmi b/icons/clothing/uniform/costume/animeschool/schoolgirlpink.dmi
new file mode 100644
index 00000000000..16dacda287c
Binary files /dev/null and b/icons/clothing/uniform/costume/animeschool/schoolgirlpink.dmi differ
diff --git a/icons/clothing/uniform/costume/animeschool/schoolgirlred.dmi b/icons/clothing/uniform/costume/animeschool/schoolgirlred.dmi
new file mode 100644
index 00000000000..f8402881cca
Binary files /dev/null and b/icons/clothing/uniform/costume/animeschool/schoolgirlred.dmi differ
diff --git a/icons/clothing/uniform/costume/aquiline.dmi b/icons/clothing/uniform/costume/aquiline.dmi
deleted file mode 100644
index 49fdfbbc34a..00000000000
Binary files a/icons/clothing/uniform/costume/aquiline.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/costume/batter.dmi b/icons/clothing/uniform/costume/batter.dmi
new file mode 100644
index 00000000000..b2070d215b5
Binary files /dev/null and b/icons/clothing/uniform/costume/batter.dmi differ
diff --git a/icons/clothing/uniform/costume/blue_mech_suit.dmi b/icons/clothing/uniform/costume/blue_mech_suit.dmi
new file mode 100644
index 00000000000..e929f7fc1e7
Binary files /dev/null and b/icons/clothing/uniform/costume/blue_mech_suit.dmi differ
diff --git a/icons/clothing/uniform/costume/bountyskin.dmi b/icons/clothing/uniform/costume/bountyskin.dmi
new file mode 100644
index 00000000000..eb41d570c3b
Binary files /dev/null and b/icons/clothing/uniform/costume/bountyskin.dmi differ
diff --git a/icons/clothing/uniform/costume/bsing.dmi b/icons/clothing/uniform/costume/bsing.dmi
new file mode 100644
index 00000000000..87b18496a07
Binary files /dev/null and b/icons/clothing/uniform/costume/bsing.dmi differ
diff --git a/icons/clothing/uniform/costume/captain_fly.dmi b/icons/clothing/uniform/costume/captain_fly.dmi
new file mode 100644
index 00000000000..95158e9efb7
Binary files /dev/null and b/icons/clothing/uniform/costume/captain_fly.dmi differ
diff --git a/icons/clothing/uniform/costume/christmasfemaleg.dmi b/icons/clothing/uniform/costume/christmasfemaleg.dmi
new file mode 100644
index 00000000000..028899cb63e
Binary files /dev/null and b/icons/clothing/uniform/costume/christmasfemaleg.dmi differ
diff --git a/icons/clothing/uniform/costume/christmasfemaler.dmi b/icons/clothing/uniform/costume/christmasfemaler.dmi
new file mode 100644
index 00000000000..a2331ea7e28
Binary files /dev/null and b/icons/clothing/uniform/costume/christmasfemaler.dmi differ
diff --git a/icons/clothing/uniform/costume/christmasmaleg.dmi b/icons/clothing/uniform/costume/christmasmaleg.dmi
new file mode 100644
index 00000000000..85203651da2
Binary files /dev/null and b/icons/clothing/uniform/costume/christmasmaleg.dmi differ
diff --git a/icons/clothing/uniform/costume/christmasmaler.dmi b/icons/clothing/uniform/costume/christmasmaler.dmi
new file mode 100644
index 00000000000..a7760723ea3
Binary files /dev/null and b/icons/clothing/uniform/costume/christmasmaler.dmi differ
diff --git a/icons/clothing/uniform/costume/darkholme.dmi b/icons/clothing/uniform/costume/darkholme.dmi
new file mode 100644
index 00000000000..03c005964ec
Binary files /dev/null and b/icons/clothing/uniform/costume/darkholme.dmi differ
diff --git a/icons/clothing/uniform/costume/drfreeze.dmi b/icons/clothing/uniform/costume/drfreeze.dmi
new file mode 100644
index 00000000000..00838cdf6e1
Binary files /dev/null and b/icons/clothing/uniform/costume/drfreeze.dmi differ
diff --git a/icons/clothing/uniform/costume/geisha.dmi b/icons/clothing/uniform/costume/geisha.dmi
new file mode 100644
index 00000000000..1a61941c4e8
Binary files /dev/null and b/icons/clothing/uniform/costume/geisha.dmi differ
diff --git a/icons/clothing/uniform/costume/highwayman_clothes.dmi b/icons/clothing/uniform/costume/highwayman_clothes.dmi
new file mode 100644
index 00000000000..ad3f1691d3a
Binary files /dev/null and b/icons/clothing/uniform/costume/highwayman_clothes.dmi differ
diff --git a/icons/clothing/uniform/costume/highwayman_clothes_fem.dmi b/icons/clothing/uniform/costume/highwayman_clothes_fem.dmi
new file mode 100644
index 00000000000..0c4fe63c773
Binary files /dev/null and b/icons/clothing/uniform/costume/highwayman_clothes_fem.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/american.dmi b/icons/clothing/uniform/costume/historical/american.dmi
new file mode 100644
index 00000000000..590240803c4
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/american.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/aquiline.dmi b/icons/clothing/uniform/costume/historical/aquiline.dmi
new file mode 100644
index 00000000000..0872977608c
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/aquiline.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/crimson.dmi b/icons/clothing/uniform/costume/historical/crimson.dmi
new file mode 100644
index 00000000000..e130d237c68
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/crimson.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/general.dmi b/icons/clothing/uniform/costume/historical/general.dmi
new file mode 100644
index 00000000000..9f280e78fce
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/general.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/gladiator.dmi b/icons/clothing/uniform/costume/historical/gladiator.dmi
new file mode 100644
index 00000000000..e0f39040c23
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/gladiator.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/pirate.dmi b/icons/clothing/uniform/costume/historical/pirate.dmi
new file mode 100644
index 00000000000..985b8524330
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/pirate.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/prussian.dmi b/icons/clothing/uniform/costume/historical/prussian.dmi
new file mode 100644
index 00000000000..911447917e1
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/prussian.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/redcoatformal.dmi b/icons/clothing/uniform/costume/historical/redcoatformal.dmi
new file mode 100644
index 00000000000..e80e7a68f3d
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/redcoatformal.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/roman.dmi b/icons/clothing/uniform/costume/historical/roman.dmi
new file mode 100644
index 00000000000..21529d19d51
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/roman.dmi differ
diff --git a/icons/clothing/uniform/costume/historical/soviet.dmi b/icons/clothing/uniform/costume/historical/soviet.dmi
new file mode 100644
index 00000000000..02489bdfeae
Binary files /dev/null and b/icons/clothing/uniform/costume/historical/soviet.dmi differ
diff --git a/icons/clothing/uniform/costume/toga.dmi b/icons/clothing/uniform/costume/historical/toga.dmi
similarity index 100%
rename from icons/clothing/uniform/costume/toga.dmi
rename to icons/clothing/uniform/costume/historical/toga.dmi
diff --git a/icons/clothing/uniform/costume/johnny.dmi b/icons/clothing/uniform/costume/johnny.dmi
new file mode 100644
index 00000000000..910d381727e
Binary files /dev/null and b/icons/clothing/uniform/costume/johnny.dmi differ
diff --git a/icons/clothing/uniform/costume/kamina.dmi b/icons/clothing/uniform/costume/kamina.dmi
new file mode 100644
index 00000000000..f692c0be066
Binary files /dev/null and b/icons/clothing/uniform/costume/kamina.dmi differ
diff --git a/icons/clothing/uniform/costume/kilt.dmi b/icons/clothing/uniform/costume/kilt.dmi
deleted file mode 100644
index 242d6bab5b7..00000000000
Binary files a/icons/clothing/uniform/costume/kilt.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/costume/lobster.dmi b/icons/clothing/uniform/costume/lobster.dmi
new file mode 100644
index 00000000000..1d6a83e39de
Binary files /dev/null and b/icons/clothing/uniform/costume/lobster.dmi differ
diff --git a/icons/clothing/uniform/costume/maid/maid.dmi b/icons/clothing/uniform/costume/maid/maid.dmi
new file mode 100644
index 00000000000..72775e441c7
Binary files /dev/null and b/icons/clothing/uniform/costume/maid/maid.dmi differ
diff --git a/icons/clothing/uniform/costume/maid.dmi b/icons/clothing/uniform/costume/maid/maid_latex.dmi
similarity index 100%
rename from icons/clothing/uniform/costume/maid.dmi
rename to icons/clothing/uniform/costume/maid/maid_latex.dmi
diff --git a/icons/clothing/uniform/costume/maid/maid_neko.dmi b/icons/clothing/uniform/costume/maid/maid_neko.dmi
new file mode 100644
index 00000000000..780eaaa3135
Binary files /dev/null and b/icons/clothing/uniform/costume/maid/maid_neko.dmi differ
diff --git a/icons/clothing/uniform/costume/maid/maid_sexy.dmi b/icons/clothing/uniform/costume/maid/maid_sexy.dmi
new file mode 100644
index 00000000000..3066e18f300
Binary files /dev/null and b/icons/clothing/uniform/costume/maid/maid_sexy.dmi differ
diff --git a/icons/clothing/uniform/costume/mailman.dmi b/icons/clothing/uniform/costume/mailman.dmi
new file mode 100644
index 00000000000..b522dbde83c
Binary files /dev/null and b/icons/clothing/uniform/costume/mailman.dmi differ
diff --git a/icons/clothing/uniform/costume/mummy.dmi b/icons/clothing/uniform/costume/mummy.dmi
new file mode 100644
index 00000000000..98d74eac026
Binary files /dev/null and b/icons/clothing/uniform/costume/mummy.dmi differ
diff --git a/icons/clothing/uniform/misc/onestar.dmi b/icons/clothing/uniform/costume/onestar.dmi
similarity index 100%
rename from icons/clothing/uniform/misc/onestar.dmi
rename to icons/clothing/uniform/costume/onestar.dmi
diff --git a/icons/clothing/uniform/costume/owl.dmi b/icons/clothing/uniform/costume/owl.dmi
new file mode 100644
index 00000000000..eb306a955d0
Binary files /dev/null and b/icons/clothing/uniform/costume/owl.dmi differ
diff --git a/icons/clothing/uniform/costume/psysuit.dmi b/icons/clothing/uniform/costume/psysuit.dmi
new file mode 100644
index 00000000000..d324a3f38d8
Binary files /dev/null and b/icons/clothing/uniform/costume/psysuit.dmi differ
diff --git a/icons/clothing/uniform/costume/ranger/black_ranger.dmi b/icons/clothing/uniform/costume/ranger/black_ranger.dmi
new file mode 100644
index 00000000000..77ebdc314f6
Binary files /dev/null and b/icons/clothing/uniform/costume/ranger/black_ranger.dmi differ
diff --git a/icons/clothing/uniform/costume/ranger/cyan_ranger.dmi b/icons/clothing/uniform/costume/ranger/cyan_ranger.dmi
new file mode 100644
index 00000000000..5cfe5d914fb
Binary files /dev/null and b/icons/clothing/uniform/costume/ranger/cyan_ranger.dmi differ
diff --git a/icons/clothing/uniform/costume/ranger/green_ranger.dmi b/icons/clothing/uniform/costume/ranger/green_ranger.dmi
new file mode 100644
index 00000000000..1a10b937e4b
Binary files /dev/null and b/icons/clothing/uniform/costume/ranger/green_ranger.dmi differ
diff --git a/icons/clothing/uniform/costume/ranger/orange_ranger.dmi b/icons/clothing/uniform/costume/ranger/orange_ranger.dmi
new file mode 100644
index 00000000000..9ad22158058
Binary files /dev/null and b/icons/clothing/uniform/costume/ranger/orange_ranger.dmi differ
diff --git a/icons/clothing/uniform/costume/ranger/pink_ranger.dmi b/icons/clothing/uniform/costume/ranger/pink_ranger.dmi
new file mode 100644
index 00000000000..6c23aa1f3a0
Binary files /dev/null and b/icons/clothing/uniform/costume/ranger/pink_ranger.dmi differ
diff --git a/icons/clothing/uniform/costume/ranger/white_ranger.dmi b/icons/clothing/uniform/costume/ranger/white_ranger.dmi
new file mode 100644
index 00000000000..26b1cad19cc
Binary files /dev/null and b/icons/clothing/uniform/costume/ranger/white_ranger.dmi differ
diff --git a/icons/clothing/uniform/costume/ranger/yellow_ranger.dmi b/icons/clothing/uniform/costume/ranger/yellow_ranger.dmi
new file mode 100644
index 00000000000..f3eb88ab92d
Binary files /dev/null and b/icons/clothing/uniform/costume/ranger/yellow_ranger.dmi differ
diff --git a/icons/clothing/uniform/costume/red_mech_suit.dmi b/icons/clothing/uniform/costume/red_mech_suit.dmi
new file mode 100644
index 00000000000..8cdac477a2f
Binary files /dev/null and b/icons/clothing/uniform/costume/red_mech_suit.dmi differ
diff --git a/icons/clothing/uniform/costume/safari.dmi b/icons/clothing/uniform/costume/safari.dmi
new file mode 100644
index 00000000000..6348a178f89
Binary files /dev/null and b/icons/clothing/uniform/costume/safari.dmi differ
diff --git a/icons/clothing/uniform/costume/scarecrow.dmi b/icons/clothing/uniform/costume/scarecrow.dmi
new file mode 100644
index 00000000000..5dde98fff46
Binary files /dev/null and b/icons/clothing/uniform/costume/scarecrow.dmi differ
diff --git a/icons/clothing/uniform/costume/sexyclown.dmi b/icons/clothing/uniform/costume/sexyclown.dmi
new file mode 100644
index 00000000000..fbc3d2cdcb4
Binary files /dev/null and b/icons/clothing/uniform/costume/sexyclown.dmi differ
diff --git a/icons/clothing/uniform/costume/sexymime.dmi b/icons/clothing/uniform/costume/sexymime.dmi
new file mode 100644
index 00000000000..4c97de98dc7
Binary files /dev/null and b/icons/clothing/uniform/costume/sexymime.dmi differ
diff --git a/icons/clothing/uniform/costume/shiny/leotard.dmi b/icons/clothing/uniform/costume/shiny/leotard.dmi
new file mode 100644
index 00000000000..ff7205eb5e4
Binary files /dev/null and b/icons/clothing/uniform/costume/shiny/leotard.dmi differ
diff --git a/icons/clothing/uniform/costume/shiny/leotard_col.dmi b/icons/clothing/uniform/costume/shiny/leotard_col.dmi
new file mode 100644
index 00000000000..f98534f89df
Binary files /dev/null and b/icons/clothing/uniform/costume/shiny/leotard_col.dmi differ
diff --git a/icons/clothing/uniform/costume/shiny/suit.dmi b/icons/clothing/uniform/costume/shiny/suit.dmi
new file mode 100644
index 00000000000..70a7d54fad4
Binary files /dev/null and b/icons/clothing/uniform/costume/shiny/suit.dmi differ
diff --git a/icons/clothing/uniform/costume/shiny/suit_col.dmi b/icons/clothing/uniform/costume/shiny/suit_col.dmi
new file mode 100644
index 00000000000..a56bb352610
Binary files /dev/null and b/icons/clothing/uniform/costume/shiny/suit_col.dmi differ
diff --git a/icons/clothing/uniform/costume/skeleton.dmi b/icons/clothing/uniform/costume/skeleton.dmi
new file mode 100644
index 00000000000..c7464296ae7
Binary files /dev/null and b/icons/clothing/uniform/costume/skeleton.dmi differ
diff --git a/icons/clothing/uniform/costume/spiral.dmi b/icons/clothing/uniform/costume/spiral.dmi
deleted file mode 100644
index 232d368533c..00000000000
Binary files a/icons/clothing/uniform/costume/spiral.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/tape.dmi b/icons/clothing/uniform/costume/tape.dmi
similarity index 100%
rename from icons/clothing/uniform/misc/tape.dmi
rename to icons/clothing/uniform/costume/tape.dmi
diff --git a/icons/clothing/uniform/costume/telegram.dmi b/icons/clothing/uniform/costume/telegram.dmi
new file mode 100644
index 00000000000..e11f9299fb8
Binary files /dev/null and b/icons/clothing/uniform/costume/telegram.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_command.dmi b/icons/clothing/uniform/costume/trek/trek_command.dmi
new file mode 100644
index 00000000000..4bbc13fcfa3
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_command.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_ds9_command.dmi b/icons/clothing/uniform/costume/trek/trek_ds9_command.dmi
new file mode 100644
index 00000000000..51ef5116cac
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_ds9_command.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_ds9_engsec.dmi b/icons/clothing/uniform/costume/trek/trek_ds9_engsec.dmi
new file mode 100644
index 00000000000..fd1fb575649
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_ds9_engsec.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_ds9_medsci.dmi b/icons/clothing/uniform/costume/trek/trek_ds9_medsci.dmi
new file mode 100644
index 00000000000..220b0c36628
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_ds9_medsci.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_engsec.dmi b/icons/clothing/uniform/costume/trek/trek_engsec.dmi
new file mode 100644
index 00000000000..792a095b9bb
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_engsec.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_ent_command.dmi b/icons/clothing/uniform/costume/trek/trek_ent_command.dmi
new file mode 100644
index 00000000000..ded23286448
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_ent_command.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_ent_engsec.dmi b/icons/clothing/uniform/costume/trek/trek_ent_engsec.dmi
new file mode 100644
index 00000000000..5f56ca21302
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_ent_engsec.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_ent_medsci.dmi b/icons/clothing/uniform/costume/trek/trek_ent_medsci.dmi
new file mode 100644
index 00000000000..51d77a191dd
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_ent_medsci.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_medsci.dmi b/icons/clothing/uniform/costume/trek/trek_medsci.dmi
new file mode 100644
index 00000000000..c0c051ac44d
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_medsci.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_next_command.dmi b/icons/clothing/uniform/costume/trek/trek_next_command.dmi
new file mode 100644
index 00000000000..c949b6d106a
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_next_command.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_next_engsec.dmi b/icons/clothing/uniform/costume/trek/trek_next_engsec.dmi
new file mode 100644
index 00000000000..1c928a09ffc
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_next_engsec.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_next_medsci.dmi b/icons/clothing/uniform/costume/trek/trek_next_medsci.dmi
new file mode 100644
index 00000000000..79bf773d56d
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_next_medsci.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_voy_command.dmi b/icons/clothing/uniform/costume/trek/trek_voy_command.dmi
new file mode 100644
index 00000000000..d68c579304b
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_voy_command.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_voy_engsec.dmi b/icons/clothing/uniform/costume/trek/trek_voy_engsec.dmi
new file mode 100644
index 00000000000..232d35ae56f
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_voy_engsec.dmi differ
diff --git a/icons/clothing/uniform/costume/trek/trek_voy_medsci.dmi b/icons/clothing/uniform/costume/trek/trek_voy_medsci.dmi
new file mode 100644
index 00000000000..6fb353c8450
Binary files /dev/null and b/icons/clothing/uniform/costume/trek/trek_voy_medsci.dmi differ
diff --git a/icons/clothing/uniform/costume/tronsiren.dmi b/icons/clothing/uniform/costume/tronsiren.dmi
new file mode 100644
index 00000000000..9c05a7cc013
Binary files /dev/null and b/icons/clothing/uniform/costume/tronsiren.dmi differ
diff --git a/icons/clothing/uniform/costume/tutu.dmi b/icons/clothing/uniform/costume/tutu.dmi
new file mode 100644
index 00000000000..63b4f856cd9
Binary files /dev/null and b/icons/clothing/uniform/costume/tutu.dmi differ
diff --git a/icons/clothing/uniform/costume/vice.dmi b/icons/clothing/uniform/costume/vice.dmi
new file mode 100644
index 00000000000..d0357b2e91e
Binary files /dev/null and b/icons/clothing/uniform/costume/vice.dmi differ
diff --git a/icons/clothing/uniform/costume/white_mech_suit.dmi b/icons/clothing/uniform/costume/white_mech_suit.dmi
new file mode 100644
index 00000000000..3ec2eae217c
Binary files /dev/null and b/icons/clothing/uniform/costume/white_mech_suit.dmi differ
diff --git a/icons/clothing/uniform/costume/wolfgirluni.dmi b/icons/clothing/uniform/costume/wolfgirluni.dmi
new file mode 100644
index 00000000000..5f9b4d629d8
Binary files /dev/null and b/icons/clothing/uniform/costume/wolfgirluni.dmi differ
diff --git a/icons/clothing/uniform/costume/yoko.dmi b/icons/clothing/uniform/costume/yoko.dmi
new file mode 100644
index 00000000000..e1b69f41248
Binary files /dev/null and b/icons/clothing/uniform/costume/yoko.dmi differ
diff --git a/icons/clothing/uniform/costume/ysing.dmi b/icons/clothing/uniform/costume/ysing.dmi
new file mode 100644
index 00000000000..ee037bb1468
Binary files /dev/null and b/icons/clothing/uniform/costume/ysing.dmi differ
diff --git a/icons/clothing/suit/misc/ante.dmi b/icons/clothing/uniform/formal/antediluvian/ante.dmi
similarity index 100%
rename from icons/clothing/suit/misc/ante.dmi
rename to icons/clothing/uniform/formal/antediluvian/ante.dmi
diff --git a/icons/clothing/uniform/formal/antediluvian/ante_boobflap.dmi b/icons/clothing/uniform/formal/antediluvian/ante_boobflap.dmi
new file mode 100644
index 00000000000..e2894903649
Binary files /dev/null and b/icons/clothing/uniform/formal/antediluvian/ante_boobflap.dmi differ
diff --git a/icons/clothing/uniform/formal/antediluvian/antediluvian.dmi b/icons/clothing/uniform/formal/antediluvian/antediluvian.dmi
new file mode 100644
index 00000000000..a6bb8b4b09a
Binary files /dev/null and b/icons/clothing/uniform/formal/antediluvian/antediluvian.dmi differ
diff --git a/icons/clothing/uniform/misc/ante_aziru.dmi b/icons/clothing/uniform/formal/antediluvian/aziru_dress.dmi
similarity index 100%
rename from icons/clothing/uniform/misc/ante_aziru.dmi
rename to icons/clothing/uniform/formal/antediluvian/aziru_dress.dmi
diff --git a/icons/clothing/uniform/formal/assistant_formal.dmi b/icons/clothing/uniform/formal/assistant_formal.dmi
new file mode 100644
index 00000000000..2e7cdb2296f
Binary files /dev/null and b/icons/clothing/uniform/formal/assistant_formal.dmi differ
diff --git a/icons/clothing/uniform/formal/assistant_formal_fem.dmi b/icons/clothing/uniform/formal/assistant_formal_fem.dmi
new file mode 100644
index 00000000000..7bd95036037
Binary files /dev/null and b/icons/clothing/uniform/formal/assistant_formal_fem.dmi differ
diff --git a/icons/clothing/uniform/misc/baroness.dmi b/icons/clothing/uniform/formal/dress/baroness.dmi
similarity index 100%
rename from icons/clothing/uniform/misc/baroness.dmi
rename to icons/clothing/uniform/formal/dress/baroness.dmi
diff --git a/icons/clothing/uniform/formal/dress/black_tabard.dmi b/icons/clothing/uniform/formal/dress/black_tabard.dmi
new file mode 100644
index 00000000000..82fc6b9e0df
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/black_tabard.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/blacktango.dmi b/icons/clothing/uniform/formal/dress/blacktango.dmi
new file mode 100644
index 00000000000..97181f14b98
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/blacktango.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/blacktango_alt.dmi b/icons/clothing/uniform/formal/dress/blacktango_alt.dmi
new file mode 100644
index 00000000000..58669980eb6
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/blacktango_alt.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/bride_blue.dmi b/icons/clothing/uniform/formal/dress/bride_blue.dmi
new file mode 100644
index 00000000000..2a80c620527
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/bride_blue.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/bride_orange.dmi b/icons/clothing/uniform/formal/dress/bride_orange.dmi
new file mode 100644
index 00000000000..466f6432908
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/bride_orange.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/bride_purple.dmi b/icons/clothing/uniform/formal/dress/bride_purple.dmi
new file mode 100644
index 00000000000..854721ca167
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/bride_purple.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/bride_red.dmi b/icons/clothing/uniform/formal/dress/bride_red.dmi
new file mode 100644
index 00000000000..bbc2ffba500
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/bride_red.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/bride_white.dmi b/icons/clothing/uniform/formal/dress/bride_white.dmi
new file mode 100644
index 00000000000..31ad8d0a849
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/bride_white.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/cheongsam.dmi b/icons/clothing/uniform/formal/dress/cheongsam.dmi
new file mode 100644
index 00000000000..32f624b7cb7
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/cheongsam.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/chiming_dress.dmi b/icons/clothing/uniform/formal/dress/chiming_dress.dmi
new file mode 100644
index 00000000000..0bfd5378731
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/chiming_dress.dmi differ
diff --git a/icons/clothing/uniform/misc/countess.dmi b/icons/clothing/uniform/formal/dress/countess.dmi
similarity index 100%
rename from icons/clothing/uniform/misc/countess.dmi
rename to icons/clothing/uniform/formal/dress/countess.dmi
diff --git a/icons/clothing/uniform/formal/dress/cropdress.dmi b/icons/clothing/uniform/formal/dress/cropdress.dmi
new file mode 100644
index 00000000000..5bdedfce2f9
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/cropdress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/darkreddress.dmi b/icons/clothing/uniform/formal/dress/darkreddress.dmi
new file mode 100644
index 00000000000..d4915ef8680
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/darkreddress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/dress_fire.dmi b/icons/clothing/uniform/formal/dress/dress_fire.dmi
new file mode 100644
index 00000000000..b892db83fa7
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/dress_fire.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/dress_green.dmi b/icons/clothing/uniform/formal/dress/dress_green.dmi
new file mode 100644
index 00000000000..faa0c57ad89
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/dress_green.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/dress_orange.dmi b/icons/clothing/uniform/formal/dress/dress_orange.dmi
new file mode 100644
index 00000000000..b35204dd524
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/dress_orange.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/dress_pink.dmi b/icons/clothing/uniform/formal/dress/dress_pink.dmi
new file mode 100644
index 00000000000..bee08c07d2e
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/dress_pink.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/dress_saloon.dmi b/icons/clothing/uniform/formal/dress/dress_saloon.dmi
new file mode 100644
index 00000000000..ead7fe37fce
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/dress_saloon.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/dress_yellow.dmi b/icons/clothing/uniform/formal/dress/dress_yellow.dmi
new file mode 100644
index 00000000000..00242daeb77
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/dress_yellow.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/festivedress.dmi b/icons/clothing/uniform/formal/dress/festivedress.dmi
new file mode 100644
index 00000000000..43442b8d241
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/festivedress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/fienddress.dmi b/icons/clothing/uniform/formal/dress/fienddress.dmi
new file mode 100644
index 00000000000..a9147783fa4
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/fienddress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/flamenco.dmi b/icons/clothing/uniform/formal/dress/flamenco.dmi
new file mode 100644
index 00000000000..dd72ba069bf
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/flamenco.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/flower_dress.dmi b/icons/clothing/uniform/formal/dress/flower_dress.dmi
new file mode 100644
index 00000000000..e50e90dbc8e
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/flower_dress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/kamishimo.dmi b/icons/clothing/uniform/formal/dress/kamishimo.dmi
new file mode 100644
index 00000000000..71f9eb4bb90
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/kamishimo.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/kimono.dmi b/icons/clothing/uniform/formal/dress/kimono.dmi
new file mode 100644
index 00000000000..a4cb5152f1e
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/kimono.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/lilacdress.dmi b/icons/clothing/uniform/formal/dress/lilacdress.dmi
new file mode 100644
index 00000000000..7b2490c616f
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/lilacdress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/lilin.dmi b/icons/clothing/uniform/formal/dress/lilin.dmi
new file mode 100644
index 00000000000..78ee2ffbfe4
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/lilin.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/littleblackdress.dmi b/icons/clothing/uniform/formal/dress/littleblackdress.dmi
new file mode 100644
index 00000000000..f1965ad9326
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/littleblackdress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/pentagram.dmi b/icons/clothing/uniform/formal/dress/pentagram.dmi
new file mode 100644
index 00000000000..2f044ad0f83
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/pentagram.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/qipao.dmi b/icons/clothing/uniform/formal/dress/qipao.dmi
new file mode 100644
index 00000000000..4f075c29fb2
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/qipao.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/red_evening_gown.dmi b/icons/clothing/uniform/formal/dress/red_evening_gown.dmi
new file mode 100644
index 00000000000..ada3f1bf253
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/red_evening_gown.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/red_swept_dress.dmi b/icons/clothing/uniform/formal/dress/red_swept_dress.dmi
new file mode 100644
index 00000000000..7060bbd1f69
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/red_swept_dress.dmi differ
diff --git a/icons/clothing/uniform/misc/revealing.dmi b/icons/clothing/uniform/formal/dress/revealingdress.dmi
similarity index 100%
rename from icons/clothing/uniform/misc/revealing.dmi
rename to icons/clothing/uniform/formal/dress/revealingdress.dmi
diff --git a/icons/clothing/uniform/formal/dress/sailor_dress.dmi b/icons/clothing/uniform/formal/dress/sailor_dress.dmi
new file mode 100644
index 00000000000..af0ae3bdfb9
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/sailor_dress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/sari_green.dmi b/icons/clothing/uniform/formal/dress/sari_green.dmi
new file mode 100644
index 00000000000..9a0275d06dd
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/sari_green.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/sari_red.dmi b/icons/clothing/uniform/formal/dress/sari_red.dmi
new file mode 100644
index 00000000000..9c79a6d4bd0
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/sari_red.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/simpledress.dmi b/icons/clothing/uniform/formal/dress/simpledress.dmi
new file mode 100644
index 00000000000..e30f267bfc9
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/simpledress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/striped_dress.dmi b/icons/clothing/uniform/formal/dress/striped_dress.dmi
new file mode 100644
index 00000000000..57ebd7f4537
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/striped_dress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/summerdress.dmi b/icons/clothing/uniform/formal/dress/summerdress.dmi
new file mode 100644
index 00000000000..0add4477d8b
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/summerdress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/summerdress2.dmi b/icons/clothing/uniform/formal/dress/summerdress2.dmi
new file mode 100644
index 00000000000..07ca645505b
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/summerdress2.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/summerdress3.dmi b/icons/clothing/uniform/formal/dress/summerdress3.dmi
new file mode 100644
index 00000000000..50cbc1e8519
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/summerdress3.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/summerdress_nt.dmi b/icons/clothing/uniform/formal/dress/summerdress_nt.dmi
new file mode 100644
index 00000000000..cb92757ea3a
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/summerdress_nt.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/sundress.dmi b/icons/clothing/uniform/formal/dress/sundress.dmi
new file mode 100644
index 00000000000..fe02b55a5b8
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/sundress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/sundress_white.dmi b/icons/clothing/uniform/formal/dress/sundress_white.dmi
new file mode 100644
index 00000000000..7cf0d938fcf
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/sundress_white.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/twistfront.dmi b/icons/clothing/uniform/formal/dress/twistfront.dmi
new file mode 100644
index 00000000000..de1f99b7fba
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/twistfront.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/verglas_dress.dmi b/icons/clothing/uniform/formal/dress/verglas_dress.dmi
new file mode 100644
index 00000000000..70c5a0cdf59
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/verglas_dress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/victorianblackdress.dmi b/icons/clothing/uniform/formal/dress/victorianblackdress.dmi
new file mode 100644
index 00000000000..53780b33e1d
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/victorianblackdress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/victorianreddress.dmi b/icons/clothing/uniform/formal/dress/victorianreddress.dmi
new file mode 100644
index 00000000000..345f0150715
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/victorianreddress.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/westernbustle.dmi b/icons/clothing/uniform/formal/dress/westernbustle.dmi
new file mode 100644
index 00000000000..6d01134edf4
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/westernbustle.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/white_tabard.dmi b/icons/clothing/uniform/formal/dress/white_tabard.dmi
new file mode 100644
index 00000000000..87017ea1060
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/white_tabard.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/whitedress1.dmi b/icons/clothing/uniform/formal/dress/whitedress1.dmi
new file mode 100644
index 00000000000..621897466f7
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/whitedress1.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/whitedress2.dmi b/icons/clothing/uniform/formal/dress/whitedress2.dmi
new file mode 100644
index 00000000000..1df0b3b76e4
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/whitedress2.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/whitedress3.dmi b/icons/clothing/uniform/formal/dress/whitedress3.dmi
new file mode 100644
index 00000000000..b56a91db630
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/whitedress3.dmi differ
diff --git a/icons/clothing/uniform/formal/dress/whitedress4.dmi b/icons/clothing/uniform/formal/dress/whitedress4.dmi
new file mode 100644
index 00000000000..ef8aa1d50cc
Binary files /dev/null and b/icons/clothing/uniform/formal/dress/whitedress4.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/bluesuit.dmi b/icons/clothing/uniform/formal/lawyer_suits/bluesuit.dmi
new file mode 100644
index 00000000000..1789a2ae367
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/bluesuit.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/bluesuit_skirt.dmi b/icons/clothing/uniform/formal/lawyer_suits/bluesuit_skirt.dmi
new file mode 100644
index 00000000000..1b2070b6263
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/bluesuit_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/lawyer_black.dmi b/icons/clothing/uniform/formal/lawyer_suits/lawyer_black.dmi
new file mode 100644
index 00000000000..70e637fdd5c
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/lawyer_black.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/lawyer_black_skirt.dmi b/icons/clothing/uniform/formal/lawyer_suits/lawyer_black_skirt.dmi
new file mode 100644
index 00000000000..794fc743588
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/lawyer_black_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/lawyer_blue.dmi b/icons/clothing/uniform/formal/lawyer_suits/lawyer_blue.dmi
new file mode 100644
index 00000000000..8a5e223de67
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/lawyer_blue.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/lawyer_blue_skirt.dmi b/icons/clothing/uniform/formal/lawyer_suits/lawyer_blue_skirt.dmi
new file mode 100644
index 00000000000..7fcd13e5d51
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/lawyer_blue_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/lawyer_purp.dmi b/icons/clothing/uniform/formal/lawyer_suits/lawyer_purp.dmi
new file mode 100644
index 00000000000..455d4c483ff
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/lawyer_purp.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/lawyer_purp_skirt.dmi b/icons/clothing/uniform/formal/lawyer_suits/lawyer_purp_skirt.dmi
new file mode 100644
index 00000000000..f5c38acdfa5
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/lawyer_purp_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/lawyer_red.dmi b/icons/clothing/uniform/formal/lawyer_suits/lawyer_red.dmi
new file mode 100644
index 00000000000..60262459e06
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/lawyer_red.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/lawyer_red_skirt.dmi b/icons/clothing/uniform/formal/lawyer_suits/lawyer_red_skirt.dmi
new file mode 100644
index 00000000000..5e891dce44b
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/lawyer_red_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/oldman.dmi b/icons/clothing/uniform/formal/lawyer_suits/oldman.dmi
new file mode 100644
index 00000000000..2301cfcb733
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/oldman.dmi differ
diff --git a/icons/clothing/uniform/formal/lawyer_suits/oldwoman.dmi b/icons/clothing/uniform/formal/lawyer_suits/oldwoman.dmi
new file mode 100644
index 00000000000..9391ee8f5c6
Binary files /dev/null and b/icons/clothing/uniform/formal/lawyer_suits/oldwoman.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/black_formal_skirt.dmi b/icons/clothing/uniform/formal/suits/black_formal_skirt.dmi
new file mode 100644
index 00000000000..93f4071d159
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/black_formal_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/black_suit.dmi b/icons/clothing/uniform/formal/suits/black_suit.dmi
new file mode 100644
index 00000000000..41495b5bef4
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/black_suit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/black_suit_fem.dmi b/icons/clothing/uniform/formal/suits/black_suit_fem.dmi
new file mode 100644
index 00000000000..466eaa52197
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/black_suit_fem.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/black_suit_fem_skirt.dmi b/icons/clothing/uniform/formal/suits/black_suit_fem_skirt.dmi
new file mode 100644
index 00000000000..ee4e0c79f2f
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/black_suit_fem_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/blue_blazer.dmi b/icons/clothing/uniform/formal/suits/blue_blazer.dmi
new file mode 100644
index 00000000000..26f75da801d
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/blue_blazer.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/blue_blazer_skirt.dmi b/icons/clothing/uniform/formal/suits/blue_blazer_skirt.dmi
new file mode 100644
index 00000000000..a1b058f1571
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/blue_blazer_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/blueshift.dmi b/icons/clothing/uniform/formal/suits/blueshift.dmi
new file mode 100644
index 00000000000..0dbd48af374
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/blueshift.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/burgundy_suit.dmi b/icons/clothing/uniform/formal/suits/burgundy_suit.dmi
new file mode 100644
index 00000000000..48c912bcccb
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/burgundy_suit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/burgundy_suit_skirt.dmi b/icons/clothing/uniform/formal/suits/burgundy_suit_skirt.dmi
new file mode 100644
index 00000000000..e578b774bb6
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/burgundy_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/businessskirt_female.dmi b/icons/clothing/uniform/formal/suits/businessskirt_female.dmi
new file mode 100644
index 00000000000..7941ccb7fb8
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/businessskirt_female.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/charcoal_suit.dmi b/icons/clothing/uniform/formal/suits/charcoal_suit.dmi
new file mode 100644
index 00000000000..f1fff637f12
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/charcoal_suit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/charcoal_suit_skirt.dmi b/icons/clothing/uniform/formal/suits/charcoal_suit_skirt.dmi
new file mode 100644
index 00000000000..43cec0ee187
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/charcoal_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/checkered_suit_skirt.dmi b/icons/clothing/uniform/formal/suits/checkered_suit_skirt.dmi
new file mode 100644
index 00000000000..eba026f6224
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/checkered_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/dutchuniform.dmi b/icons/clothing/uniform/formal/suits/dutchuniform.dmi
new file mode 100644
index 00000000000..2ccb548da75
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/dutchuniform.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/fiendsuit.dmi b/icons/clothing/uniform/formal/suits/fiendsuit.dmi
new file mode 100644
index 00000000000..06af6a82144
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/fiendsuit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/gentlesuit.dmi b/icons/clothing/uniform/formal/suits/gentlesuit.dmi
new file mode 100644
index 00000000000..b826c05e781
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/gentlesuit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/gentlesuit_skirt.dmi b/icons/clothing/uniform/formal/suits/gentlesuit_skirt.dmi
new file mode 100644
index 00000000000..a09b38af3b4
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/gentlesuit_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/hawaiianpink.dmi b/icons/clothing/uniform/formal/suits/hawaiianpink.dmi
new file mode 100644
index 00000000000..14d8a8b794e
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/hawaiianpink.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/hlsuit.dmi b/icons/clothing/uniform/formal/suits/hlsuit.dmi
new file mode 100644
index 00000000000..e69fcc55cfd
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/hlsuit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/navy_suit.dmi b/icons/clothing/uniform/formal/suits/navy_suit.dmi
new file mode 100644
index 00000000000..e43c0edd45a
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/navy_suit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/navy_suit_skirt.dmi b/icons/clothing/uniform/formal/suits/navy_suit_skirt.dmi
new file mode 100644
index 00000000000..2cae780d96b
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/navy_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/really_black_suit.dmi b/icons/clothing/uniform/formal/suits/really_black_suit.dmi
new file mode 100644
index 00000000000..3e48f66a591
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/really_black_suit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/really_black_suit_skirt.dmi b/icons/clothing/uniform/formal/suits/really_black_suit_skirt.dmi
new file mode 100644
index 00000000000..7a15acf4e8b
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/really_black_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/red_suit.dmi b/icons/clothing/uniform/formal/suits/red_suit.dmi
new file mode 100644
index 00000000000..7ea9b99f938
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/red_suit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/red_suit_skirt.dmi b/icons/clothing/uniform/formal/suits/red_suit_skirt.dmi
new file mode 100644
index 00000000000..c2439a5fa0a
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/red_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/scratch.dmi b/icons/clothing/uniform/formal/suits/scratch.dmi
new file mode 100644
index 00000000000..f8de8c51421
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/scratch.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/scratch_skirt.dmi b/icons/clothing/uniform/formal/suits/scratch_skirt.dmi
new file mode 100644
index 00000000000..3ce1d1c2272
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/scratch_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/sl_suit.dmi b/icons/clothing/uniform/formal/suits/sl_suit.dmi
new file mode 100644
index 00000000000..91585a863c9
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/sl_suit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/tan_suit.dmi b/icons/clothing/uniform/formal/suits/tan_suit.dmi
new file mode 100644
index 00000000000..8e900b488bb
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/tan_suit.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/tan_suit_skirt.dmi b/icons/clothing/uniform/formal/suits/tan_suit_skirt.dmi
new file mode 100644
index 00000000000..b67478e35fa
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/tan_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/victorianblred-fem.dmi b/icons/clothing/uniform/formal/suits/victorianblred-fem.dmi
new file mode 100644
index 00000000000..a0f478cf199
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/victorianblred-fem.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/victorianblred.dmi b/icons/clothing/uniform/formal/suits/victorianblred.dmi
new file mode 100644
index 00000000000..55b21419a85
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/victorianblred.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/victorianlightfire-fem.dmi b/icons/clothing/uniform/formal/suits/victorianlightfire-fem.dmi
new file mode 100644
index 00000000000..544c4be3eda
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/victorianlightfire-fem.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/victorianlightfire.dmi b/icons/clothing/uniform/formal/suits/victorianlightfire.dmi
new file mode 100644
index 00000000000..bbeea8c619f
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/victorianlightfire.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/victorianredvest-fem.dmi b/icons/clothing/uniform/formal/suits/victorianredvest-fem.dmi
new file mode 100644
index 00000000000..b98c499fc61
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/victorianredvest-fem.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/victorianredvest.dmi b/icons/clothing/uniform/formal/suits/victorianredvest.dmi
new file mode 100644
index 00000000000..dba03643c9c
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/victorianredvest.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/victorianvest-fem.dmi b/icons/clothing/uniform/formal/suits/victorianvest-fem.dmi
new file mode 100644
index 00000000000..4cdb2666592
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/victorianvest-fem.dmi differ
diff --git a/icons/clothing/uniform/formal/suits/victorianvest.dmi b/icons/clothing/uniform/formal/suits/victorianvest.dmi
new file mode 100644
index 00000000000..acda3cddeb5
Binary files /dev/null and b/icons/clothing/uniform/formal/suits/victorianvest.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/female_taj_fancy.dmi b/icons/clothing/uniform/formal/tajaran/female_taj_fancy.dmi
new file mode 100644
index 00000000000..0c7ec771fb7
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/female_taj_fancy.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/female_taj_fancy_alt1.dmi b/icons/clothing/uniform/formal/tajaran/female_taj_fancy_alt1.dmi
new file mode 100644
index 00000000000..aa0780072d9
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/female_taj_fancy_alt1.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/female_taj_fancy_alt2.dmi b/icons/clothing/uniform/formal/tajaran/female_taj_fancy_alt2.dmi
new file mode 100644
index 00000000000..80df741ebc2
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/female_taj_fancy_alt2.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/male_taj_fancy.dmi b/icons/clothing/uniform/formal/tajaran/male_taj_fancy.dmi
new file mode 100644
index 00000000000..30063acae42
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/male_taj_fancy.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/male_taj_fancy_alt1.dmi b/icons/clothing/uniform/formal/tajaran/male_taj_fancy_alt1.dmi
new file mode 100644
index 00000000000..94391f7a5c9
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/male_taj_fancy_alt1.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/male_taj_fancy_alt2.dmi b/icons/clothing/uniform/formal/tajaran/male_taj_fancy_alt2.dmi
new file mode 100644
index 00000000000..3571e21144c
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/male_taj_fancy_alt2.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/nka_noble_uniform.dmi b/icons/clothing/uniform/formal/tajaran/nka_noble_uniform.dmi
new file mode 100644
index 00000000000..67d17003cfb
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/nka_noble_uniform.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/summer-dress.dmi b/icons/clothing/uniform/formal/tajaran/summer-dress.dmi
new file mode 100644
index 00000000000..536d375f897
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/summer-dress.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/summer-pants.dmi b/icons/clothing/uniform/formal/tajaran/summer-pants.dmi
new file mode 100644
index 00000000000..786b4d6acbd
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/summer-pants.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/summerwear.dmi b/icons/clothing/uniform/formal/tajaran/summerwear.dmi
new file mode 100644
index 00000000000..31d8ef79bf9
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/summerwear.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/taj_dress_fancy.dmi b/icons/clothing/uniform/formal/tajaran/taj_dress_fancy.dmi
new file mode 100644
index 00000000000..71cb3cf7eeb
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/taj_dress_fancy.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/taj_dress_fancy_dark.dmi b/icons/clothing/uniform/formal/tajaran/taj_dress_fancy_dark.dmi
new file mode 100644
index 00000000000..3a3586d98f0
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/taj_dress_fancy_dark.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/taj_dress_green.dmi b/icons/clothing/uniform/formal/tajaran/taj_dress_green.dmi
new file mode 100644
index 00000000000..8641602d60a
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/taj_dress_green.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/taj_dress_red.dmi b/icons/clothing/uniform/formal/tajaran/taj_dress_red.dmi
new file mode 100644
index 00000000000..5688044b209
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/taj_dress_red.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/taj_dress_skyblue.dmi b/icons/clothing/uniform/formal/tajaran/taj_dress_skyblue.dmi
new file mode 100644
index 00000000000..b3303f1a172
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/taj_dress_skyblue.dmi differ
diff --git a/icons/clothing/uniform/formal/tajaran/taj_dress_white.dmi b/icons/clothing/uniform/formal/tajaran/taj_dress_white.dmi
new file mode 100644
index 00000000000..5617a7977e0
Binary files /dev/null and b/icons/clothing/uniform/formal/tajaran/taj_dress_white.dmi differ
diff --git a/icons/clothing/uniform/misc/ante_boobflap.dmi b/icons/clothing/uniform/misc/ante_boobflap.dmi
deleted file mode 100644
index f2e077f06c9..00000000000
Binary files a/icons/clothing/uniform/misc/ante_boobflap.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/ballet.dmi b/icons/clothing/uniform/misc/ballet.dmi
deleted file mode 100644
index fd63da65e78..00000000000
Binary files a/icons/clothing/uniform/misc/ballet.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/bodysuit_alt.dmi b/icons/clothing/uniform/misc/bodysuit_alt.dmi
deleted file mode 100644
index 2bfecaa1268..00000000000
Binary files a/icons/clothing/uniform/misc/bodysuit_alt.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/future.dmi b/icons/clothing/uniform/misc/future.dmi
deleted file mode 100644
index 61ee60ff8e5..00000000000
Binary files a/icons/clothing/uniform/misc/future.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/lindenoak.dmi b/icons/clothing/uniform/misc/lindenoak.dmi
deleted file mode 100644
index b17a72658be..00000000000
Binary files a/icons/clothing/uniform/misc/lindenoak.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/neko.dmi b/icons/clothing/uniform/misc/neko.dmi
deleted file mode 100644
index b31fd074cb8..00000000000
Binary files a/icons/clothing/uniform/misc/neko.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/old_military.dmi b/icons/clothing/uniform/misc/old_military.dmi
deleted file mode 100644
index f8403d2952f..00000000000
Binary files a/icons/clothing/uniform/misc/old_military.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/replika.dmi b/icons/clothing/uniform/misc/replika.dmi
deleted file mode 100644
index d5d7a797cbd..00000000000
Binary files a/icons/clothing/uniform/misc/replika.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/skinsuit.dmi b/icons/clothing/uniform/misc/skinsuit.dmi
deleted file mode 100644
index 05da76c44ad..00000000000
Binary files a/icons/clothing/uniform/misc/skinsuit.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/sleeveless_qipao.dmi b/icons/clothing/uniform/misc/sleeveless_qipao.dmi
deleted file mode 100644
index 5a17a49dd93..00000000000
Binary files a/icons/clothing/uniform/misc/sleeveless_qipao.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/summer_dress.dmi b/icons/clothing/uniform/misc/summer_dress.dmi
deleted file mode 100644
index 6ec19e474ed..00000000000
Binary files a/icons/clothing/uniform/misc/summer_dress.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/misc/tourist.dmi b/icons/clothing/uniform/misc/tourist.dmi
deleted file mode 100644
index 7ea32ba4383..00000000000
Binary files a/icons/clothing/uniform/misc/tourist.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/rank/dress.dmi b/icons/clothing/uniform/rank/dress.dmi
deleted file mode 100644
index 54ae68753e8..00000000000
Binary files a/icons/clothing/uniform/rank/dress.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/rank/flight.dmi b/icons/clothing/uniform/rank/flight.dmi
deleted file mode 100644
index beba329d914..00000000000
Binary files a/icons/clothing/uniform/rank/flight.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/rank/pt.dmi b/icons/clothing/uniform/rank/pt.dmi
deleted file mode 100644
index d49b62507ac..00000000000
Binary files a/icons/clothing/uniform/rank/pt.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/rank/service.dmi b/icons/clothing/uniform/rank/service.dmi
deleted file mode 100644
index 4e25dfccb58..00000000000
Binary files a/icons/clothing/uniform/rank/service.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/rank/utility.dmi b/icons/clothing/uniform/rank/utility.dmi
deleted file mode 100644
index 317a6f29177..00000000000
Binary files a/icons/clothing/uniform/rank/utility.dmi and /dev/null differ
diff --git a/icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi b/icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi
new file mode 100644
index 00000000000..5ede82179ac
Binary files /dev/null and b/icons/clothing/uniform/workwear/basic_colored_jumpskirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi b/icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi
new file mode 100644
index 00000000000..ce128fe74ff
Binary files /dev/null and b/icons/clothing/uniform/workwear/basic_colored_jumpsuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/altbodysuit.dmi b/icons/clothing/uniform/workwear/bodysuit/altbodysuit.dmi
new file mode 100644
index 00000000000..00e5890a337
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/altbodysuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/altbodysuit_pants.dmi b/icons/clothing/uniform/workwear/bodysuit/altbodysuit_pants.dmi
new file mode 100644
index 00000000000..1f4d51b27c2
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/altbodysuit_pants.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/altbodysuit_sleeves.dmi b/icons/clothing/uniform/workwear/bodysuit/altbodysuit_sleeves.dmi
new file mode 100644
index 00000000000..208c40bdb0d
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/altbodysuit_sleeves.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/altbodysuitfem.dmi b/icons/clothing/uniform/workwear/bodysuit/altbodysuitfem.dmi
new file mode 100644
index 00000000000..2823cb81aef
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/altbodysuitfem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/altbodysuitfem_pants.dmi b/icons/clothing/uniform/workwear/bodysuit/altbodysuitfem_pants.dmi
new file mode 100644
index 00000000000..d6ea9131b9d
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/altbodysuitfem_pants.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/altbodysuitfem_sleeves.dmi b/icons/clothing/uniform/workwear/bodysuit/altbodysuitfem_sleeves.dmi
new file mode 100644
index 00000000000..8f4d751e237
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/altbodysuitfem_sleeves.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit.dmi
new file mode 100644
index 00000000000..3cc63d030d3
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_centcom.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_centcom.dmi
new file mode 100644
index 00000000000..9a3fb06d056
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_centcom.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_centcom_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_centcom_fem.dmi
new file mode 100644
index 00000000000..520792651bc
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_centcom_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_command.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_command.dmi
new file mode 100644
index 00000000000..dc8577eb9ba
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_command_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_command_fem.dmi
new file mode 100644
index 00000000000..348692f981b
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_command_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_emt.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_emt.dmi
new file mode 100644
index 00000000000..0c84f3054ea
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_emt.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_emt_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_emt_fem.dmi
new file mode 100644
index 00000000000..57a4a021453
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_emt_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_eva.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_eva.dmi
new file mode 100644
index 00000000000..5d8ecb05917
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_eva.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_eva_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_eva_fem.dmi
new file mode 100644
index 00000000000..a0339a73c6c
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_eva_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_explo.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_explo.dmi
new file mode 100644
index 00000000000..0f05003a053
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_explo.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_explo_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_explo_fem.dmi
new file mode 100644
index 00000000000..879c9029fd5
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_explo_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_fem.dmi
new file mode 100644
index 00000000000..bdc922c3224
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_hazard.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_hazard.dmi
new file mode 100644
index 00000000000..4e7d5d0ce1c
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_hazard.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_hazard_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_hazard_fem.dmi
new file mode 100644
index 00000000000..9ba1ae3db2a
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_hazard_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_miner.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_miner.dmi
new file mode 100644
index 00000000000..7b8788e8d46
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_miner.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_miner_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_miner_fem.dmi
new file mode 100644
index 00000000000..a0ef3dec6ea
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_miner_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_pathfinder.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_pathfinder.dmi
new file mode 100644
index 00000000000..a224c2d39cf
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_pathfinder.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_pathfinder_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_pathfinder_fem.dmi
new file mode 100644
index 00000000000..e56426367e7
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_pathfinder_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_seccom.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_seccom.dmi
new file mode 100644
index 00000000000..76eb62f1ba9
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_seccom.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_seccom_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_seccom_fem.dmi
new file mode 100644
index 00000000000..4ae1e554e6a
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_seccom_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_security.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_security.dmi
new file mode 100644
index 00000000000..ead02389b85
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_security.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_security_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_security_fem.dmi
new file mode 100644
index 00000000000..30113b93ca6
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_security_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_secweewoo.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_secweewoo.dmi
new file mode 100644
index 00000000000..5211f908f57
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_secweewoo.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/bodysuit_secweewoo_fem.dmi b/icons/clothing/uniform/workwear/bodysuit/bodysuit_secweewoo_fem.dmi
new file mode 100644
index 00000000000..65f8380b567
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/bodysuit_secweewoo_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/skinsuit.dmi b/icons/clothing/uniform/workwear/bodysuit/skinsuit.dmi
new file mode 100644
index 00000000000..7b52bafe173
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/skinsuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/skinsuit_g.dmi b/icons/clothing/uniform/workwear/bodysuit/skinsuit_g.dmi
new file mode 100644
index 00000000000..9ebf34b26ea
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/skinsuit_g.dmi differ
diff --git a/icons/clothing/uniform/misc/skin_taped.dmi b/icons/clothing/uniform/workwear/bodysuit/skinsuit_taped.dmi
similarity index 100%
rename from icons/clothing/uniform/misc/skin_taped.dmi
rename to icons/clothing/uniform/workwear/bodysuit/skinsuit_taped.dmi
diff --git a/icons/clothing/uniform/workwear/bodysuit/skinsuitfem.dmi b/icons/clothing/uniform/workwear/bodysuit/skinsuitfem.dmi
new file mode 100644
index 00000000000..08b9d3fe951
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/skinsuitfem.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/skinsuitfem_g.dmi b/icons/clothing/uniform/workwear/bodysuit/skinsuitfem_g.dmi
new file mode 100644
index 00000000000..bd021689ca7
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/skinsuitfem_g.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/skinsuitfemleo.dmi b/icons/clothing/uniform/workwear/bodysuit/skinsuitfemleo.dmi
new file mode 100644
index 00000000000..7b9fd5e983f
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/skinsuitfemleo.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/skinsuitfemleo_g.dmi b/icons/clothing/uniform/workwear/bodysuit/skinsuitfemleo_g.dmi
new file mode 100644
index 00000000000..dc434592f42
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/skinsuitfemleo_g.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/skinsuitleo.dmi b/icons/clothing/uniform/workwear/bodysuit/skinsuitleo.dmi
new file mode 100644
index 00000000000..a25d298b467
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/skinsuitleo.dmi differ
diff --git a/icons/clothing/uniform/workwear/bodysuit/skinsuitleo_g.dmi b/icons/clothing/uniform/workwear/bodysuit/skinsuitleo_g.dmi
new file mode 100644
index 00000000000..cccdd3c6a68
Binary files /dev/null and b/icons/clothing/uniform/workwear/bodysuit/skinsuitleo_g.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/centcom.dmi b/icons/clothing/uniform/workwear/centcom/centcom.dmi
new file mode 100644
index 00000000000..b5b7a3430c5
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/centcom.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/centcom_commander.dmi b/icons/clothing/uniform/workwear/centcom/centcom_commander.dmi
new file mode 100644
index 00000000000..bb9402ef483
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/centcom_commander.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/centcom_fem.dmi b/icons/clothing/uniform/workwear/centcom/centcom_fem.dmi
new file mode 100644
index 00000000000..27c869253c7
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/centcom_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/centcom_skirt.dmi b/icons/clothing/uniform/workwear/centcom/centcom_skirt.dmi
new file mode 100644
index 00000000000..5e8981a8032
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/centcom_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/cu_suit.dmi b/icons/clothing/uniform/workwear/centcom/cu_suit.dmi
new file mode 100644
index 00000000000..fbf204b3d35
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/cu_suit.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/cu_suit_kh.dmi b/icons/clothing/uniform/workwear/centcom/cu_suit_kh.dmi
new file mode 100644
index 00000000000..27657ecb70a
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/cu_suit_kh.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/ert_uniform.dmi b/icons/clothing/uniform/workwear/centcom/ert_uniform.dmi
new file mode 100644
index 00000000000..ec91bce334a
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/ert_uniform.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/greensuit.dmi b/icons/clothing/uniform/workwear/centcom/greensuit.dmi
new file mode 100644
index 00000000000..6254d37ac10
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/greensuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/greensuit_skirt.dmi b/icons/clothing/uniform/workwear/centcom/greensuit_skirt.dmi
new file mode 100644
index 00000000000..de94dadd429
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/greensuit_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/intern.dmi b/icons/clothing/uniform/workwear/centcom/intern.dmi
new file mode 100644
index 00000000000..b653b2d1190
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/intern.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/military.dmi b/icons/clothing/uniform/workwear/centcom/military.dmi
new file mode 100644
index 00000000000..6f5739833c6
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/military.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/military_eng.dmi b/icons/clothing/uniform/workwear/centcom/military_eng.dmi
new file mode 100644
index 00000000000..1c36010124d
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/military_eng.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/officer.dmi b/icons/clothing/uniform/workwear/centcom/officer.dmi
new file mode 100644
index 00000000000..de9ff353522
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/officer.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/officer_fem.dmi b/icons/clothing/uniform/workwear/centcom/officer_fem.dmi
new file mode 100644
index 00000000000..81dc2c47505
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/officer_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/officer_green.dmi b/icons/clothing/uniform/workwear/centcom/officer_green.dmi
new file mode 100644
index 00000000000..76db6083651
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/officer_green.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/officer_skirt.dmi b/icons/clothing/uniform/workwear/centcom/officer_skirt.dmi
new file mode 100644
index 00000000000..e90f3766fb2
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/officer_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/para_ert_uniform.dmi b/icons/clothing/uniform/workwear/centcom/para_ert_uniform.dmi
new file mode 100644
index 00000000000..63b059ea705
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/para_ert_uniform.dmi differ
diff --git a/icons/clothing/uniform/workwear/centcom/pmd_uniform.dmi b/icons/clothing/uniform/workwear/centcom/pmd_uniform.dmi
new file mode 100644
index 00000000000..e0fae0281d2
Binary files /dev/null and b/icons/clothing/uniform/workwear/centcom/pmd_uniform.dmi differ
diff --git a/icons/clothing/uniform/workwear/circuitry.dmi b/icons/clothing/uniform/workwear/circuitry.dmi
new file mode 100644
index 00000000000..3e19575332b
Binary files /dev/null and b/icons/clothing/uniform/workwear/circuitry.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit.dmi
new file mode 100644
index 00000000000..d24b997e882
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_decal.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_decal.dmi
new file mode 100644
index 00000000000..dbf90feee48
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_decal.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_decal_fem.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_decal_fem.dmi
new file mode 100644
index 00000000000..7e28ff12cf8
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_decal_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_fem.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_fem.dmi
new file mode 100644
index 00000000000..de4eef4d9de
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_hazard.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_hazard.dmi
new file mode 100644
index 00000000000..65b44132a7c
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_hazard.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_hazard_fem.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_hazard_fem.dmi
new file mode 100644
index 00000000000..6a09ddb9acc
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_hazard_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_pattern.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_pattern.dmi
new file mode 100644
index 00000000000..7a5af1ee760
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_pattern.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_pattern_fem.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_pattern_fem.dmi
new file mode 100644
index 00000000000..b43e5d32053
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_pattern_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_striped.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_striped.dmi
new file mode 100644
index 00000000000..ca25ba65b70
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_striped.dmi differ
diff --git a/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_striped_fem.dmi b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_striped_fem.dmi
new file mode 100644
index 00000000000..e447086e1b0
Binary files /dev/null and b/icons/clothing/uniform/workwear/cohesion_suit/cohesionsuit_striped_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/cargo.dmi b/icons/clothing/uniform/workwear/dept_cargo/cargo.dmi
new file mode 100644
index 00000000000..7590f62c91f
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/cargo.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/cargo_skirt.dmi b/icons/clothing/uniform/workwear/dept_cargo/cargo_skirt.dmi
new file mode 100644
index 00000000000..8943fd79523
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/cargo_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/cargof.dmi b/icons/clothing/uniform/workwear/dept_cargo/cargof.dmi
new file mode 100644
index 00000000000..654c66cb8ca
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/cargof.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/cargoj.dmi b/icons/clothing/uniform/workwear/dept_cargo/cargoj.dmi
new file mode 100644
index 00000000000..da561e05613
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/cargoj.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/cargojf.dmi b/icons/clothing/uniform/workwear/dept_cargo/cargojf.dmi
new file mode 100644
index 00000000000..fa5d2490619
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/cargojf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/miner.dmi b/icons/clothing/uniform/workwear/dept_cargo/miner.dmi
new file mode 100644
index 00000000000..2cfc87ea73a
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/miner.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/qm.dmi b/icons/clothing/uniform/workwear/dept_cargo/qm.dmi
new file mode 100644
index 00000000000..8a6e4eb08c1
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/qm.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/qm_skirt.dmi b/icons/clothing/uniform/workwear/dept_cargo/qm_skirt.dmi
new file mode 100644
index 00000000000..c8df828fe9c
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/qm_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/qmf.dmi b/icons/clothing/uniform/workwear/dept_cargo/qmf.dmi
new file mode 100644
index 00000000000..ac24e86b392
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/qmf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/qmj.dmi b/icons/clothing/uniform/workwear/dept_cargo/qmj.dmi
new file mode 100644
index 00000000000..0883be1d648
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/qmj.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_cargo/qmjf.dmi b/icons/clothing/uniform/workwear/dept_cargo/qmjf.dmi
new file mode 100644
index 00000000000..cef7a7efafd
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_cargo/qmjf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_civilian/dress_hop.dmi b/icons/clothing/uniform/workwear/dept_civilian/dress_hop.dmi
new file mode 100644
index 00000000000..f95758b64e1
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_civilian/dress_hop.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_civilian/flight1.dmi b/icons/clothing/uniform/workwear/dept_civilian/flight1.dmi
new file mode 100644
index 00000000000..2869716f114
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_civilian/flight1.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_civilian/flight2.dmi b/icons/clothing/uniform/workwear/dept_civilian/flight2.dmi
new file mode 100644
index 00000000000..ceb36d727b0
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_civilian/flight2.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_civilian/hop.dmi b/icons/clothing/uniform/workwear/dept_civilian/hop.dmi
new file mode 100644
index 00000000000..6677e26ad25
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_civilian/hop.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_civilian/hop_skirt.dmi b/icons/clothing/uniform/workwear/dept_civilian/hop_skirt.dmi
new file mode 100644
index 00000000000..0ca0dc832cb
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_civilian/hop_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_civilian/hopwhimsy.dmi b/icons/clothing/uniform/workwear/dept_civilian/hopwhimsy.dmi
new file mode 100644
index 00000000000..c6300d6a487
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_civilian/hopwhimsy.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_civilian/huresource.dmi b/icons/clothing/uniform/workwear/dept_civilian/huresource.dmi
new file mode 100644
index 00000000000..a663d95646f
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_civilian/huresource.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_civilian/teal_suit.dmi b/icons/clothing/uniform/workwear/dept_civilian/teal_suit.dmi
new file mode 100644
index 00000000000..c4cb237f43f
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_civilian/teal_suit.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_civilian/teal_suit_skirt.dmi b/icons/clothing/uniform/workwear/dept_civilian/teal_suit_skirt.dmi
new file mode 100644
index 00000000000..fa0d64bb064
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_civilian/teal_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_command/bridgeofficer.dmi b/icons/clothing/uniform/workwear/dept_command/bridgeofficer.dmi
new file mode 100644
index 00000000000..86ce8b16cad
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_command/bridgeofficer.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_command/bridgeofficerskirt.dmi b/icons/clothing/uniform/workwear/dept_command/bridgeofficerskirt.dmi
new file mode 100644
index 00000000000..b91d8ef07e7
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_command/bridgeofficerskirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_command/captain.dmi b/icons/clothing/uniform/workwear/dept_command/captain.dmi
new file mode 100644
index 00000000000..bde0a33cb26
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_command/captain.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_command/captain_formal.dmi b/icons/clothing/uniform/workwear/dept_command/captain_formal.dmi
new file mode 100644
index 00000000000..eea2176b5d4
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_command/captain_formal.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_command/captain_skirt.dmi b/icons/clothing/uniform/workwear/dept_command/captain_skirt.dmi
new file mode 100644
index 00000000000..ef58e0ad599
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_command/captain_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_command/dress_cap.dmi b/icons/clothing/uniform/workwear/dept_command/dress_cap.dmi
new file mode 100644
index 00000000000..1ea7b7be829
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_command/dress_cap.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_command/green_suit.dmi b/icons/clothing/uniform/workwear/dept_command/green_suit.dmi
new file mode 100644
index 00000000000..c65f5f5737f
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_command/green_suit.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_command/green_suit_skirt.dmi b/icons/clothing/uniform/workwear/dept_command/green_suit_skirt.dmi
new file mode 100644
index 00000000000..4fd96771ea5
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_command/green_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/atmos.dmi b/icons/clothing/uniform/workwear/dept_engineering/atmos.dmi
new file mode 100644
index 00000000000..49ebfaeaf17
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/atmos.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/atmos_skirt.dmi b/icons/clothing/uniform/workwear/dept_engineering/atmos_skirt.dmi
new file mode 100644
index 00000000000..a6ff5c01df6
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/atmos_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/atmosf.dmi b/icons/clothing/uniform/workwear/dept_engineering/atmosf.dmi
new file mode 100644
index 00000000000..851086f3eab
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/atmosf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/atmosj.dmi b/icons/clothing/uniform/workwear/dept_engineering/atmosj.dmi
new file mode 100644
index 00000000000..998e9e9afff
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/atmosj.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/atmosjf.dmi b/icons/clothing/uniform/workwear/dept_engineering/atmosjf.dmi
new file mode 100644
index 00000000000..4219da2777c
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/atmosjf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/chief.dmi b/icons/clothing/uniform/workwear/dept_engineering/chief.dmi
new file mode 100644
index 00000000000..c71d7aa1acc
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/chief.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/chiefengineer_skirt.dmi b/icons/clothing/uniform/workwear/dept_engineering/chiefengineer_skirt.dmi
new file mode 100644
index 00000000000..240ff6527dd
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/chiefengineer_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/chieff.dmi b/icons/clothing/uniform/workwear/dept_engineering/chieff.dmi
new file mode 100644
index 00000000000..ed67ea14ace
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/chieff.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/chiefj.dmi b/icons/clothing/uniform/workwear/dept_engineering/chiefj.dmi
new file mode 100644
index 00000000000..614a63994ce
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/chiefj.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/chiefjf.dmi b/icons/clothing/uniform/workwear/dept_engineering/chiefjf.dmi
new file mode 100644
index 00000000000..4b4accdf074
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/chiefjf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/engine.dmi b/icons/clothing/uniform/workwear/dept_engineering/engine.dmi
new file mode 100644
index 00000000000..512974aff60
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/engine.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/engine_skirt.dmi b/icons/clothing/uniform/workwear/dept_engineering/engine_skirt.dmi
new file mode 100644
index 00000000000..f5f19ad884e
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/engine_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/enginef.dmi b/icons/clothing/uniform/workwear/dept_engineering/enginef.dmi
new file mode 100644
index 00000000000..22e3740244e
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/enginef.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/enginej.dmi b/icons/clothing/uniform/workwear/dept_engineering/enginej.dmi
new file mode 100644
index 00000000000..ae792184398
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/enginej.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/enginejf.dmi b/icons/clothing/uniform/workwear/dept_engineering/enginejf.dmi
new file mode 100644
index 00000000000..b50ea142e47
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/enginejf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/hazard.dmi b/icons/clothing/uniform/workwear/dept_engineering/hazard.dmi
new file mode 100644
index 00000000000..491e4248da2
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/hazard.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/turtle_eng.dmi b/icons/clothing/uniform/workwear/dept_engineering/turtle_eng.dmi
new file mode 100644
index 00000000000..227616ccd4e
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/turtle_eng.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_engineering/turtle_eng_fem.dmi b/icons/clothing/uniform/workwear/dept_engineering/turtle_eng_fem.dmi
new file mode 100644
index 00000000000..775676d1af1
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_engineering/turtle_eng_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/chemist_new.dmi b/icons/clothing/uniform/workwear/dept_medical/chemist_new.dmi
new file mode 100644
index 00000000000..780e5f80d35
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/chemist_new.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/chemistry.dmi b/icons/clothing/uniform/workwear/dept_medical/chemistry.dmi
new file mode 100644
index 00000000000..4fe1aa97f7a
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/chemistry.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/chemistry_skirt.dmi b/icons/clothing/uniform/workwear/dept_medical/chemistry_skirt.dmi
new file mode 100644
index 00000000000..214d7a7d590
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/chemistry_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/chemistryf.dmi b/icons/clothing/uniform/workwear/dept_medical/chemistryf.dmi
new file mode 100644
index 00000000000..e1883c356d3
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/chemistryf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/chemistryj.dmi b/icons/clothing/uniform/workwear/dept_medical/chemistryj.dmi
new file mode 100644
index 00000000000..67fc045faf9
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/chemistryj.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/chemistryjf.dmi b/icons/clothing/uniform/workwear/dept_medical/chemistryjf.dmi
new file mode 100644
index 00000000000..3f2f37e9f43
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/chemistryjf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/cmo.dmi b/icons/clothing/uniform/workwear/dept_medical/cmo.dmi
new file mode 100644
index 00000000000..5431b0814ae
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/cmo.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/cmo_skirt.dmi b/icons/clothing/uniform/workwear/dept_medical/cmo_skirt.dmi
new file mode 100644
index 00000000000..94de0c620b5
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/cmo_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/cmof.dmi b/icons/clothing/uniform/workwear/dept_medical/cmof.dmi
new file mode 100644
index 00000000000..3c42c2e8076
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/cmof.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/cmoj.dmi b/icons/clothing/uniform/workwear/dept_medical/cmoj.dmi
new file mode 100644
index 00000000000..9633bf9506d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/cmoj.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/cmojf.dmi b/icons/clothing/uniform/workwear/dept_medical/cmojf.dmi
new file mode 100644
index 00000000000..f0d994194cd
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/cmojf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/cmoturtle.dmi b/icons/clothing/uniform/workwear/dept_medical/cmoturtle.dmi
new file mode 100644
index 00000000000..dbe8e540fcb
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/cmoturtle.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/genetics.dmi b/icons/clothing/uniform/workwear/dept_medical/genetics.dmi
new file mode 100644
index 00000000000..e4b70835b4d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/genetics.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/genetics_new.dmi b/icons/clothing/uniform/workwear/dept_medical/genetics_new.dmi
new file mode 100644
index 00000000000..b6fe5949a2d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/genetics_new.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/genetics_skirt.dmi b/icons/clothing/uniform/workwear/dept_medical/genetics_skirt.dmi
new file mode 100644
index 00000000000..f53701d1ac8
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/genetics_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/geneticsf.dmi b/icons/clothing/uniform/workwear/dept_medical/geneticsf.dmi
new file mode 100644
index 00000000000..e89a7d19de2
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/geneticsf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/medical.dmi b/icons/clothing/uniform/workwear/dept_medical/medical.dmi
new file mode 100644
index 00000000000..a95404234bc
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/medical.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/medical_short.dmi b/icons/clothing/uniform/workwear/dept_medical/medical_short.dmi
new file mode 100644
index 00000000000..bcec1ccd0d8
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/medical_short.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/medical_skirt.dmi b/icons/clothing/uniform/workwear/dept_medical/medical_skirt.dmi
new file mode 100644
index 00000000000..db86f06990d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/medical_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/medicalf.dmi b/icons/clothing/uniform/workwear/dept_medical/medicalf.dmi
new file mode 100644
index 00000000000..891212873ff
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/medicalf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/medicalgown.dmi b/icons/clothing/uniform/workwear/dept_medical/medicalgown.dmi
new file mode 100644
index 00000000000..c1b48b6ddfa
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/medicalgown.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/medicalj.dmi b/icons/clothing/uniform/workwear/dept_medical/medicalj.dmi
new file mode 100644
index 00000000000..09762858f9e
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/medicalj.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/medicaljf.dmi b/icons/clothing/uniform/workwear/dept_medical/medicaljf.dmi
new file mode 100644
index 00000000000..dc6418356f1
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/medicaljf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/nurse.dmi b/icons/clothing/uniform/workwear/dept_medical/nurse.dmi
new file mode 100644
index 00000000000..3171fb48315
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/nurse.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/nursesuit.dmi b/icons/clothing/uniform/workwear/dept_medical/nursesuit.dmi
new file mode 100644
index 00000000000..3a781d1f741
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/nursesuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/orderly.dmi b/icons/clothing/uniform/workwear/dept_medical/orderly.dmi
new file mode 100644
index 00000000000..f67652ad1e6
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/orderly.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/paramedic-dark.dmi b/icons/clothing/uniform/workwear/dept_medical/paramedic-dark.dmi
new file mode 100644
index 00000000000..0d32362834c
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/paramedic-dark.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/paramedic-dark_skirt.dmi b/icons/clothing/uniform/workwear/dept_medical/paramedic-dark_skirt.dmi
new file mode 100644
index 00000000000..8d38a846c7f
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/paramedic-dark_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/paramedic-light.dmi b/icons/clothing/uniform/workwear/dept_medical/paramedic-light.dmi
new file mode 100644
index 00000000000..770c9842d18
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/paramedic-light.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/paramedic_skirt.dmi b/icons/clothing/uniform/workwear/dept_medical/paramedic_skirt.dmi
new file mode 100644
index 00000000000..94366a1efbc
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/paramedic_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/psych.dmi b/icons/clothing/uniform/workwear/dept_medical/psych.dmi
new file mode 100644
index 00000000000..41a920613af
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/psych.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/psychturtle.dmi b/icons/clothing/uniform/workwear/dept_medical/psychturtle.dmi
new file mode 100644
index 00000000000..4f5f5c58e76
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/psychturtle.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/psychturtle_fem.dmi b/icons/clothing/uniform/workwear/dept_medical/psychturtle_fem.dmi
new file mode 100644
index 00000000000..608ff1c5ac6
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/psychturtle_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubsblack.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubsblack.dmi
new file mode 100644
index 00000000000..4d3ec172ef5
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubsblack.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubsblack_fem.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubsblack_fem.dmi
new file mode 100644
index 00000000000..908d6562c36
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubsblack_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubsblue.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubsblue.dmi
new file mode 100644
index 00000000000..c767cefc69a
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubsblue.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubsblue_fem.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubsblue_fem.dmi
new file mode 100644
index 00000000000..1aec9958e6f
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubsblue_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubsgreen.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubsgreen.dmi
new file mode 100644
index 00000000000..d861821f0a0
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubsgreen.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubsgreen_fem.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubsgreen_fem.dmi
new file mode 100644
index 00000000000..ae6e4caf451
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubsgreen_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubsnavyblue.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubsnavyblue.dmi
new file mode 100644
index 00000000000..2e1caa969d1
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubsnavyblue.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubsnavyblue_fem.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubsnavyblue_fem.dmi
new file mode 100644
index 00000000000..a1948e441a5
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubsnavyblue_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubspurple.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubspurple.dmi
new file mode 100644
index 00000000000..9fb4dffc2df
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubspurple.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/scrubspurple_fem.dmi b/icons/clothing/uniform/workwear/dept_medical/scrubspurple_fem.dmi
new file mode 100644
index 00000000000..895d9d56fe1
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/scrubspurple_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/sterile.dmi b/icons/clothing/uniform/workwear/dept_medical/sterile.dmi
new file mode 100644
index 00000000000..5657c505902
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/sterile.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/turtle_med.dmi b/icons/clothing/uniform/workwear/dept_medical/turtle_med.dmi
new file mode 100644
index 00000000000..afd6cc349a9
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/turtle_med.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/turtle_med_fem.dmi b/icons/clothing/uniform/workwear/dept_medical/turtle_med_fem.dmi
new file mode 100644
index 00000000000..a729dd51b4b
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/turtle_med_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/virologist_new.dmi b/icons/clothing/uniform/workwear/dept_medical/virologist_new.dmi
new file mode 100644
index 00000000000..873b4ca74ed
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/virologist_new.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/virology.dmi b/icons/clothing/uniform/workwear/dept_medical/virology.dmi
new file mode 100644
index 00000000000..351a05e2b5a
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/virology.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/virology_skirt.dmi b/icons/clothing/uniform/workwear/dept_medical/virology_skirt.dmi
new file mode 100644
index 00000000000..397b957a276
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/virology_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/virologyf.dmi b/icons/clothing/uniform/workwear/dept_medical/virologyf.dmi
new file mode 100644
index 00000000000..47abfc6372e
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/virologyf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/virologyj.dmi b/icons/clothing/uniform/workwear/dept_medical/virologyj.dmi
new file mode 100644
index 00000000000..9f93eae6c4d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/virologyj.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_medical/virologyjf.dmi b/icons/clothing/uniform/workwear/dept_medical/virologyjf.dmi
new file mode 100644
index 00000000000..b0303ba174d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_medical/virologyjf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/director.dmi b/icons/clothing/uniform/workwear/dept_science/director.dmi
new file mode 100644
index 00000000000..6f702e37f87
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/director.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/director_skirt.dmi b/icons/clothing/uniform/workwear/dept_science/director_skirt.dmi
new file mode 100644
index 00000000000..db42fb67c86
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/director_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/dress_rd.dmi b/icons/clothing/uniform/workwear/dept_science/dress_rd.dmi
new file mode 100644
index 00000000000..d408259fefe
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/dress_rd.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/explorer.dmi b/icons/clothing/uniform/workwear/dept_science/explorer.dmi
new file mode 100644
index 00000000000..5d78e9ab16f
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/explorer.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/explorer_fem.dmi b/icons/clothing/uniform/workwear/dept_science/explorer_fem.dmi
new file mode 100644
index 00000000000..2a63408fcb7
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/explorer_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/rdalt.dmi b/icons/clothing/uniform/workwear/dept_science/rdalt.dmi
new file mode 100644
index 00000000000..18834523469
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/rdalt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/rdturtle.dmi b/icons/clothing/uniform/workwear/dept_science/rdturtle.dmi
new file mode 100644
index 00000000000..ed6e1a03839
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/rdturtle.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/rdturtle_skirt.dmi b/icons/clothing/uniform/workwear/dept_science/rdturtle_skirt.dmi
new file mode 100644
index 00000000000..4f732abeb16
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/rdturtle_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/rdwhimsy_skirt.dmi b/icons/clothing/uniform/workwear/dept_science/rdwhimsy_skirt.dmi
new file mode 100644
index 00000000000..12158355bb7
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/rdwhimsy_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/robotics.dmi b/icons/clothing/uniform/workwear/dept_science/robotics.dmi
new file mode 100644
index 00000000000..286f824588f
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/robotics.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/robotics2.dmi b/icons/clothing/uniform/workwear/dept_science/robotics2.dmi
new file mode 100644
index 00000000000..a870fe9916d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/robotics2.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/robotics_skirt.dmi b/icons/clothing/uniform/workwear/dept_science/robotics_skirt.dmi
new file mode 100644
index 00000000000..14a8c7ea263
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/robotics_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/roboticsf.dmi b/icons/clothing/uniform/workwear/dept_science/roboticsf.dmi
new file mode 100644
index 00000000000..86162154b73
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/roboticsf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/science.dmi b/icons/clothing/uniform/workwear/dept_science/science.dmi
new file mode 100644
index 00000000000..e64b0955cc0
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/science.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/sciencef.dmi b/icons/clothing/uniform/workwear/dept_science/sciencef.dmi
new file mode 100644
index 00000000000..0be02a0cd31
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/sciencef.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/sciencej.dmi b/icons/clothing/uniform/workwear/dept_science/sciencej.dmi
new file mode 100644
index 00000000000..bbe3130f5cf
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/sciencej.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/sciencejf.dmi b/icons/clothing/uniform/workwear/dept_science/sciencejf.dmi
new file mode 100644
index 00000000000..31de645dbfc
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/sciencejf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/scientist_new.dmi b/icons/clothing/uniform/workwear/dept_science/scientist_new.dmi
new file mode 100644
index 00000000000..27a7ac5c53c
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/scientist_new.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/toxins_skirt.dmi b/icons/clothing/uniform/workwear/dept_science/toxins_skirt.dmi
new file mode 100644
index 00000000000..25054927d07
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/toxins_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/turtle_sci.dmi b/icons/clothing/uniform/workwear/dept_science/turtle_sci.dmi
new file mode 100644
index 00000000000..e90b4177d97
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/turtle_sci.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_science/turtle_sci_fem.dmi b/icons/clothing/uniform/workwear/dept_science/turtle_sci_fem.dmi
new file mode 100644
index 00000000000..f5404c19d95
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_science/turtle_sci_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/det_corporate.dmi b/icons/clothing/uniform/workwear/dept_security/det_corporate.dmi
new file mode 100644
index 00000000000..63d15210e99
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/det_corporate.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/det_corporate_fem.dmi b/icons/clothing/uniform/workwear/dept_security/det_corporate_fem.dmi
new file mode 100644
index 00000000000..21af5a915c4
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/det_corporate_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/detective.dmi b/icons/clothing/uniform/workwear/dept_security/detective.dmi
new file mode 100644
index 00000000000..c039a97d735
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/detective.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/detective2.dmi b/icons/clothing/uniform/workwear/dept_security/detective2.dmi
new file mode 100644
index 00000000000..3ebb5861e19
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/detective2.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/detective2_fem.dmi b/icons/clothing/uniform/workwear/dept_security/detective2_fem.dmi
new file mode 100644
index 00000000000..aaf10afb0a7
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/detective2_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/detective3.dmi b/icons/clothing/uniform/workwear/dept_security/detective3.dmi
new file mode 100644
index 00000000000..84625d05c28
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/detective3.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/detective3_fem.dmi b/icons/clothing/uniform/workwear/dept_security/detective3_fem.dmi
new file mode 100644
index 00000000000..200554ea435
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/detective3_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/detective_fem.dmi b/icons/clothing/uniform/workwear/dept_security/detective_fem.dmi
new file mode 100644
index 00000000000..24e0edf05d5
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/detective_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/detective_skirt.dmi b/icons/clothing/uniform/workwear/dept_security/detective_skirt.dmi
new file mode 100644
index 00000000000..a415cf6f4a7
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/detective_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/dispatch.dmi b/icons/clothing/uniform/workwear/dept_security/dispatch.dmi
new file mode 100644
index 00000000000..b695520b3ed
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/dispatch.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/greydet_skirt.dmi b/icons/clothing/uniform/workwear/dept_security/greydet_skirt.dmi
new file mode 100644
index 00000000000..845ce8f6f29
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/greydet_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hos.dmi b/icons/clothing/uniform/workwear/dept_security/hos.dmi
new file mode 100644
index 00000000000..044888f5dea
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hos.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hos_corporate.dmi b/icons/clothing/uniform/workwear/dept_security/hos_corporate.dmi
new file mode 100644
index 00000000000..f957cde104c
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hos_corporate.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hos_corporate_fem.dmi b/icons/clothing/uniform/workwear/dept_security/hos_corporate_fem.dmi
new file mode 100644
index 00000000000..3023daff283
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hos_corporate_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hos_fem.dmi b/icons/clothing/uniform/workwear/dept_security/hos_fem.dmi
new file mode 100644
index 00000000000..4c8b89ed523
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hos_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hos_formal_fem.dmi b/icons/clothing/uniform/workwear/dept_security/hos_formal_fem.dmi
new file mode 100644
index 00000000000..3472b944049
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hos_formal_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hos_formal_male.dmi b/icons/clothing/uniform/workwear/dept_security/hos_formal_male.dmi
new file mode 100644
index 00000000000..a158b86307d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hos_formal_male.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hosalt_skirt.dmi b/icons/clothing/uniform/workwear/dept_security/hosalt_skirt.dmi
new file mode 100644
index 00000000000..c57bb7df488
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hosalt_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hosblueclothes.dmi b/icons/clothing/uniform/workwear/dept_security/hosblueclothes.dmi
new file mode 100644
index 00000000000..1e857373ac4
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hosblueclothes.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hosblueclothes_fem.dmi b/icons/clothing/uniform/workwear/dept_security/hosblueclothes_fem.dmi
new file mode 100644
index 00000000000..45c62b02c82
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hosblueclothes_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hosf.dmi b/icons/clothing/uniform/workwear/dept_security/hosf.dmi
new file mode 100644
index 00000000000..1a06adead14
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hosf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/hosturtle.dmi b/icons/clothing/uniform/workwear/dept_security/hosturtle.dmi
new file mode 100644
index 00000000000..13e6dc320b6
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/hosturtle.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/jensen.dmi b/icons/clothing/uniform/workwear/dept_security/jensen.dmi
new file mode 100644
index 00000000000..69d76c3f026
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/jensen.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/officerblueclothes.dmi b/icons/clothing/uniform/workwear/dept_security/officerblueclothes.dmi
new file mode 100644
index 00000000000..9e5bc467a3e
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/officerblueclothes.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/officerblueclothes_fem.dmi b/icons/clothing/uniform/workwear/dept_security/officerblueclothes_fem.dmi
new file mode 100644
index 00000000000..3e0eca6195e
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/officerblueclothes_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/prison.dmi b/icons/clothing/uniform/workwear/dept_security/prison.dmi
new file mode 100644
index 00000000000..a413d1ce822
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/prison.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/prison_skirt.dmi b/icons/clothing/uniform/workwear/dept_security/prison_skirt.dmi
new file mode 100644
index 00000000000..3ec592d8476
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/prison_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/redshirt2.dmi b/icons/clothing/uniform/workwear/dept_security/redshirt2.dmi
new file mode 100644
index 00000000000..7f98b62d20b
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/redshirt2.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/redshirt2_fem.dmi b/icons/clothing/uniform/workwear/dept_security/redshirt2_fem.dmi
new file mode 100644
index 00000000000..1052f369cb0
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/redshirt2_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/rhos_skirt.dmi b/icons/clothing/uniform/workwear/dept_security/rhos_skirt.dmi
new file mode 100644
index 00000000000..d53d42b2531
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/rhos_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/rwarden_skirt.dmi b/icons/clothing/uniform/workwear/dept_security/rwarden_skirt.dmi
new file mode 100644
index 00000000000..0f7dfd7e69e
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/rwarden_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/sec_corporate.dmi b/icons/clothing/uniform/workwear/dept_security/sec_corporate.dmi
new file mode 100644
index 00000000000..8ebf0e99425
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/sec_corporate.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/sec_corporate_fem.dmi b/icons/clothing/uniform/workwear/dept_security/sec_corporate_fem.dmi
new file mode 100644
index 00000000000..4b0c2ee91bf
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/sec_corporate_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/sec_skirt.dmi b/icons/clothing/uniform/workwear/dept_security/sec_skirt.dmi
new file mode 100644
index 00000000000..34d310b837a
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/sec_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/security.dmi b/icons/clothing/uniform/workwear/dept_security/security.dmi
new file mode 100644
index 00000000000..c5093c2f16f
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/security.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/security_fem.dmi b/icons/clothing/uniform/workwear/dept_security/security_fem.dmi
new file mode 100644
index 00000000000..2a0a619e9a9
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/security_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/securityf.dmi b/icons/clothing/uniform/workwear/dept_security/securityf.dmi
new file mode 100644
index 00000000000..dc385d56c6d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/securityf.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/swatunder.dmi b/icons/clothing/uniform/workwear/dept_security/swatunder.dmi
new file mode 100644
index 00000000000..5424bdcdb06
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/swatunder.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/turtle_sec.dmi b/icons/clothing/uniform/workwear/dept_security/turtle_sec.dmi
new file mode 100644
index 00000000000..b238a246535
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/turtle_sec.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/turtle_sec_fem.dmi b/icons/clothing/uniform/workwear/dept_security/turtle_sec_fem.dmi
new file mode 100644
index 00000000000..66324dcdaa4
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/turtle_sec_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/warden.dmi b/icons/clothing/uniform/workwear/dept_security/warden.dmi
new file mode 100644
index 00000000000..eeb52d1198c
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/warden.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/warden_corporate.dmi b/icons/clothing/uniform/workwear/dept_security/warden_corporate.dmi
new file mode 100644
index 00000000000..32dbc6e89a3
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/warden_corporate.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/warden_corporate_fem.dmi b/icons/clothing/uniform/workwear/dept_security/warden_corporate_fem.dmi
new file mode 100644
index 00000000000..f7a5830067d
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/warden_corporate_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/warden_fem.dmi b/icons/clothing/uniform/workwear/dept_security/warden_fem.dmi
new file mode 100644
index 00000000000..a32830553dc
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/warden_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/wardenblueclothes.dmi b/icons/clothing/uniform/workwear/dept_security/wardenblueclothes.dmi
new file mode 100644
index 00000000000..a9933d15791
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/wardenblueclothes.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/wardenblueclothes_fem.dmi b/icons/clothing/uniform/workwear/dept_security/wardenblueclothes_fem.dmi
new file mode 100644
index 00000000000..6190c40ccf7
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/wardenblueclothes_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/dept_security/wardenf.dmi b/icons/clothing/uniform/workwear/dept_security/wardenf.dmi
new file mode 100644
index 00000000000..d100c8402b7
Binary files /dev/null and b/icons/clothing/uniform/workwear/dept_security/wardenf.dmi differ
diff --git a/icons/clothing/uniform/workwear/futuristic.dmi b/icons/clothing/uniform/workwear/futuristic.dmi
new file mode 100644
index 00000000000..60e9f4dcb0b
Binary files /dev/null and b/icons/clothing/uniform/workwear/futuristic.dmi differ
diff --git a/icons/clothing/uniform/workwear/gear_harness.dmi b/icons/clothing/uniform/workwear/gear_harness.dmi
new file mode 100644
index 00000000000..13ce01e7443
Binary files /dev/null and b/icons/clothing/uniform/workwear/gear_harness.dmi differ
diff --git a/icons/clothing/uniform/workwear/gray_smooth_jumpsuit.dmi b/icons/clothing/uniform/workwear/gray_smooth_jumpsuit.dmi
new file mode 100644
index 00000000000..293fc6fa97e
Binary files /dev/null and b/icons/clothing/uniform/workwear/gray_smooth_jumpsuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/janitor/janimaid.dmi b/icons/clothing/uniform/workwear/janitor/janimaid.dmi
new file mode 100644
index 00000000000..407f8330362
Binary files /dev/null and b/icons/clothing/uniform/workwear/janitor/janimaid.dmi differ
diff --git a/icons/clothing/uniform/workwear/janitor/janitor.dmi b/icons/clothing/uniform/workwear/janitor/janitor.dmi
new file mode 100644
index 00000000000..1987987356d
Binary files /dev/null and b/icons/clothing/uniform/workwear/janitor/janitor.dmi differ
diff --git a/icons/clothing/uniform/workwear/janitor/janitor_fem.dmi b/icons/clothing/uniform/workwear/janitor/janitor_fem.dmi
new file mode 100644
index 00000000000..71b919f7fe7
Binary files /dev/null and b/icons/clothing/uniform/workwear/janitor/janitor_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/janitor/janitor_sc.dmi b/icons/clothing/uniform/workwear/janitor/janitor_sc.dmi
new file mode 100644
index 00000000000..82d485d1ba8
Binary files /dev/null and b/icons/clothing/uniform/workwear/janitor/janitor_sc.dmi differ
diff --git a/icons/clothing/uniform/workwear/janitor/janitor_skirt.dmi b/icons/clothing/uniform/workwear/janitor/janitor_skirt.dmi
new file mode 100644
index 00000000000..cdf609a60fc
Binary files /dev/null and b/icons/clothing/uniform/workwear/janitor/janitor_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/laborer/frontier.dmi b/icons/clothing/uniform/workwear/laborer/frontier.dmi
new file mode 100644
index 00000000000..91c87a31ec2
Binary files /dev/null and b/icons/clothing/uniform/workwear/laborer/frontier.dmi differ
diff --git a/icons/clothing/uniform/workwear/laborer/furup.dmi b/icons/clothing/uniform/workwear/laborer/furup.dmi
new file mode 100644
index 00000000000..d404899d14c
Binary files /dev/null and b/icons/clothing/uniform/workwear/laborer/furup.dmi differ
diff --git a/icons/clothing/uniform/workwear/laborer/overalls.dmi b/icons/clothing/uniform/workwear/laborer/overalls.dmi
new file mode 100644
index 00000000000..7b2198195b5
Binary files /dev/null and b/icons/clothing/uniform/workwear/laborer/overalls.dmi differ
diff --git a/icons/clothing/uniform/workwear/laborer/overalls_fem.dmi b/icons/clothing/uniform/workwear/laborer/overalls_fem.dmi
new file mode 100644
index 00000000000..175658161c2
Binary files /dev/null and b/icons/clothing/uniform/workwear/laborer/overalls_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/laborer/overalls_sleek.dmi b/icons/clothing/uniform/workwear/laborer/overalls_sleek.dmi
new file mode 100644
index 00000000000..8d7325a9a40
Binary files /dev/null and b/icons/clothing/uniform/workwear/laborer/overalls_sleek.dmi differ
diff --git a/icons/clothing/uniform/workwear/laborer/overalls_sleek_fem.dmi b/icons/clothing/uniform/workwear/laborer/overalls_sleek_fem.dmi
new file mode 100644
index 00000000000..e65d84ecd31
Binary files /dev/null and b/icons/clothing/uniform/workwear/laborer/overalls_sleek_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/military/bdu_desert.dmi b/icons/clothing/uniform/workwear/military/bdu_desert.dmi
new file mode 100644
index 00000000000..db9886d7a23
Binary files /dev/null and b/icons/clothing/uniform/workwear/military/bdu_desert.dmi differ
diff --git a/icons/clothing/uniform/workwear/military/bdu_olive.dmi b/icons/clothing/uniform/workwear/military/bdu_olive.dmi
new file mode 100644
index 00000000000..ae89b02f6f9
Binary files /dev/null and b/icons/clothing/uniform/workwear/military/bdu_olive.dmi differ
diff --git a/icons/clothing/uniform/workwear/military/bdu_russoblue.dmi b/icons/clothing/uniform/workwear/military/bdu_russoblue.dmi
new file mode 100644
index 00000000000..d6a6a8630cb
Binary files /dev/null and b/icons/clothing/uniform/workwear/military/bdu_russoblue.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/aether.dmi b/icons/clothing/uniform/workwear/misc_corporations/aether.dmi
new file mode 100644
index 00000000000..e1ff66f69e4
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/aether.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/confed.dmi b/icons/clothing/uniform/workwear/misc_corporations/confed.dmi
new file mode 100644
index 00000000000..12c9fd97278
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/confed.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/focal.dmi b/icons/clothing/uniform/workwear/misc_corporations/focal.dmi
new file mode 100644
index 00000000000..da758cc9f40
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/focal.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/heph.dmi b/icons/clothing/uniform/workwear/misc_corporations/heph.dmi
new file mode 100644
index 00000000000..680c2788d06
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/heph.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/heph_fem.dmi b/icons/clothing/uniform/workwear/misc_corporations/heph_fem.dmi
new file mode 100644
index 00000000000..228720d064c
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/heph_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/mbill.dmi b/icons/clothing/uniform/workwear/misc_corporations/mbill.dmi
new file mode 100644
index 00000000000..d6a1942f7c6
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/mbill.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/mechanic.dmi b/icons/clothing/uniform/workwear/misc_corporations/mechanic.dmi
new file mode 100644
index 00000000000..ed4ee7849b9
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/mechanic.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/pcrc.dmi b/icons/clothing/uniform/workwear/misc_corporations/pcrc.dmi
new file mode 100644
index 00000000000..f84b5a55460
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/pcrc.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/pcrc_fem.dmi b/icons/clothing/uniform/workwear/misc_corporations/pcrc_fem.dmi
new file mode 100644
index 00000000000..c801ac4e768
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/pcrc_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/saare.dmi b/icons/clothing/uniform/workwear/misc_corporations/saare.dmi
new file mode 100644
index 00000000000..725a5bf7c1b
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/saare.dmi differ
diff --git a/icons/clothing/uniform/workwear/misc_corporations/saare_fem.dmi b/icons/clothing/uniform/workwear/misc_corporations/saare_fem.dmi
new file mode 100644
index 00000000000..688208aecd2
Binary files /dev/null and b/icons/clothing/uniform/workwear/misc_corporations/saare_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/npass.dmi b/icons/clothing/uniform/workwear/npass.dmi
new file mode 100644
index 00000000000..4767b160f85
Binary files /dev/null and b/icons/clothing/uniform/workwear/npass.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/dress/black.dmi b/icons/clothing/uniform/workwear/oricon/dress/black.dmi
new file mode 100644
index 00000000000..3e6abbdf27b
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/dress/black.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/dress/black_command.dmi b/icons/clothing/uniform/workwear/oricon/dress/black_command.dmi
new file mode 100644
index 00000000000..d9773ae068a
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/dress/black_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/dress/grey.dmi b/icons/clothing/uniform/workwear/oricon/dress/grey.dmi
new file mode 100644
index 00000000000..11e1e19ae07
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/dress/grey.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/dress/grey_command.dmi b/icons/clothing/uniform/workwear/oricon/dress/grey_command.dmi
new file mode 100644
index 00000000000..3ef4150c3b9
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/dress/grey_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/pt/expedition.dmi b/icons/clothing/uniform/workwear/oricon/pt/expedition.dmi
new file mode 100644
index 00000000000..f115bc53f06
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/pt/expedition.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/pt/fleet.dmi b/icons/clothing/uniform/workwear/oricon/pt/fleet.dmi
new file mode 100644
index 00000000000..6087a87cb31
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/pt/fleet.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/pt/marine.dmi b/icons/clothing/uniform/workwear/oricon/pt/marine.dmi
new file mode 100644
index 00000000000..64f481a8f18
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/pt/marine.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/pt/miami.dmi b/icons/clothing/uniform/workwear/oricon/pt/miami.dmi
new file mode 100644
index 00000000000..426014ea711
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/pt/miami.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/service/green.dmi b/icons/clothing/uniform/workwear/oricon/service/green.dmi
new file mode 100644
index 00000000000..41569dbc127
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/service/green.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/service/green_command.dmi b/icons/clothing/uniform/workwear/oricon/service/green_command.dmi
new file mode 100644
index 00000000000..8aad7ed1880
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/service/green_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/service/white.dmi b/icons/clothing/uniform/workwear/oricon/service/white.dmi
new file mode 100644
index 00000000000..ed3f7015085
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/service/white.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black.dmi b/icons/clothing/uniform/workwear/oricon/utility/black.dmi
new file mode 100644
index 00000000000..6b0b5c73549
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black.dmi differ
diff --git a/icons/clothing/uniform/rank/utility/blueshield.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_blueshield.dmi
similarity index 78%
rename from icons/clothing/uniform/rank/utility/blueshield.dmi
rename to icons/clothing/uniform/workwear/oricon/utility/black_blueshield.dmi
index cea58a1c510..263628e3417 100644
Binary files a/icons/clothing/uniform/rank/utility/blueshield.dmi and b/icons/clothing/uniform/workwear/oricon/utility/black_blueshield.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_command.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_command.dmi
new file mode 100644
index 00000000000..b0218f3f21a
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_crew.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_crew.dmi
new file mode 100644
index 00000000000..1df1ca22d9b
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_crew.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_eng.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_eng.dmi
new file mode 100644
index 00000000000..2cdb18704ba
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_eng.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_eng_command.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_eng_command.dmi
new file mode 100644
index 00000000000..9aad41d5c23
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_eng_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_med.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_med.dmi
new file mode 100644
index 00000000000..19a7be9329c
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_med.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_med_command.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_med_command.dmi
new file mode 100644
index 00000000000..118cb10eb36
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_med_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_sci.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_sci.dmi
new file mode 100644
index 00000000000..33800d4fbbc
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_sci.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_sci_command.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_sci_command.dmi
new file mode 100644
index 00000000000..1f2d22077f6
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_sci_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_sec.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_sec.dmi
new file mode 100644
index 00000000000..446b322940e
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_sec.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_sec_command.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_sec_command.dmi
new file mode 100644
index 00000000000..3b849272e18
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_sec_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/black_sup.dmi b/icons/clothing/uniform/workwear/oricon/utility/black_sup.dmi
new file mode 100644
index 00000000000..d23033ba3c4
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/black_sup.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/green.dmi b/icons/clothing/uniform/workwear/oricon/utility/green.dmi
new file mode 100644
index 00000000000..9e31049de27
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/green.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/grey.dmi b/icons/clothing/uniform/workwear/oricon/utility/grey.dmi
new file mode 100644
index 00000000000..d20d839203b
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/grey.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/grey_command.dmi b/icons/clothing/uniform/workwear/oricon/utility/grey_command.dmi
new file mode 100644
index 00000000000..d17baa81596
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/grey_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/grey_eng.dmi b/icons/clothing/uniform/workwear/oricon/utility/grey_eng.dmi
new file mode 100644
index 00000000000..18c1edf8ce0
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/grey_eng.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/grey_med.dmi b/icons/clothing/uniform/workwear/oricon/utility/grey_med.dmi
new file mode 100644
index 00000000000..b1ce68e8e3a
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/grey_med.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/grey_sci.dmi b/icons/clothing/uniform/workwear/oricon/utility/grey_sci.dmi
new file mode 100644
index 00000000000..39c8db4554f
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/grey_sci.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/grey_sec.dmi b/icons/clothing/uniform/workwear/oricon/utility/grey_sec.dmi
new file mode 100644
index 00000000000..09c0c9136f0
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/grey_sec.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/grey_sup.dmi b/icons/clothing/uniform/workwear/oricon/utility/grey_sup.dmi
new file mode 100644
index 00000000000..e831be521ee
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/grey_sup.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/lightnavy.dmi b/icons/clothing/uniform/workwear/oricon/utility/lightnavy.dmi
new file mode 100644
index 00000000000..a38b2d26479
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/lightnavy.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/navy.dmi b/icons/clothing/uniform/workwear/oricon/utility/navy.dmi
new file mode 100644
index 00000000000..c78fea4979c
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/navy.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/navy_combat.dmi b/icons/clothing/uniform/workwear/oricon/utility/navy_combat.dmi
new file mode 100644
index 00000000000..89c1a38d828
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/navy_combat.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/navy_command.dmi b/icons/clothing/uniform/workwear/oricon/utility/navy_command.dmi
new file mode 100644
index 00000000000..c009acb52d5
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/navy_command.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/navy_eng.dmi b/icons/clothing/uniform/workwear/oricon/utility/navy_eng.dmi
new file mode 100644
index 00000000000..8a42b711210
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/navy_eng.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/navy_med.dmi b/icons/clothing/uniform/workwear/oricon/utility/navy_med.dmi
new file mode 100644
index 00000000000..fa01877d4f9
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/navy_med.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/navy_officer.dmi b/icons/clothing/uniform/workwear/oricon/utility/navy_officer.dmi
new file mode 100644
index 00000000000..528beb0a3ed
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/navy_officer.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/navy_sec.dmi b/icons/clothing/uniform/workwear/oricon/utility/navy_sec.dmi
new file mode 100644
index 00000000000..9d39ad5ad94
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/navy_sec.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/navy_sup.dmi b/icons/clothing/uniform/workwear/oricon/utility/navy_sup.dmi
new file mode 100644
index 00000000000..448a5c500a8
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/navy_sup.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/tan.dmi b/icons/clothing/uniform/workwear/oricon/utility/tan.dmi
new file mode 100644
index 00000000000..266c437e90b
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/tan.dmi differ
diff --git a/icons/clothing/uniform/workwear/oricon/utility/terran.dmi b/icons/clothing/uniform/workwear/oricon/utility/terran.dmi
new file mode 100644
index 00000000000..1a5cccf9526
Binary files /dev/null and b/icons/clothing/uniform/workwear/oricon/utility/terran.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-assistant.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-assistant.dmi
new file mode 100644
index 00000000000..098d800879b
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-assistant.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-bartender.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-bartender.dmi
new file mode 100644
index 00000000000..4868a732340
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-bartender.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-ce.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-ce.dmi
new file mode 100644
index 00000000000..ebd6c738f53
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-ce.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-chaplain.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-chaplain.dmi
new file mode 100644
index 00000000000..855105debcc
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-chaplain.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-chef.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-chef.dmi
new file mode 100644
index 00000000000..2340959e21f
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-chef.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-engineer.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-engineer.dmi
new file mode 100644
index 00000000000..c3c113fa315
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-engineer.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-librarian.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-librarian.dmi
new file mode 100644
index 00000000000..4b651cb5ac8
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-librarian.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-medical.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-medical.dmi
new file mode 100644
index 00000000000..c5f3d1cf59c
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-medical.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-rd.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-rd.dmi
new file mode 100644
index 00000000000..06d8c65a27e
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-rd.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-science.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-science.dmi
new file mode 100644
index 00000000000..7dfc97d314c
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-science.dmi differ
diff --git a/icons/clothing/uniform/workwear/pressuresuit/vox-civ-security.dmi b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-security.dmi
new file mode 100644
index 00000000000..c2af02f8488
Binary files /dev/null and b/icons/clothing/uniform/workwear/pressuresuit/vox-civ-security.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/adlr.dmi b/icons/clothing/uniform/workwear/replika/adlr.dmi
new file mode 100644
index 00000000000..8afd29d7b4c
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/adlr.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/arar.dmi b/icons/clothing/uniform/workwear/replika/arar.dmi
new file mode 100644
index 00000000000..1cee37b8f34
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/arar.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/eulr.dmi b/icons/clothing/uniform/workwear/replika/eulr.dmi
new file mode 100644
index 00000000000..ca0371daef9
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/eulr.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/fklr.dmi b/icons/clothing/uniform/workwear/replika/fklr.dmi
new file mode 100644
index 00000000000..ca969f9a936
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/fklr.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/gestalt.dmi b/icons/clothing/uniform/workwear/replika/gestalt.dmi
new file mode 100644
index 00000000000..c4aa14f90f6
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/gestalt.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/gestalt_fem.dmi b/icons/clothing/uniform/workwear/replika/gestalt_fem.dmi
new file mode 100644
index 00000000000..af6326595f3
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/gestalt_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/gestalt_skirt.dmi b/icons/clothing/uniform/workwear/replika/gestalt_skirt.dmi
new file mode 100644
index 00000000000..3e4fefa0abd
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/gestalt_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/gestalt_sleeveless.dmi b/icons/clothing/uniform/workwear/replika/gestalt_sleeveless.dmi
new file mode 100644
index 00000000000..c4d44a6cc3c
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/gestalt_sleeveless.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/klbr.dmi b/icons/clothing/uniform/workwear/replika/klbr.dmi
new file mode 100644
index 00000000000..6b0871ed2a7
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/klbr.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/lstr.dmi b/icons/clothing/uniform/workwear/replika/lstr.dmi
new file mode 100644
index 00000000000..4e21f63490e
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/lstr.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/lstr_alt.dmi b/icons/clothing/uniform/workwear/replika/lstr_alt.dmi
new file mode 100644
index 00000000000..38a86565c2b
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/lstr_alt.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/sakr.dmi b/icons/clothing/uniform/workwear/replika/sakr.dmi
new file mode 100644
index 00000000000..fba9fa0a614
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/sakr.dmi differ
diff --git a/icons/clothing/uniform/workwear/replika/stcr.dmi b/icons/clothing/uniform/workwear/replika/stcr.dmi
new file mode 100644
index 00000000000..b88393085d4
Binary files /dev/null and b/icons/clothing/uniform/workwear/replika/stcr.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/ba_suit.dmi b/icons/clothing/uniform/workwear/service/ba_suit.dmi
new file mode 100644
index 00000000000..37bdc55ddd8
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/ba_suit.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/ba_suit_skirt.dmi b/icons/clothing/uniform/workwear/service/ba_suit_skirt.dmi
new file mode 100644
index 00000000000..4bf915e8c0f
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/ba_suit_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/barman_skirt.dmi b/icons/clothing/uniform/workwear/service/barman_skirt.dmi
new file mode 100644
index 00000000000..d667a8de0bd
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/barman_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/btc_bartender.dmi b/icons/clothing/uniform/workwear/service/btc_bartender.dmi
new file mode 100644
index 00000000000..d79aba9fa0b
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/btc_bartender.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/chaplain.dmi b/icons/clothing/uniform/workwear/service/chaplain.dmi
new file mode 100644
index 00000000000..39fbf2eacd1
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/chaplain.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/chaplain_skirt.dmi b/icons/clothing/uniform/workwear/service/chaplain_skirt.dmi
new file mode 100644
index 00000000000..4ae861dba7b
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/chaplain_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/chef.dmi b/icons/clothing/uniform/workwear/service/chef.dmi
new file mode 100644
index 00000000000..ceafc19394e
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/chef.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/chef_skirt.dmi b/icons/clothing/uniform/workwear/service/chef_skirt.dmi
new file mode 100644
index 00000000000..8093e13a183
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/chef_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/hydroponics.dmi b/icons/clothing/uniform/workwear/service/hydroponics.dmi
new file mode 100644
index 00000000000..202b74babe9
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/hydroponics.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/hydroponics_skirt.dmi b/icons/clothing/uniform/workwear/service/hydroponics_skirt.dmi
new file mode 100644
index 00000000000..b35888d3a7d
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/hydroponics_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/internalaffairs.dmi b/icons/clothing/uniform/workwear/service/internalaffairs.dmi
new file mode 100644
index 00000000000..11f38781bb9
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/internalaffairs.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/internalaffairs_skirt.dmi b/icons/clothing/uniform/workwear/service/internalaffairs_skirt.dmi
new file mode 100644
index 00000000000..4d05f5d56b6
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/internalaffairs_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/punpun.dmi b/icons/clothing/uniform/workwear/service/punpun.dmi
new file mode 100644
index 00000000000..3451d6f8d1b
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/punpun.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/waiter.dmi b/icons/clothing/uniform/workwear/service/waiter.dmi
new file mode 100644
index 00000000000..a800b4a273d
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/waiter.dmi differ
diff --git a/icons/clothing/uniform/workwear/service/waiter_fem.dmi b/icons/clothing/uniform/workwear/service/waiter_fem.dmi
new file mode 100644
index 00000000000..71181f95abb
Binary files /dev/null and b/icons/clothing/uniform/workwear/service/waiter_fem.dmi differ
diff --git a/icons/clothing/uniform/workwear/syndicate/combat.dmi b/icons/clothing/uniform/workwear/syndicate/combat.dmi
new file mode 100644
index 00000000000..62f7fd67dc2
Binary files /dev/null and b/icons/clothing/uniform/workwear/syndicate/combat.dmi differ
diff --git a/icons/clothing/uniform/workwear/syndicate/syndicate.dmi b/icons/clothing/uniform/workwear/syndicate/syndicate.dmi
new file mode 100644
index 00000000000..32adc3765c2
Binary files /dev/null and b/icons/clothing/uniform/workwear/syndicate/syndicate.dmi differ
diff --git a/icons/clothing/uniform/workwear/syndicate/syndicate_combat.dmi b/icons/clothing/uniform/workwear/syndicate/syndicate_combat.dmi
new file mode 100644
index 00000000000..85ac5424f0b
Binary files /dev/null and b/icons/clothing/uniform/workwear/syndicate/syndicate_combat.dmi differ
diff --git a/icons/clothing/uniform/workwear/syndicate/syndicate_skirt.dmi b/icons/clothing/uniform/workwear/syndicate/syndicate_skirt.dmi
new file mode 100644
index 00000000000..3427f4fe539
Binary files /dev/null and b/icons/clothing/uniform/workwear/syndicate/syndicate_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/syndicate/tactifool.dmi b/icons/clothing/uniform/workwear/syndicate/tactifool.dmi
new file mode 100644
index 00000000000..0e4047ee44a
Binary files /dev/null and b/icons/clothing/uniform/workwear/syndicate/tactifool.dmi differ
diff --git a/icons/clothing/uniform/workwear/syndicate/tactifool_skirt.dmi b/icons/clothing/uniform/workwear/syndicate/tactifool_skirt.dmi
new file mode 100644
index 00000000000..d8de60402a3
Binary files /dev/null and b/icons/clothing/uniform/workwear/syndicate/tactifool_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/SDFhadiisgov.dmi b/icons/clothing/uniform/workwear/tajaran/SDFhadiisgov.dmi
new file mode 100644
index 00000000000..d352705abc2
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/SDFhadiisgov.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/SDFhadiisgovofficer.dmi b/icons/clothing/uniform/workwear/tajaran/SDFhadiisgovofficer.dmi
new file mode 100644
index 00000000000..885e240961e
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/SDFhadiisgovofficer.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/ala-grunt-wraps.dmi b/icons/clothing/uniform/workwear/tajaran/ala-grunt-wraps.dmi
new file mode 100644
index 00000000000..e9dd7bb95e9
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/ala-grunt-wraps.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/ala-officer.dmi b/icons/clothing/uniform/workwear/tajaran/ala-officer.dmi
new file mode 100644
index 00000000000..1d3a06dea0b
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/ala-officer.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/ala-soldat.dmi b/icons/clothing/uniform/workwear/tajaran/ala-soldat.dmi
new file mode 100644
index 00000000000..8bdc32dbb35
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/ala-soldat.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/ala-soldatdress.dmi b/icons/clothing/uniform/workwear/tajaran/ala-soldatdress.dmi
new file mode 100644
index 00000000000..60cca9ef422
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/ala-soldatdress.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/ala-soldier-civ.dmi b/icons/clothing/uniform/workwear/tajaran/ala-soldier-civ.dmi
new file mode 100644
index 00000000000..f9585efb508
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/ala-soldier-civ.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/cosmonaut.dmi b/icons/clothing/uniform/workwear/tajaran/cosmonaut.dmi
new file mode 100644
index 00000000000..ee95050d623
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/cosmonaut.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/database_freighter.dmi b/icons/clothing/uniform/workwear/tajaran/database_freighter.dmi
new file mode 100644
index 00000000000..6aa98cd2b47
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/database_freighter.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/database_freighter_captain.dmi b/icons/clothing/uniform/workwear/tajaran/database_freighter_captain.dmi
new file mode 100644
index 00000000000..b0c97e0de9e
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/database_freighter_captain.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/dpra_con_f.dmi b/icons/clothing/uniform/workwear/tajaran/dpra_con_f.dmi
new file mode 100644
index 00000000000..2589ac76d78
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/dpra_con_f.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/dpra_consular.dmi b/icons/clothing/uniform/workwear/tajaran/dpra_consular.dmi
new file mode 100644
index 00000000000..954707ceb44
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/dpra_consular.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/dpra_worker.dmi b/icons/clothing/uniform/workwear/tajaran/dpra_worker.dmi
new file mode 100644
index 00000000000..1a936ae29f0
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/dpra_worker.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/dpra_worker_alt.dmi b/icons/clothing/uniform/workwear/tajaran/dpra_worker_alt.dmi
new file mode 100644
index 00000000000..44cbbf413bb
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/dpra_worker_alt.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/explorer_uniform.dmi b/icons/clothing/uniform/workwear/tajaran/explorer_uniform.dmi
new file mode 100644
index 00000000000..6291c5634fd
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/explorer_uniform.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/hadiisgov.dmi b/icons/clothing/uniform/workwear/tajaran/hadiisgov.dmi
new file mode 100644
index 00000000000..b604f914663
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/hadiisgov.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/matakeuniform.dmi b/icons/clothing/uniform/workwear/tajaran/matakeuniform.dmi
new file mode 100644
index 00000000000..af0a57fc6c9
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/matakeuniform.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/mechanic.dmi b/icons/clothing/uniform/workwear/tajaran/mechanic.dmi
new file mode 100644
index 00000000000..09820b36ddf
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/mechanic.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/nka_commander.dmi b/icons/clothing/uniform/workwear/tajaran/nka_commander.dmi
new file mode 100644
index 00000000000..1b00f7b8fe3
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/nka_commander.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/nka_consular.dmi b/icons/clothing/uniform/workwear/tajaran/nka_consular.dmi
new file mode 100644
index 00000000000..42cdf77fb8d
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/nka_consular.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/nka_merchant_captain.dmi b/icons/clothing/uniform/workwear/tajaran/nka_merchant_captain.dmi
new file mode 100644
index 00000000000..d391bdbdf14
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/nka_merchant_captain.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/nka_merchant_navy.dmi b/icons/clothing/uniform/workwear/tajaran/nka_merchant_navy.dmi
new file mode 100644
index 00000000000..6bda24cfa9d
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/nka_merchant_navy.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/nka_merchant_navy_alt.dmi b/icons/clothing/uniform/workwear/tajaran/nka_merchant_navy_alt.dmi
new file mode 100644
index 00000000000..170ff5c9cc9
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/nka_merchant_navy_alt.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/nka_sailor.dmi b/icons/clothing/uniform/workwear/tajaran/nka_sailor.dmi
new file mode 100644
index 00000000000..eda59ed7d0d
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/nka_sailor.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/nka_uniform.dmi b/icons/clothing/uniform/workwear/tajaran/nka_uniform.dmi
new file mode 100644
index 00000000000..8990c2b6ce9
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/nka_uniform.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/ntoveralls.dmi b/icons/clothing/uniform/workwear/tajaran/ntoveralls.dmi
new file mode 100644
index 00000000000..1e3afeb8745
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/ntoveralls.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/orbital_captain.dmi b/icons/clothing/uniform/workwear/tajaran/orbital_captain.dmi
new file mode 100644
index 00000000000..6472ed9289d
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/orbital_captain.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/pra_con_f.dmi b/icons/clothing/uniform/workwear/tajaran/pra_con_f.dmi
new file mode 100644
index 00000000000..6e238cacf7f
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/pra_con_f.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/pra_consular.dmi b/icons/clothing/uniform/workwear/tajaran/pra_consular.dmi
new file mode 100644
index 00000000000..2676c8651ef
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/pra_consular.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/pracommisar.dmi b/icons/clothing/uniform/workwear/tajaran/pracommisar.dmi
new file mode 100644
index 00000000000..7ee2ba3a844
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/pracommisar.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/prauniform.dmi b/icons/clothing/uniform/workwear/tajaran/prauniform.dmi
new file mode 100644
index 00000000000..0c407af0277
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/prauniform.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/psis.dmi b/icons/clothing/uniform/workwear/tajaran/psis.dmi
new file mode 100644
index 00000000000..872e362b018
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/psis.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/pvsm_captain.dmi b/icons/clothing/uniform/workwear/tajaran/pvsm_captain.dmi
new file mode 100644
index 00000000000..f6aac8bae58
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/pvsm_captain.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/pvsm_crewman.dmi b/icons/clothing/uniform/workwear/tajaran/pvsm_crewman.dmi
new file mode 100644
index 00000000000..0e57afb8546
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/pvsm_crewman.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/raakti_shariim_uniform.dmi b/icons/clothing/uniform/workwear/tajaran/raakti_shariim_uniform.dmi
new file mode 100644
index 00000000000..ed261d85338
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/raakti_shariim_uniform.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/space_commissar.dmi b/icons/clothing/uniform/workwear/tajaran/space_commissar.dmi
new file mode 100644
index 00000000000..ad094f70d51
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/space_commissar.dmi differ
diff --git a/icons/clothing/uniform/workwear/tajaran/taj_labor.dmi b/icons/clothing/uniform/workwear/tajaran/taj_labor.dmi
new file mode 100644
index 00000000000..b45afd5e80b
Binary files /dev/null and b/icons/clothing/uniform/workwear/tajaran/taj_labor.dmi differ
diff --git a/icons/clothing/uniform/workwear/technomancer/apprentice.dmi b/icons/clothing/uniform/workwear/technomancer/apprentice.dmi
new file mode 100644
index 00000000000..359ae2eecdf
Binary files /dev/null and b/icons/clothing/uniform/workwear/technomancer/apprentice.dmi differ
diff --git a/icons/clothing/uniform/workwear/technomancer/initiate.dmi b/icons/clothing/uniform/workwear/technomancer/initiate.dmi
new file mode 100644
index 00000000000..04b031b11d3
Binary files /dev/null and b/icons/clothing/uniform/workwear/technomancer/initiate.dmi differ
diff --git a/icons/clothing/uniform/workwear/technomancer/technomancer.dmi b/icons/clothing/uniform/workwear/technomancer/technomancer.dmi
new file mode 100644
index 00000000000..efaf42e917a
Binary files /dev/null and b/icons/clothing/uniform/workwear/technomancer/technomancer.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_dress_cap.dmi b/icons/clothing/uniform/workwear/teshari/tesh_dress_cap.dmi
new file mode 100644
index 00000000000..8102a79c8b7
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_dress_cap.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_dress_engine.dmi b/icons/clothing/uniform/workwear/teshari/tesh_dress_engine.dmi
new file mode 100644
index 00000000000..27d373e81a3
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_dress_engine.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_dress_medical.dmi b/icons/clothing/uniform/workwear/teshari/tesh_dress_medical.dmi
new file mode 100644
index 00000000000..137c5317f2e
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_dress_medical.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_dress_science.dmi b/icons/clothing/uniform/workwear/teshari/tesh_dress_science.dmi
new file mode 100644
index 00000000000..08456e7324c
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_dress_science.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_dress_security.dmi b/icons/clothing/uniform/workwear/teshari/tesh_dress_security.dmi
new file mode 100644
index 00000000000..157da16c205
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_dress_security.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_smock_captain.dmi b/icons/clothing/uniform/workwear/teshari/tesh_smock_captain.dmi
new file mode 100644
index 00000000000..92fbed36d27
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_smock_captain.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_smock_engine.dmi b/icons/clothing/uniform/workwear/teshari/tesh_smock_engine.dmi
new file mode 100644
index 00000000000..56a58a6b5b8
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_smock_engine.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_smock_medical.dmi b/icons/clothing/uniform/workwear/teshari/tesh_smock_medical.dmi
new file mode 100644
index 00000000000..cfc8ef4c4fb
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_smock_medical.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_smock_rainbow.dmi b/icons/clothing/uniform/workwear/teshari/tesh_smock_rainbow.dmi
new file mode 100644
index 00000000000..55b22b525bb
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_smock_rainbow.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_smock_science.dmi b/icons/clothing/uniform/workwear/teshari/tesh_smock_science.dmi
new file mode 100644
index 00000000000..da29ac2c30b
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_smock_science.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_smock_security.dmi b/icons/clothing/uniform/workwear/teshari/tesh_smock_security.dmi
new file mode 100644
index 00000000000..e763cb9bf39
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_smock_security.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_atmos.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_atmos.dmi
new file mode 100644
index 00000000000..5054f19c37f
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_atmos.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_cap.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_cap.dmi
new file mode 100644
index 00000000000..1ae2c728f28
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_cap.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_car.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_car.dmi
new file mode 100644
index 00000000000..4004c25f2c3
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_car.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_ce.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_ce.dmi
new file mode 100644
index 00000000000..c8f64db8530
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_ce.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_chem.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_chem.dmi
new file mode 100644
index 00000000000..6505ea93c36
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_chem.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_cmo.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_cmo.dmi
new file mode 100644
index 00000000000..5e85520b1da
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_cmo.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_doc.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_doc.dmi
new file mode 100644
index 00000000000..2e751c58a3c
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_doc.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_engie.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_engie.dmi
new file mode 100644
index 00000000000..b280471de51
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_engie.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_hop.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_hop.dmi
new file mode 100644
index 00000000000..545159560ed
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_hop.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_hos.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_hos.dmi
new file mode 100644
index 00000000000..d23e3ee8422
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_hos.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_iaa.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_iaa.dmi
new file mode 100644
index 00000000000..8a12454fdf5
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_iaa.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_mine.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_mine.dmi
new file mode 100644
index 00000000000..0a3d3fae303
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_mine.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_para.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_para.dmi
new file mode 100644
index 00000000000..a93b9881854
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_para.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_psych.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_psych.dmi
new file mode 100644
index 00000000000..d0977767f0d
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_psych.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_qm.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_qm.dmi
new file mode 100644
index 00000000000..4835a092c9f
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_qm.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_rd.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_rd.dmi
new file mode 100644
index 00000000000..11eec503179
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_rd.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_robo.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_robo.dmi
new file mode 100644
index 00000000000..a5d58373b6d
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_robo.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_sci.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_sci.dmi
new file mode 100644
index 00000000000..74eb0c727de
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_sci.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_sec.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_sec.dmi
new file mode 100644
index 00000000000..cedcf7c0463
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_sec.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_serv.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_serv.dmi
new file mode 100644
index 00000000000..7f547ac7253
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_serv.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/tesh_uniform_viro.dmi b/icons/clothing/uniform/workwear/teshari/tesh_uniform_viro.dmi
new file mode 100644
index 00000000000..0294de584ec
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/tesh_uniform_viro.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_black_blue_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_black_blue_worksuit.dmi
new file mode 100644
index 00000000000..6d04e1440b8
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_black_blue_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_black_green_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_black_green_worksuit.dmi
new file mode 100644
index 00000000000..11a081326f6
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_black_green_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_black_orange_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_black_orange_worksuit.dmi
new file mode 100644
index 00000000000..72f9a497cb1
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_black_orange_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_black_purple_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_black_purple_worksuit.dmi
new file mode 100644
index 00000000000..38445f0782f
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_black_purple_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_black_red_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_black_red_worksuit.dmi
new file mode 100644
index 00000000000..353d25b0e04
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_black_red_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_blackutility.dmi b/icons/clothing/uniform/workwear/teshari/teshari_blackutility.dmi
new file mode 100644
index 00000000000..1aeaa4d437e
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_blackutility.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_blackutility_com.dmi b/icons/clothing/uniform/workwear/teshari/teshari_blackutility_com.dmi
new file mode 100644
index 00000000000..0623e11934b
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_blackutility_com.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_bluegreydress.dmi b/icons/clothing/uniform/workwear/teshari/teshari_bluegreydress.dmi
new file mode 100644
index 00000000000..52d17506d39
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_bluegreydress.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_greydress.dmi b/icons/clothing/uniform/workwear/teshari/teshari_greydress.dmi
new file mode 100644
index 00000000000..4c0f832ca50
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_greydress.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_white_blue_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_white_blue_worksuit.dmi
new file mode 100644
index 00000000000..241202b10ef
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_white_blue_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_white_green_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_white_green_worksuit.dmi
new file mode 100644
index 00000000000..568ec66a229
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_white_green_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_white_orange_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_white_orange_worksuit.dmi
new file mode 100644
index 00000000000..c400cdc4bad
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_white_orange_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_white_purple_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_white_purple_worksuit.dmi
new file mode 100644
index 00000000000..05c5b9371cb
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_white_purple_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/teshari/teshari_white_red_worksuit.dmi b/icons/clothing/uniform/workwear/teshari/teshari_white_red_worksuit.dmi
new file mode 100644
index 00000000000..1ffb2f588e5
Binary files /dev/null and b/icons/clothing/uniform/workwear/teshari/teshari_white_red_worksuit.dmi differ
diff --git a/icons/clothing/uniform/workwear/theatre/blueclown.dmi b/icons/clothing/uniform/workwear/theatre/blueclown.dmi
new file mode 100644
index 00000000000..ec640423de0
Binary files /dev/null and b/icons/clothing/uniform/workwear/theatre/blueclown.dmi differ
diff --git a/icons/clothing/uniform/workwear/theatre/clown.dmi b/icons/clothing/uniform/workwear/theatre/clown.dmi
new file mode 100644
index 00000000000..9bbcbd19caf
Binary files /dev/null and b/icons/clothing/uniform/workwear/theatre/clown.dmi differ
diff --git a/icons/clothing/uniform/workwear/theatre/greenclown.dmi b/icons/clothing/uniform/workwear/theatre/greenclown.dmi
new file mode 100644
index 00000000000..f1ae1929c3b
Binary files /dev/null and b/icons/clothing/uniform/workwear/theatre/greenclown.dmi differ
diff --git a/icons/clothing/uniform/workwear/theatre/mime.dmi b/icons/clothing/uniform/workwear/theatre/mime.dmi
new file mode 100644
index 00000000000..0ebf8cab81b
Binary files /dev/null and b/icons/clothing/uniform/workwear/theatre/mime.dmi differ
diff --git a/icons/clothing/uniform/workwear/theatre/mime_skirt.dmi b/icons/clothing/uniform/workwear/theatre/mime_skirt.dmi
new file mode 100644
index 00000000000..628029c1fdb
Binary files /dev/null and b/icons/clothing/uniform/workwear/theatre/mime_skirt.dmi differ
diff --git a/icons/clothing/uniform/workwear/theatre/orangeclown.dmi b/icons/clothing/uniform/workwear/theatre/orangeclown.dmi
new file mode 100644
index 00000000000..2b67d2857d7
Binary files /dev/null and b/icons/clothing/uniform/workwear/theatre/orangeclown.dmi differ
diff --git a/icons/clothing/uniform/workwear/theatre/purpleclown.dmi b/icons/clothing/uniform/workwear/theatre/purpleclown.dmi
new file mode 100644
index 00000000000..1ea3ad9817f
Binary files /dev/null and b/icons/clothing/uniform/workwear/theatre/purpleclown.dmi differ
diff --git a/icons/clothing/uniform/workwear/theatre/rainbowclown.dmi b/icons/clothing/uniform/workwear/theatre/rainbowclown.dmi
new file mode 100644
index 00000000000..f6d08b5b70c
Binary files /dev/null and b/icons/clothing/uniform/workwear/theatre/rainbowclown.dmi differ
diff --git a/icons/clothing/uniform/workwear/theatre/yellowclown.dmi b/icons/clothing/uniform/workwear/theatre/yellowclown.dmi
new file mode 100644
index 00000000000..f420bb8af68
Binary files /dev/null and b/icons/clothing/uniform/workwear/theatre/yellowclown.dmi differ
diff --git a/icons/clothing/uniform/workwear/tracksuit_blue.dmi b/icons/clothing/uniform/workwear/tracksuit_blue.dmi
new file mode 100644
index 00000000000..613eb5f8acc
Binary files /dev/null and b/icons/clothing/uniform/workwear/tracksuit_blue.dmi differ
diff --git a/icons/content/factions/orion/iwl/iwluni.dmi b/icons/content/factions/orion/iwl/iwluni.dmi
index e932d34f4e7..61a3ad9ae4d 100644
Binary files a/icons/content/factions/orion/iwl/iwluni.dmi and b/icons/content/factions/orion/iwl/iwluni.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index cbc1413015f..a6123b44893 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/modular_latex.dmi b/icons/mob/clothing/modular_latex.dmi
index 7398b80193a..e41ae623ecc 100644
Binary files a/icons/mob/clothing/modular_latex.dmi and b/icons/mob/clothing/modular_latex.dmi differ
diff --git a/icons/mob/clothing/species/moth/moth_uniforms.dmi b/icons/mob/clothing/species/moth/moth_uniforms.dmi
index 7a30fbf2b07..c1270994666 100644
Binary files a/icons/mob/clothing/species/moth/moth_uniforms.dmi and b/icons/mob/clothing/species/moth/moth_uniforms.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/taj_uniform.dmi b/icons/mob/clothing/species/tajaran/taj_uniform.dmi
new file mode 100644
index 00000000000..409b8ebb4f5
Binary files /dev/null and b/icons/mob/clothing/species/tajaran/taj_uniform.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/uniform.dmi b/icons/mob/clothing/species/tajaran/uniform.dmi
deleted file mode 100644
index 8c83047dac7..00000000000
Binary files a/icons/mob/clothing/species/tajaran/uniform.dmi and /dev/null differ
diff --git a/icons/mob/clothing/species/teshari/deptjacket.dmi b/icons/mob/clothing/species/teshari/deptjacket.dmi
deleted file mode 100644
index a14d060cb30..00000000000
Binary files a/icons/mob/clothing/species/teshari/deptjacket.dmi and /dev/null differ
diff --git a/icons/mob/clothing/species/teshari/teshari_uniform.dmi b/icons/mob/clothing/species/teshari/teshari_uniform.dmi
deleted file mode 100644
index 1614286b306..00000000000
Binary files a/icons/mob/clothing/species/teshari/teshari_uniform.dmi and /dev/null differ
diff --git a/icons/mob/clothing/species/teshari/uniform.dmi b/icons/mob/clothing/species/teshari/uniform.dmi
index 687a92386f5..22ded22753a 100644
Binary files a/icons/mob/clothing/species/teshari/uniform.dmi and b/icons/mob/clothing/species/teshari/uniform.dmi differ
diff --git a/icons/mob/clothing/species/teshari/uniform_rolled_down.dmi b/icons/mob/clothing/species/teshari/uniform_rolled_down.dmi
index 81d079f5f2e..8fc44428724 100644
Binary files a/icons/mob/clothing/species/teshari/uniform_rolled_down.dmi and b/icons/mob/clothing/species/teshari/uniform_rolled_down.dmi differ
diff --git a/icons/mob/clothing/species/teshari/uniform_sleeves_rolled.dmi b/icons/mob/clothing/species/teshari/uniform_sleeves_rolled.dmi
index ec4b16697d2..8fc44428724 100644
Binary files a/icons/mob/clothing/species/teshari/uniform_sleeves_rolled.dmi and b/icons/mob/clothing/species/teshari/uniform_sleeves_rolled.dmi differ
diff --git a/icons/mob/clothing/species/unathidigi/uniform.dmi b/icons/mob/clothing/species/unathidigi/uniform.dmi
index 20a19b7786c..769b95f414a 100644
Binary files a/icons/mob/clothing/species/unathidigi/uniform.dmi and b/icons/mob/clothing/species/unathidigi/uniform.dmi differ
diff --git a/icons/mob/clothing/species/vox/uniform.dmi b/icons/mob/clothing/species/vox/uniform.dmi
index 829b653ed2d..2edc08f9105 100644
Binary files a/icons/mob/clothing/species/vox/uniform.dmi and b/icons/mob/clothing/species/vox/uniform.dmi differ
diff --git a/icons/mob/clothing/species/vox/uniform_rolled_down.dmi b/icons/mob/clothing/species/vox/uniform_rolled_down.dmi
index bf165fdf18b..8fc44428724 100644
Binary files a/icons/mob/clothing/species/vox/uniform_rolled_down.dmi and b/icons/mob/clothing/species/vox/uniform_rolled_down.dmi differ
diff --git a/icons/mob/clothing/species/werebeast/uniform.dmi b/icons/mob/clothing/species/werebeast/uniform.dmi
index 267847085fa..3952b767aa7 100644
Binary files a/icons/mob/clothing/species/werebeast/uniform.dmi and b/icons/mob/clothing/species/werebeast/uniform.dmi differ
diff --git a/icons/mob/clothing/under/centcom.dmi b/icons/mob/clothing/under/centcom.dmi
deleted file mode 100644
index 80b023fc13e..00000000000
Binary files a/icons/mob/clothing/under/centcom.dmi and /dev/null differ
diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
index 279a08b5375..d0316c6fc82 100644
Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ
diff --git a/icons/mob/clothing/uniform_rolled_down.dmi b/icons/mob/clothing/uniform_rolled_down.dmi
index 1d03312877f..9cd9a5af97f 100644
Binary files a/icons/mob/clothing/uniform_rolled_down.dmi and b/icons/mob/clothing/uniform_rolled_down.dmi differ
diff --git a/icons/mob/clothing/uniform_sleeves_rolled.dmi b/icons/mob/clothing/uniform_sleeves_rolled.dmi
index 40e919e1fb4..9cd9a5af97f 100644
Binary files a/icons/mob/clothing/uniform_sleeves_rolled.dmi and b/icons/mob/clothing/uniform_sleeves_rolled.dmi differ
diff --git a/icons/mob/eventclothing.dmi b/icons/mob/eventclothing.dmi
deleted file mode 100644
index b7a2d77843d..00000000000
Binary files a/icons/mob/eventclothing.dmi and /dev/null differ
diff --git a/icons/mob/items/accessories.dmi b/icons/mob/items/accessories.dmi
new file mode 100644
index 00000000000..be1ce78da9b
Binary files /dev/null and b/icons/mob/items/accessories.dmi differ
diff --git a/icons/mob/items/helmet.dmi b/icons/mob/items/helmet.dmi
new file mode 100644
index 00000000000..0c6c02b6bbe
Binary files /dev/null and b/icons/mob/items/helmet.dmi differ
diff --git a/icons/mob/items/lefthand_uniforms.dmi b/icons/mob/items/lefthand_uniforms.dmi
index daff6368dad..1d7337f23eb 100644
Binary files a/icons/mob/items/lefthand_uniforms.dmi and b/icons/mob/items/lefthand_uniforms.dmi differ
diff --git a/icons/mob/items/righthand_uniforms.dmi b/icons/mob/items/righthand_uniforms.dmi
index 8f7ef41dbf1..011b6e966ce 100644
Binary files a/icons/mob/items/righthand_uniforms.dmi and b/icons/mob/items/righthand_uniforms.dmi differ
diff --git a/icons/obj/clothing/eventclothing.dmi b/icons/obj/clothing/eventclothing.dmi
deleted file mode 100644
index ce031bee44b..00000000000
Binary files a/icons/obj/clothing/eventclothing.dmi and /dev/null differ
diff --git a/icons/obj/clothing/modular_shiny.dmi b/icons/obj/clothing/modular_shiny.dmi
index df757d6acae..e6f46762bd3 100644
Binary files a/icons/obj/clothing/modular_shiny.dmi and b/icons/obj/clothing/modular_shiny.dmi differ
diff --git a/icons/obj/clothing/ranger.dmi b/icons/obj/clothing/ranger.dmi
index 3d415c27d83..6c34246a874 100644
Binary files a/icons/obj/clothing/ranger.dmi and b/icons/obj/clothing/ranger.dmi differ
diff --git a/icons/obj/clothing/species/teshari/uniform.dmi b/icons/obj/clothing/species/teshari/uniform.dmi
deleted file mode 100644
index 7c2000b927d..00000000000
Binary files a/icons/obj/clothing/species/teshari/uniform.dmi and /dev/null differ
diff --git a/icons/obj/clothing/under/centcom.dmi b/icons/obj/clothing/under/centcom.dmi
deleted file mode 100644
index ccf56643241..00000000000
Binary files a/icons/obj/clothing/under/centcom.dmi and /dev/null differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 8d8578c5dc1..1f3e30b9842 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index fb9dc65ea6d..0da26a5189e 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/icons/unused/_abandoned_sprites/clothing/uniform/rank/dress.dmi b/icons/unused/_abandoned_sprites/clothing/uniform/rank/dress.dmi
new file mode 100644
index 00000000000..ddbfd3d4171
Binary files /dev/null and b/icons/unused/_abandoned_sprites/clothing/uniform/rank/dress.dmi differ
diff --git a/icons/unused/_abandoned_sprites/clothing/uniform/rank/pt.dmi b/icons/unused/_abandoned_sprites/clothing/uniform/rank/pt.dmi
new file mode 100644
index 00000000000..e59e1c4ee0a
Binary files /dev/null and b/icons/unused/_abandoned_sprites/clothing/uniform/rank/pt.dmi differ
diff --git a/icons/unused/_abandoned_sprites/clothing/uniform/rank/service.dmi b/icons/unused/_abandoned_sprites/clothing/uniform/rank/service.dmi
new file mode 100644
index 00000000000..a2c49040d43
Binary files /dev/null and b/icons/unused/_abandoned_sprites/clothing/uniform/rank/service.dmi differ
diff --git a/icons/unused/_abandoned_sprites/clothing/uniform/rank/utility.dmi b/icons/unused/_abandoned_sprites/clothing/uniform/rank/utility.dmi
new file mode 100644
index 00000000000..ab7333c774d
Binary files /dev/null and b/icons/unused/_abandoned_sprites/clothing/uniform/rank/utility.dmi differ
diff --git a/icons/unused/_abandoned_sprites/mob/clothing/species/teshari/uniform.dmi b/icons/unused/_abandoned_sprites/mob/clothing/species/teshari/uniform.dmi
new file mode 100644
index 00000000000..7f974c3722a
Binary files /dev/null and b/icons/unused/_abandoned_sprites/mob/clothing/species/teshari/uniform.dmi differ
diff --git a/icons/unused/_abandoned_sprites/mob/clothing/species/teshari/uniform_rolled_down.dmi b/icons/unused/_abandoned_sprites/mob/clothing/species/teshari/uniform_rolled_down.dmi
new file mode 100644
index 00000000000..d09c91b889f
Binary files /dev/null and b/icons/unused/_abandoned_sprites/mob/clothing/species/teshari/uniform_rolled_down.dmi differ
diff --git a/icons/unused/_abandoned_sprites/mob/clothing/species/unathidigi/uniform.dmi b/icons/unused/_abandoned_sprites/mob/clothing/species/unathidigi/uniform.dmi
new file mode 100644
index 00000000000..61cdd2fa7a8
Binary files /dev/null and b/icons/unused/_abandoned_sprites/mob/clothing/species/unathidigi/uniform.dmi differ
diff --git a/icons/unused/_abandoned_sprites/mob/clothing/species/vox/uniform.dmi b/icons/unused/_abandoned_sprites/mob/clothing/species/vox/uniform.dmi
new file mode 100644
index 00000000000..6f3f20c6505
Binary files /dev/null and b/icons/unused/_abandoned_sprites/mob/clothing/species/vox/uniform.dmi differ
diff --git a/icons/unused/_abandoned_sprites/mob/clothing/uniform.dmi b/icons/unused/_abandoned_sprites/mob/clothing/uniform.dmi
new file mode 100644
index 00000000000..90ac4264e2f
Binary files /dev/null and b/icons/unused/_abandoned_sprites/mob/clothing/uniform.dmi differ
diff --git a/icons/unused/_abandoned_sprites/mob/clothing/uniform_rolled_down.dmi b/icons/unused/_abandoned_sprites/mob/clothing/uniform_rolled_down.dmi
new file mode 100644
index 00000000000..43cdc033ff6
Binary files /dev/null and b/icons/unused/_abandoned_sprites/mob/clothing/uniform_rolled_down.dmi differ
diff --git a/icons/unused/_abandoned_sprites/mob/clothing/uniform_sleeves_rolled.dmi b/icons/unused/_abandoned_sprites/mob/clothing/uniform_sleeves_rolled.dmi
new file mode 100644
index 00000000000..f22e1f454c8
Binary files /dev/null and b/icons/unused/_abandoned_sprites/mob/clothing/uniform_sleeves_rolled.dmi differ
diff --git a/icons/unused/_abandoned_sprites/obj/clothing/species/teshari/tesh_obj_uniform.dmi b/icons/unused/_abandoned_sprites/obj/clothing/species/teshari/tesh_obj_uniform.dmi
new file mode 100644
index 00000000000..a8e5eeb07ec
Binary files /dev/null and b/icons/unused/_abandoned_sprites/obj/clothing/species/teshari/tesh_obj_uniform.dmi differ
diff --git a/icons/unused/_abandoned_sprites/obj/clothing/uniforms.dmi b/icons/unused/_abandoned_sprites/obj/clothing/uniforms.dmi
new file mode 100644
index 00000000000..f9849450a5e
Binary files /dev/null and b/icons/unused/_abandoned_sprites/obj/clothing/uniforms.dmi differ
diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi
index d86bbb1accc..87e13c87f82 100644
Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ
diff --git a/maps/overmap/shuttles/pirateskiff.dm b/maps/overmap/shuttles/pirateskiff.dm
index 7ec6175afe5..7708b8fd4d3 100644
--- a/maps/overmap/shuttles/pirateskiff.dm
+++ b/maps/overmap/shuttles/pirateskiff.dm
@@ -36,7 +36,7 @@
/area/shuttle/pirate
requires_power = TRUE
name = "\improper Pirate Skiff"
- icon_state = "shuttle1"
+ icon_state = "shuttle"
/area/shuttle/pirate/deck
name = "\improper Pirate Skiff Deck"
diff --git a/maps/overmap/shuttles/specialops.dm b/maps/overmap/shuttles/specialops.dm
index cb0588d731c..aa3dbb8f6f2 100644
--- a/maps/overmap/shuttles/specialops.dm
+++ b/maps/overmap/shuttles/specialops.dm
@@ -37,7 +37,7 @@
/area/shuttle/specops
requires_power = TRUE
name = "\improper NDV Quicksilver"
- icon_state = "shuttle1"
+ icon_state = "shuttle"
/area/shuttle/specops/general
name = "\improper NDV Quicksilver Deck"
diff --git a/maps/shuttles/factions/generic/outlaw/reaver.dm b/maps/shuttles/factions/generic/outlaw/reaver.dm
index 32f04c7bfb7..86eb479fe8b 100644
--- a/maps/shuttles/factions/generic/outlaw/reaver.dm
+++ b/maps/shuttles/factions/generic/outlaw/reaver.dm
@@ -24,7 +24,7 @@
/area/shuttle/reaver
requires_power = TRUE
name = "\improper Reaver Shuttle"
- icon_state = "shuttle1"
+ icon_state = "shuttle"
/area/shuttle/reaver/fore
name = "\improper Reaver Shuttle Fore"
diff --git a/tools/dmi/__init__.py b/tools/dmi/__init__.py
index fc82b3ffcbe..7578a3ecea2 100755
--- a/tools/dmi/__init__.py
+++ b/tools/dmi/__init__.py
@@ -428,6 +428,15 @@ class DmiTransformPipeline:
return image
+ def for_each_state(self, f):
+ self.dmi.states = [f(s) for s in self.dmi.states]
+ return self
+
+ def for_each_state_pattern(self, pattern: str, f):
+ matcher: re.Pattern = re.compile(pattern)
+ self.dmi.states = [f(s) if matcher.fullmatch(s.name) else s for s in self.dmi.states]
+ return self
+
def commit(self):
if self.committed:
raise Exception("dmi pipeline already committed.")
diff --git a/tools/dmi/snippets/black_to_transparent.py b/tools/dmi/snippets/black_to_transparent.py
new file mode 100644
index 00000000000..93998f06c0d
--- /dev/null
+++ b/tools/dmi/snippets/black_to_transparent.py
@@ -0,0 +1,21 @@
+import dmi
+import glob
+from PIL import Image
+
+def black_to_transparent(globstr: str):
+ for path in glob.iglob(globstr):
+ dmi.transform(path).for_each_state(lambda s: black_to_transparent_state(s)).commit()
+ print(path)
+
+def black_to_transparent_state(state: dmi.State):
+ state.frames = [black_to_transparent_image(f) for f in state.frames]
+ return state
+
+def black_to_transparent_image(image: Image.Image):
+ image = image.copy()
+ for x in range(image.width):
+ for y in range(image.height):
+ (r, g, b, a) = image.getpixel((x, y))
+ if r == 0 and g == 0 and b == 0 and a == 255:
+ image.putpixel((x, y), (0, 0, 0, 0))
+ return image