diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 7a923f14bd5..15cb670a8cd 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -133,7 +133,7 @@
qdel(src)
/obj/effect/landmark/costume/maid/New()
- new /obj/item/clothing/under/blackskirt(src.loc)
+ new /obj/item/clothing/under/skirt(src.loc)
var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
new CHOICE(src.loc)
new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 787e0adb3bd..35a9b554389 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -20,7 +20,7 @@
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/blueprints(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
- new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
+ new /obj/item/clothing/under/rank/engineer/chief_engineer/skirt(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/gloves/yellow(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index fdd1ed5c807..95d4fd3d064 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -192,7 +192,7 @@
new /obj/item/clothing/under/rank/medical/navyblue(src)
new /obj/item/clothing/head/surgery/navyblue(src)
new /obj/item/clothing/under/rank/chief_medical_officer(src)
- new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
+ new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
new /obj/item/weapon/cartridge/cmo(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 0736a13f13c..2e342e55cf3 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -246,9 +246,9 @@
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/atmospheric_technician(src)
- new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
- new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
- new /obj/item/clothing/under/rank/atmospheric_technician/skirt(src)
+ new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
+ new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
+ new /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
@@ -396,8 +396,8 @@
..()
new /obj/item/clothing/under/rank/chemist(src)
new /obj/item/clothing/under/rank/chemist(src)
- new /obj/item/clothing/under/rank/chemist/skirt(src)
- new /obj/item/clothing/under/rank/chemist/skirt(src)
+ new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
+ new /obj/item/clothing/under/rank/medical/chemist/skirt(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
@@ -418,8 +418,8 @@
..()
new /obj/item/clothing/under/rank/geneticist(src)
new /obj/item/clothing/under/rank/geneticist(src)
- new /obj/item/clothing/under/rank/geneticist/skirt(src)
- new /obj/item/clothing/under/rank/geneticist/skirt(src)
+ new /obj/item/clothing/under/rank/medical/geneticist/skirt(src)
+ new /obj/item/clothing/under/rank/medical/geneticist/skirt(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src)
@@ -440,8 +440,8 @@
..()
new /obj/item/clothing/under/rank/virologist(src)
new /obj/item/clothing/under/rank/virologist(src)
- new /obj/item/clothing/under/rank/virologist/skirt(src)
- new /obj/item/clothing/under/rank/virologist/skirt(src)
+ new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
+ new /obj/item/clothing/under/rank/medical/virologist/skirt(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
@@ -517,9 +517,9 @@
new /obj/item/clothing/under/color/yellow(src)
new /obj/item/clothing/under/color/green(src)
new /obj/item/clothing/under/color/pink(src)
- new /obj/item/clothing/under/dress/plaid_blue(src)
- new /obj/item/clothing/under/dress/plaid_red(src)
- new /obj/item/clothing/under/dress/plaid_purple(src)
+ new /obj/item/clothing/under/skirt/plaid_blue(src)
+ new /obj/item/clothing/under/skirt/plaid_red(src)
+ new /obj/item/clothing/under/skirt/plaid_purple(src)
new /obj/item/clothing/shoes/blue(src)
new /obj/item/clothing/shoes/yellow(src)
new /obj/item/clothing/shoes/green(src)
diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
index 904a4e7b804..1ef69de38ad 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -53,110 +53,16 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpclothes))
/datum/gear/uniform/skirt
- display_name = "plaid skirt, blue"
- path = /obj/item/clothing/under/dress/plaid_blue
+ display_name = "skirt selection"
+ path = /obj/item/clothing/under/skirt
-/datum/gear/uniform/skirt/purple
- display_name = "plaid skirt, purple"
- path = /obj/item/clothing/under/dress/plaid_purple
-
-/datum/gear/uniform/skirt/red
- display_name = "plaid skirt, red"
- path = /obj/item/clothing/under/dress/plaid_red
-
-/datum/gear/uniform/skirt/black
- display_name = "skirt, black"
- path = /obj/item/clothing/under/blackskirt
-
-/datum/gear/uniform/skirt/ce
- display_name = "skirt, ce"
- path = /obj/item/clothing/under/rank/chief_engineer/skirt
- allowed_roles = list("Chief Engineer")
-
-/datum/gear/uniform/skirt/atmos
- display_name = "skirt, atmos"
- path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
- allowed_roles = list("Chief Engineer","Atmospheric Technician")
-
-/datum/gear/uniform/skirt/eng
- display_name = "skirt, engineer"
- path = /obj/item/clothing/under/rank/engineer/skirt
- allowed_roles = list("Chief Engineer","Station Engineer")
-
-/datum/gear/uniform/skirt/roboticist
- display_name = "skirt, roboticist"
- path = /obj/item/clothing/under/rank/roboticist/skirt
- allowed_roles = list("Research Director","Roboticist")
-
-/datum/gear/uniform/skirt/cmo
- display_name = "skirt, cmo"
- path = /obj/item/clothing/under/rank/chief_medical_officer
- allowed_roles = list("Chief Medical Officer")
-
-/datum/gear/uniform/skirt/chem
- display_name = "skirt, chemist"
- path = /obj/item/clothing/under/rank/chemist/skirt
- allowed_roles = list("Chief Medical Officer","Chemist")
-
-/datum/gear/uniform/skirt/viro
- display_name = "skirt, virologist"
- path = /obj/item/clothing/under/rank/virologist/skirt
- allowed_roles = list("Chief Medical Officer","Medical Doctor")
-
-/datum/gear/uniform/skirt/med
- display_name = "skirt, medical"
- path = /obj/item/clothing/under/rank/medical/skirt
- allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
-
-/datum/gear/uniform/skirt/sci
- display_name = "skirt, scientist"
- path = /obj/item/clothing/under/rank/scientist/skirt
- allowed_roles = list("Research Director","Scientist")
-
-/datum/gear/uniform/skirt/cargo
- display_name = "skirt, cargo"
- path = /obj/item/clothing/under/rank/cargotech/skirt
- allowed_roles = list("Quartermaster","Cargo Technician")
-
-/datum/gear/uniform/skirt/qm
- display_name = "skirt, QM"
- path = /obj/item/clothing/under/rank/cargo/skirt
- allowed_roles = list("Quartermaster")
-
-/datum/gear/uniform/skirt/warden
- display_name = "skirt, warden"
- path = /obj/item/clothing/under/rank/warden/skirt
- allowed_roles = list("Head of Security", "Warden")
-
-/datum/gear/uniform/skirt/security
- display_name = "skirt, security"
- path = /obj/item/clothing/under/rank/security/skirt
- allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
-
-/datum/gear/uniform/skirt/head_of_security
- display_name = "skirt, hos"
- path = /obj/item/clothing/under/rank/head_of_security/skirt
- allowed_roles = list("Head of Security")
-
-/datum/gear/uniform/jeans_qm
- display_name = "jeans, QM"
- path = /obj/item/clothing/under/rank/cargo/jeans
- allowed_roles = list("Quartermaster")
-
-/datum/gear/uniform/jeans_qmf
- display_name = "female jeans, QM"
- path = /obj/item/clothing/under/rank/cargo/jeans/female
- allowed_roles = list("Quartermaster")
-
-/datum/gear/uniform/jeans_cargo
- display_name = "jeans, cargo"
- path = /obj/item/clothing/under/rank/cargotech/jeans
- allowed_roles = list("Quartermaster","Cargo Technician")
-
-/datum/gear/uniform/jeans_cargof
- display_name = "female jeans, cargo"
- path = /obj/item/clothing/under/rank/cargotech/jeans/female
- allowed_roles = list("Quartermaster","Cargo Technician")
+/datum/gear/uniform/skirt/New()
+ ..()
+ var/list/skirts = list()
+ for(var/skirt in (typesof(/obj/item/clothing/under/skirt)))
+ var/obj/item/clothing/under/skirt/skirt_type = skirt
+ skirts[initial(skirt_type.name)] = skirt_type
+ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(skirts))
/datum/gear/uniform/pants
display_name = "pants selection"
@@ -182,6 +88,96 @@
shorts[initial(short_type.name)] = short_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts))
+/datum/gear/uniform/skirt/ce
+ display_name = "skirt, ce"
+ path = /obj/item/clothing/under/rank/engineer/chief_engineer/skirt
+ allowed_roles = list("Chief Engineer")
+
+/datum/gear/uniform/skirt/atmos
+ display_name = "skirt, atmos"
+ path = /obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
+ allowed_roles = list("Chief Engineer","Atmospheric Technician")
+
+/datum/gear/uniform/skirt/eng
+ display_name = "skirt, engineer"
+ path = /obj/item/clothing/under/rank/engineer/skirt
+ allowed_roles = list("Chief Engineer","Station Engineer")
+
+/datum/gear/uniform/skirt/roboticist
+ display_name = "skirt, roboticist"
+ path = /obj/item/clothing/under/rank/roboticist/skirt
+ allowed_roles = list("Research Director","Roboticist")
+
+/datum/gear/uniform/skirt/cmo
+ display_name = "skirt, cmo"
+ path = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
+ allowed_roles = list("Chief Medical Officer")
+
+/datum/gear/uniform/skirt/chem
+ display_name = "skirt, chemist"
+ path = /obj/item/clothing/under/rank/medical/chemist/skirt
+ allowed_roles = list("Chief Medical Officer","Chemist")
+
+/datum/gear/uniform/skirt/viro
+ display_name = "skirt, virologist"
+ path = /obj/item/clothing/under/rank/medical/virologist/skirt
+ allowed_roles = list("Chief Medical Officer","Medical Doctor")
+
+/datum/gear/uniform/skirt/med
+ display_name = "skirt, medical"
+ path = /obj/item/clothing/under/rank/medical/skirt
+ allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
+
+/datum/gear/uniform/skirt/sci
+ display_name = "skirt, scientist"
+ path = /obj/item/clothing/under/rank/scientist/skirt
+ allowed_roles = list("Research Director","Scientist")
+
+/datum/gear/uniform/skirt/cargo
+ display_name = "skirt, cargo"
+ path = /obj/item/clothing/under/rank/cargotech/skirt
+ allowed_roles = list("Quartermaster","Cargo Technician")
+
+/datum/gear/uniform/skirt/qm
+ display_name = "skirt, QM"
+ path = /obj/item/clothing/under/rank/cargo/skirt
+ allowed_roles = list("Quartermaster")
+
+/datum/gear/uniform/skirt/warden
+ display_name = "skirt, warden"
+ path = /obj/item/clothing/under/rank/security/warden/skirt
+ allowed_roles = list("Head of Security", "Warden")
+
+/datum/gear/uniform/skirt/security
+ display_name = "skirt, security"
+ path = /obj/item/clothing/under/rank/security/skirt
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
+
+/datum/gear/uniform/skirt/head_of_security
+ display_name = "skirt, hos"
+ path = /obj/item/clothing/under/rank/security/head_of_security/skirt
+ allowed_roles = list("Head of Security")
+
+/datum/gear/uniform/jeans_qm
+ display_name = "jeans, QM"
+ path = /obj/item/clothing/under/rank/cargo/jeans
+ allowed_roles = list("Quartermaster")
+
+/datum/gear/uniform/jeans_qmf
+ display_name = "female jeans, QM"
+ path = /obj/item/clothing/under/rank/cargo/jeans/female
+ allowed_roles = list("Quartermaster")
+
+/datum/gear/uniform/jeans_cargo
+ display_name = "jeans, cargo"
+ path = /obj/item/clothing/under/rank/cargotech/jeans
+ allowed_roles = list("Quartermaster","Cargo Technician")
+
+/datum/gear/uniform/jeans_cargof
+ display_name = "female jeans, cargo"
+ path = /obj/item/clothing/under/rank/cargotech/jeans/female
+ allowed_roles = list("Quartermaster","Cargo Technician")
+
/datum/gear/uniform/suit //amish
display_name = "suit, amish"
path = /obj/item/clothing/under/sl_suit
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index fae598251c6..30bf89c1c3f 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -8,7 +8,6 @@
worn_state = "ba_suit"
rolled_sleeves = 0
-
/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 \"Captain\"."
name = "captain's jumpsuit"
@@ -17,7 +16,6 @@
worn_state = "captain"
rolled_sleeves = 0
-
/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."
@@ -26,14 +24,6 @@
worn_state = "qm"
rolled_sleeves = 0
-/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"
- worn_state = "qmf"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/obj/item/clothing/under/rank/cargo/jeans
name = "quartermaster's jumpjeans"
desc = "Jeeeaaans! They're comfy!"
@@ -56,13 +46,6 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
rolled_sleeves = 0
-/obj/item/clothing/under/rank/cargotech/skirt
- name = "cargo technician's jumpskirt"
- desc = "Skirrrrrts! They're comfy and easy to wear!"
- icon_state = "cargof"
- worn_state = "cargof"
- rolled_sleeves = -1
-
/obj/item/clothing/under/rank/cargotech/jeans
name = "cargo technician's jumpjeans"
desc = "Jeeeaaans! They're comfy!"
@@ -76,7 +59,6 @@
icon_state = "cargojf"
worn_state = "cargojf"
-
/obj/item/clothing/under/rank/chaplain
desc = "It's a black jumpsuit, often worn by religious folk."
name = "chaplain's jumpsuit"
@@ -85,7 +67,6 @@
worn_state = "chapblack"
rolled_sleeves = 0
-
/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"
@@ -94,7 +75,6 @@
worn_state = "chef"
rolled_sleeves = 0
-
/obj/item/clothing/under/rank/clown
name = "clown suit"
desc = "'HONK!'"
@@ -103,7 +83,6 @@
worn_state = "clown"
rolled_sleeves = -1
-
/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"
@@ -120,7 +99,6 @@
worn_state = "hopwhimsy"
rolled_sleeves = -1
-
/obj/item/clothing/under/rank/hydroponics
desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
name = "botanist's jumpsuit"
@@ -130,7 +108,6 @@
permeability_coefficient = 0.50
rolled_sleeves = 0
-
/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"
@@ -139,7 +116,6 @@
worn_state = "internalaffairs"
rolled_sleeves = 0
-
/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"
@@ -149,40 +125,34 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
rolled_sleeves = 0
-
/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"
item_state = "lawyer_black"
worn_state = "lawyer_black"
-
/obj/item/clothing/under/lawyer/female
name = "black Lawyer suit"
icon_state = "black_suit_fem"
item_state = "lawyer_black"
worn_state = "black_suit_fem"
-
/obj/item/clothing/under/lawyer/red
name = "red Lawyer suit"
icon_state = "lawyer_red"
item_state = "lawyer_red"
worn_state = "lawyer_red"
-
/obj/item/clothing/under/lawyer/blue
name = "blue Lawyer suit"
icon_state = "lawyer_blue"
item_state = "lawyer_blue"
worn_state = "lawyer_blue"
-
/obj/item/clothing/under/lawyer/bluesuit
name = "Blue Suit"
desc = "A classy suit and tie"
@@ -190,7 +160,6 @@
item_state = "ba_suit"
worn_state = "bluesuit"
-
/obj/item/clothing/under/lawyer/purpsuit
name = "Purple Suit"
icon_state = "lawyer_purp"
@@ -204,7 +173,6 @@
item_state = "johnny"
worn_state = "oldman"
-
/obj/item/clothing/under/librarian
name = "sensible suit"
desc = "It's very... sensible."
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
index 0cdcac576be..0c820c6e7ae 100644
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ b/code/modules/clothing/under/jobs/engineering.dm
@@ -8,14 +8,6 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
rolled_sleeves = 0
-/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"
- worn_state = "chieff"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/obj/item/clothing/under/rank/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
name = "atmospheric technician's jumpsuit"
@@ -24,14 +16,6 @@
worn_state = "atmos"
rolled_sleeves = 0
-/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"
- worn_state = "atmosf"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/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"
@@ -41,25 +25,10 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
rolled_sleeves = 0
-/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"
- worn_state = "enginef"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/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"
item_state = "bl_suit"
worn_state = "robotics"
- rolled_sleeves = 0
-
-/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"
- worn_state = "roboticsf"
- rolled_sleeves = -1
+ rolled_sleeves = 0
\ No newline at end of file
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index 4b212331be3..a80cd626c3b 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -36,13 +36,6 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
rolled_sleeves = 0
-/obj/item/clothing/under/rank/scientist/skirt
- name = "scientist's jumpskirt"
- icon_state = "sciencewhitef"
- worn_state = "sciencewhitef"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/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"
@@ -53,13 +46,6 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
rolled_sleeves = 0
-/obj/item/clothing/under/rank/chemist/skirt
- name = "chemist's jumpskirt"
- icon_state = "chemistrywhitef"
- worn_state = "chemistrywhitef"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/*
* Medical
*/
@@ -73,14 +59,6 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
rolled_sleeves = 0
-/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"
- worn_state = "cmof"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/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"
@@ -91,13 +69,6 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
rolled_sleeves = 0
-/obj/item/clothing/under/rank/geneticist/skirt
- name = "geneticist's jumpskirt"
- icon_state = "geneticswhitef"
- worn_state = "geneticswhitef"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/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"
@@ -108,13 +79,6 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
rolled_sleeves = 0
-/obj/item/clothing/under/rank/virologist/skirt
- name = "virologist's jumpskirt"
- icon_state = "virologywhitef"
- worn_state = "virologywhitef"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/obj/item/clothing/under/rank/nursesuit
desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
name = "nurse's suit"
@@ -157,13 +121,6 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
rolled_sleeves = 0
-/obj/item/clothing/under/rank/medical/skirt
- name = "medical doctor's jumpskirt"
- icon_state = "medicalf"
- worn_state = "medicalf"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- rolled_sleeves = -1
-
/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."
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 65bcf80fc09..c934837a80f 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -18,13 +18,6 @@
siemens_coefficient = 0.9
rolled_sleeves = 0
-/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"
- item_state = "r_suit"
- worn_state = "wardenf"
-
/obj/item/clothing/head/helmet/warden
name = "warden's hat"
desc = "It's a special helmet issued to the Warden of a securiy force."
@@ -41,13 +34,6 @@
siemens_coefficient = 0.9
rolled_sleeves = 0
-/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 = "secredf"
- item_state = "r_suit"
- worn_state = "secredf"
-
/obj/item/clothing/under/rank/dispatch
name = "dispatcher's uniform"
desc = "A dress shirt and khakis with a security patch sewn on."
@@ -174,13 +160,6 @@
siemens_coefficient = 0.8
rolled_sleeves = 0
-/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 = "hosredf"
- item_state = "r_suit"
- worn_state = "hosredf"
-
/obj/item/clothing/under/rank/head_of_security/corp
icon_state = "hos_corporate"
//item_state = "hos_corporate"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 929578ccbfb..57f28491172 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -211,14 +211,6 @@
item_state = "r_suit"
worn_state = "red_suit"
-/obj/item/clothing/under/blackskirt
- name = "black skirt"
- desc = "A black skirt, very fancy!"
- icon_state = "blackskirt"
- item_state = "bl_suit"
- worn_state = "blackskirt"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-
/obj/item/clothing/under/schoolgirl
name = "schoolgirl uniform"
desc = "It's just like one of my Japanese animes!"
@@ -401,26 +393,6 @@
worn_state = "huresource"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-/obj/item/clothing/under/dress/plaid_blue
- name = "blue plaid skirt"
- desc = "A preppy blue skirt with a white blouse."
- icon_state = "plaid_blue"
- worn_state = "plaid_blue"
-
-/obj/item/clothing/under/dress/plaid_red
- name = "red plaid skirt"
- desc = "A preppy red skirt with a white blouse."
- icon_state = "plaid_red"
- item_state = "kilt"
- worn_state = "plaid_red"
-
-/obj/item/clothing/under/dress/plaid_purple
- name = "blue purple skirt"
- desc = "A preppy purple skirt with a white blouse."
- icon_state = "plaid_purple"
- item_state = "kilt"
- worn_state = "plaid_purple"
-
//wedding stuff
/obj/item/clothing/under/wedding/
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index 1d792bcc107..c4b712c4c34 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -100,3 +100,152 @@
name = "khaki short shorts"
icon_state = "khaki_shorts_f"
worn_state = "khaki_shorts_f"
+
+//Argh, skirts be below this line -> ------------------------------
+
+/obj/item/clothing/under/skirt
+ name = "black skirt"
+ desc = "A black skirt, very fancy!"
+ icon_state = "blackskirt"
+ item_state = "bl_suit"
+ worn_state = "blackskirt"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ rolled_sleeves = -1
+
+/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/black
+ name = "short black skirt"
+ desc = "A skirt that is a shiny black."
+ icon_state = "skirt_short_black"
+
+/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/swept
+ name = "swept skirt"
+ desc = "A skirt that is swept to one side."
+ icon_state = "skirt_swept"
+
+/obj/item/clothing/under/skirt/plaid_blue
+ name = "blue plaid skirt"
+ desc = "A preppy blue skirt with a white blouse."
+ icon_state = "plaid_blue"
+ worn_state = "plaid_blue"
+
+/obj/item/clothing/under/skirt/plaid_red
+ name = "red plaid skirt"
+ desc = "A preppy red skirt with a white blouse."
+ icon_state = "plaid_red"
+ item_state = "kilt"
+ worn_state = "plaid_red"
+
+/obj/item/clothing/under/skirt/plaid_purple
+ name = "blue purple skirt"
+ desc = "A preppy purple skirt with a white blouse."
+ icon_state = "plaid_purple"
+ item_state = "kilt"
+ worn_state = "plaid_purple"
+
+/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"
+ worn_state = "qmf"
+
+/obj/item/clothing/under/rank/cargotech/skirt
+ name = "cargo technician's jumpskirt"
+ desc = "Skirrrrrts! They're comfy and easy to wear!"
+ icon_state = "cargof"
+ worn_state = "cargof"
+
+/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"
+ worn_state = "enginef"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
+
+/obj/item/clothing/under/rank/engineer/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"
+ worn_state = "chieff"
+
+/obj/item/clothing/under/rank/engineer/atmospheric_technician/skirt
+ desc = "It's a jumpskirt worn by atmospheric technicians."
+ name = "atmospheric technician's jumpskirt"
+ icon_state = "atmosf"
+ worn_state = "atmosf"
+
+/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"
+ worn_state = "roboticsf"
+
+/obj/item/clothing/under/rank/scientist/skirt
+ name = "scientist's jumpskirt"
+ icon_state = "sciencewhitef"
+ worn_state = "sciencewhitef"
+ permeability_coefficient = 0.50
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
+
+/obj/item/clothing/under/rank/medical/skirt
+ name = "medical doctor's jumpskirt"
+ icon_state = "medicalf"
+ worn_state = "medicalf"
+
+/obj/item/clothing/under/rank/medical/chemist/skirt
+ name = "chemist's jumpskirt"
+ icon_state = "chemistrywhitef"
+ worn_state = "chemistrywhitef"
+
+/obj/item/clothing/under/rank/medical/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"
+ worn_state = "cmof"
+
+/obj/item/clothing/under/rank/medical/geneticist/skirt
+ name = "geneticist's jumpskirt"
+ icon_state = "geneticswhitef"
+ worn_state = "geneticswhitef"
+
+/obj/item/clothing/under/rank/medical/virologist/skirt
+ name = "virologist's jumpskirt"
+ icon_state = "virologywhitef"
+ worn_state = "virologywhitef"
+
+/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 = "secredf"
+ item_state = "r_suit"
+ worn_state = "secredf"
+ armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+ siemens_coefficient = 0.9
+
+/obj/item/clothing/under/rank/security/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"
+ item_state = "r_suit"
+ worn_state = "wardenf"
+
+/obj/item/clothing/under/rank/security/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 = "hosredf"
+ item_state = "r_suit"
+ worn_state = "hosredf"
\ No newline at end of file
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 89d76d9ad4f..164edca6f97 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index fb5e84f0327..eac0ec10ab8 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ