h

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -9,6 +9,7 @@
 	new /obj/item/clothing/head/beret/qm(src)
 	new /obj/item/storage/lockbox/medal/cargo(src)
 	new /obj/item/clothing/under/rank/cargo(src)
+	new /obj/item/clothing/under/rank/cargo/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -8,6 +8,7 @@
 	new /obj/item/clothing/neck/cloak/ce(src)
 	new /obj/item/clothing/head/beret/ce(src)
 	new /obj/item/clothing/under/rank/chief_engineer(src)
+	new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
 	new /obj/item/clothing/head/hardhat/white(src)
 	new /obj/item/clothing/head/welding(src)
 	new /obj/item/clothing/gloves/color/yellow(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -61,6 +61,7 @@
 	new /obj/item/clothing/head/bio_hood/cmo(src)
 	new /obj/item/clothing/suit/toggle/labcoat/cmo(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/shoes/sneakers/brown	(src)
 	new /obj/item/cartridge/cmo(src)
 	new /obj/item/radio/headset/heads/cmo(src)

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -11,8 +11,11 @@
 	new /obj/item/clothing/head/bio_hood/scientist(src)
 	new /obj/item/clothing/suit/toggle/labcoat(src)
 	new /obj/item/clothing/under/rank/research_director(src)
+	new /obj/item/clothing/under/rank/research_director/skirt(src)
 	new /obj/item/clothing/under/rank/research_director/alt(src)
+	new /obj/item/clothing/under/rank/research_director/alt/skirt(src)
 	new /obj/item/clothing/under/rank/research_director/turtleneck(src)
+	new /obj/item/clothing/under/rank/research_director/turtleneck/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/cartridge/rd(src)
 	new /obj/item/clothing/gloves/color/latex(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -2,7 +2,6 @@
 	name = "\proper captain's locker"
 	req_access = list(ACCESS_CAPTAIN)
 	icon_state = "cap"
-
 /obj/structure/closet/secure_closet/captains/PopulateContents()
 	..()
 	new /obj/item/clothing/suit/hooded/wintercoat/captain(src)
@@ -14,6 +13,7 @@
 	new /obj/item/pet_carrier(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/clothing/under/rank/captain(src)
+	new /obj/item/clothing/under/rank/captain/skirt(src)
 	new /obj/item/clothing/suit/armor/vest/capcarapace(src)
 	new /obj/item/clothing/head/caphat(src)
 	new /obj/item/clothing/under/captainparade(src)
@@ -34,16 +34,15 @@
 	new /obj/item/gun/energy/e_gun(src)
 	new /obj/item/door_remote/captain(src)
 	new /obj/item/storage/photo_album/Captain(src)
-
 /obj/structure/closet/secure_closet/hop
 	name = "\proper head of personnel's locker"
 	req_access = list(ACCESS_HOP)
 	icon_state = "hop"
-
 /obj/structure/closet/secure_closet/hop/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/hop(src)
 	new /obj/item/clothing/under/rank/head_of_personnel(src)
+	new /obj/item/clothing/under/rank/head_of_personnel/skirt(src)
 	new /obj/item/clothing/head/hopcap(src)
 	new /obj/item/clothing/head/hopcap/beret(src)
 	new /obj/item/cartridge/hop(src)
@@ -62,12 +61,10 @@
 	new /obj/item/door_remote/civillian(src)
 	new /obj/item/circuitboard/machine/techfab/department/service(src)
 	new /obj/item/storage/photo_album/HoP(src)
-
 /obj/structure/closet/secure_closet/hos
 	name = "\proper head of security's locker"
 	req_access = list(ACCESS_HOS)
 	icon_state = "hos"
-
 /obj/structure/closet/secure_closet/hos/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/hos(src)
@@ -77,7 +74,9 @@
 	new /obj/item/clothing/under/hosparademale(src)
 	new /obj/item/clothing/suit/armor/vest/leather(src)
 	new /obj/item/clothing/suit/armor/hos(src)
+	new /obj/item/clothing/under/rank/head_of_security/skirt(src)
 	new /obj/item/clothing/under/rank/head_of_security/alt(src)
+	new /obj/item/clothing/under/rank/head_of_security/alt/skirt(src)
 	new /obj/item/clothing/head/HoS(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src)
@@ -95,12 +94,10 @@
 	new /obj/item/pinpointer/nuke(src)
 	new /obj/item/circuitboard/machine/techfab/department/security(src)
 	new /obj/item/storage/photo_album/HoS(src)
-
 /obj/structure/closet/secure_closet/warden
 	name = "\proper warden's locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "warden"
-
 /obj/structure/closet/secure_closet/warden/PopulateContents()
 	..()
 	new /obj/item/radio/headset/headset_sec(src)
@@ -110,6 +107,7 @@
 	new /obj/item/clothing/head/beret/sec/navywarden(src)
 	new /obj/item/clothing/suit/armor/vest/warden/alt(src)
 	new /obj/item/clothing/under/rank/warden/navyblue(src)
+	new /obj/item/clothing/under/rank/warden/skirt(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/holosign_creator/security(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
@@ -120,12 +118,10 @@
 	new /obj/item/clothing/gloves/krav_maga/sec(src)
 	new /obj/item/door_remote/head_of_security(src)
 	new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
-
 /obj/structure/closet/secure_closet/security
 	name = "security officer's locker"
 	req_access = list(ACCESS_SECURITY)
 	icon_state = "sec"
-
 /obj/structure/closet/secure_closet/security/PopulateContents()
 	..()
 	new /obj/item/clothing/suit/armor/vest(src)
@@ -134,57 +130,48 @@
 	new /obj/item/radio/headset/headset_sec/alt(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/flashlight/seclite(src)
-
 /obj/structure/closet/secure_closet/security/sec
-
 /obj/structure/closet/secure_closet/security/sec/PopulateContents()
 	..()
 	new /obj/item/storage/belt/security/full(src)
-
 /obj/structure/closet/secure_closet/security/cargo
-
 /obj/structure/closet/secure_closet/security/cargo/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/cargo(src)
 	new /obj/item/encryptionkey/headset_cargo(src)
-
 /obj/structure/closet/secure_closet/security/engine
-
 /obj/structure/closet/secure_closet/security/engine/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/engine(src)
 	new /obj/item/encryptionkey/headset_eng(src)
-
 /obj/structure/closet/secure_closet/security/science
-
 /obj/structure/closet/secure_closet/security/science/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/science(src)
 	new /obj/item/encryptionkey/headset_sci(src)
-
 /obj/structure/closet/secure_closet/security/med
-
 /obj/structure/closet/secure_closet/security/med/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/medblue(src)
 	new /obj/item/encryptionkey/headset_med(src)
-
 /obj/structure/closet/secure_closet/detective
 	name = "\improper detective's cabinet"
 	req_access = list(ACCESS_FORENSICS_LOCKERS)
 	icon_state = "cabinet"
 	resistance_flags = FLAMMABLE
 	max_integrity = 70
-
 /obj/structure/closet/secure_closet/detective/PopulateContents()
 	..()
 	new /obj/item/clothing/under/rank/det(src)
+	new /obj/item/clothing/under/rank/det/skirt(src)
 	new /obj/item/clothing/suit/det_suit(src)
 	new /obj/item/clothing/head/fedora/det_hat(src)
 	new /obj/item/clothing/gloves/color/black(src)
 	new /obj/item/clothing/under/rank/det/grey(src)
+	new /obj/item/clothing/under/rank/det/grey/skirt(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
 	new /obj/item/clothing/suit/det_suit/grey(src)
+	new /obj/item/clothing/suit/det_suit/noir(src)
 	new /obj/item/clothing/head/fedora(src)
 	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/storage/box/evidence(src)
@@ -200,33 +187,29 @@
 /obj/structure/closet/secure_closet/injection
 	name = "lethal injections"
 	req_access = list(ACCESS_HOS)
-
 /obj/structure/closet/secure_closet/injection/PopulateContents()
 	..()
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/syringe/lethal/execution(src)
-
 /obj/structure/closet/secure_closet/brig
 	name = "brig locker"
 	req_access = list(ACCESS_BRIG)
 	anchored = TRUE
 	var/id = null
-
 /obj/structure/closet/secure_closet/evidence
 	anchored = TRUE
 	name = "Secure Evidence Closet"
 	req_access_txt = "0"
 	req_one_access_txt = list(ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS)
-
 /obj/structure/closet/secure_closet/brig/PopulateContents()
 	..()
 	new /obj/item/clothing/under/rank/prisoner( src )
+	new /obj/item/clothing/under/rank/prisoner/skirt( src )
 	new /obj/item/clothing/shoes/sneakers/orange( src )
 
 /obj/structure/closet/secure_closet/courtroom
 	name = "courtroom locker"
 	req_access = list(ACCESS_COURT)
-
 /obj/structure/closet/secure_closet/courtroom/PopulateContents()
 	..()
 	new /obj/item/clothing/shoes/sneakers/brown(src)
@@ -236,22 +219,18 @@
 	new /obj/item/clothing/suit/judgerobe (src)
 	new /obj/item/clothing/head/powdered_wig (src)
 	new /obj/item/storage/briefcase(src)
-
 /obj/structure/closet/secure_closet/contraband/armory
 	anchored = TRUE
 	name = "Contraband Locker"
 	req_access = list(ACCESS_ARMORY)
-
 /obj/structure/closet/secure_closet/contraband/heads
 	anchored = TRUE
 	name = "Contraband Locker"
 	req_access = list(ACCESS_HEADS)
-
 /obj/structure/closet/secure_closet/armory1
 	name = "armory armor locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "armory"
-
 /obj/structure/closet/secure_closet/armory1/PopulateContents()
 	..()
 	new /obj/item/clothing/suit/armor/laserproof(src)
@@ -261,12 +240,10 @@
 		new /obj/item/clothing/head/helmet/riot(src)
 	for(var/i in 1 to 3)
 		new /obj/item/shield/riot(src)
-
 /obj/structure/closet/secure_closet/armory2
 	name = "armory ballistics locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "armory"
-
 /obj/structure/closet/secure_closet/armory2/PopulateContents()
 	..()
 	new /obj/item/storage/box/firingpins(src)
@@ -274,12 +251,10 @@
 		new /obj/item/storage/box/rubbershot(src)
 	for(var/i in 1 to 3)
 		new /obj/item/gun/ballistic/shotgun/riot(src)
-
 /obj/structure/closet/secure_closet/armory3
 	name = "armory energy gun locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "armory"
-
 /obj/structure/closet/secure_closet/armory3/PopulateContents()
 	..()
 	new /obj/item/storage/box/firingpins(src)
@@ -288,24 +263,20 @@
 		new /obj/item/gun/energy/e_gun(src)
 	for(var/i in 1 to 3)
 		new /obj/item/gun/energy/laser(src)
-
 /obj/structure/closet/secure_closet/tac
 	name = "armory tac locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "tac"
-
 /obj/structure/closet/secure_closet/tac/PopulateContents()
 	..()
 	new /obj/item/gun/ballistic/automatic/wt550(src)
 	new /obj/item/clothing/head/helmet/alt(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
 	new /obj/item/clothing/suit/armor/bulletproof(src)
-
 /obj/structure/closet/secure_closet/lethalshots
 	name = "shotgun lethal rounds"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "tac"
-
 /obj/structure/closet/secure_closet/lethalshots/PopulateContents()
 	..()
 	for(var/i in 1 to 3)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -2,33 +2,34 @@
 	name = "wardrobe"
 	desc = "It's a storage unit for standard-issue Nanotrasen attire."
 	icon_door = "blue"
-
 /obj/structure/closet/wardrobe/PopulateContents()
 	..()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/blue(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/blue(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/brown(src)
 	return
-
 /obj/structure/closet/wardrobe/pink
 	name = "pink wardrobe"
 	icon_door = "pink"
-
 /obj/structure/closet/wardrobe/pink/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/pink(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/pink(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/brown(src)
 	return
-
 /obj/structure/closet/wardrobe/black
 	name = "black wardrobe"
 	icon_door = "black"
-
 /obj/structure/closet/wardrobe/black/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/black(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/black(src)
 	if(prob(25))
 		new /obj/item/clothing/suit/jacket/leather(src)
 	if(prob(20))
@@ -44,66 +45,60 @@
 	if(prob(40))
 		new /obj/item/clothing/mask/bandana/skull(src)
 	return
-
-
 /obj/structure/closet/wardrobe/green
 	name = "green wardrobe"
 	icon_door = "green"
-
 /obj/structure/closet/wardrobe/green/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/green(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/green(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/clothing/mask/bandana/green(src)
 	new /obj/item/clothing/mask/bandana/green(src)
 	return
-
-
 /obj/structure/closet/wardrobe/orange
 	name = "prison wardrobe"
 	desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
 	icon_door = "orange"
-
 /obj/structure/closet/wardrobe/orange/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/rank/prisoner(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/rank/prisoner/skirt(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/orange(src)
 	return
-
-
 /obj/structure/closet/wardrobe/yellow
 	name = "yellow wardrobe"
 	icon_door = "yellow"
-
 /obj/structure/closet/wardrobe/yellow/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/yellow(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/yellow(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/orange(src)
 	new /obj/item/clothing/mask/bandana/gold(src)
 	new /obj/item/clothing/mask/bandana/gold(src)
 	return
-
-
 /obj/structure/closet/wardrobe/white
 	name = "white wardrobe"
 	icon_door = "white"
-
 /obj/structure/closet/wardrobe/white/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/white(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/white(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/white(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/head/soft/mime(src)
 	return
-
 /obj/structure/closet/wardrobe/pjs
 	name = "pajama wardrobe"
 	icon_door = "white"
-
 /obj/structure/closet/wardrobe/pjs/PopulateContents()
 	new /obj/item/clothing/under/pj/red(src)
 	new /obj/item/clothing/under/pj/red(src)
@@ -112,15 +107,14 @@
 	for(var/i in 1 to 4)
 		new /obj/item/clothing/shoes/sneakers/white(src)
 	return
-
-
 /obj/structure/closet/wardrobe/grey
 	name = "grey wardrobe"
 	icon_door = "grey"
-
 /obj/structure/closet/wardrobe/grey/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/grey(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/grey(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/black(src)
 	for(var/i in 1 to 3)
@@ -140,28 +134,36 @@
 	if(prob(30))
 		new /obj/item/clothing/accessory/pocketprotector(src)
 	return
-
-
 /obj/structure/closet/wardrobe/mixed
 	name = "mixed wardrobe"
 	icon_door = "mixed"
-
 /obj/structure/closet/wardrobe/mixed/PopulateContents()
 	if(prob(40))
 		new /obj/item/clothing/suit/jacket(src)
 	if(prob(40))
 		new /obj/item/clothing/suit/jacket(src)
 	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/under/skirt/color/white(src)
 	new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/under/skirt/color/blue(src)
 	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/skirt/color/yellow(src)
 	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/skirt/color/green(src)
 	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/skirt/color/orange(src)
 	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/under/skirt/color/pink(src)
 	new /obj/item/clothing/under/color/red(src)
+	new /obj/item/clothing/under/skirt/color/red(src)
 	new /obj/item/clothing/under/color/darkblue(src)
+	new /obj/item/clothing/under/skirt/color/darkblue(src)
 	new /obj/item/clothing/under/color/teal(src)
+	new /obj/item/clothing/under/skirt/color/teal(src)
 	new /obj/item/clothing/under/color/lightpurple(src)
+	new /obj/item/clothing/under/skirt/color/lightpurple(src)
 	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/skirt/color/green(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/blue(src)

code/modules/clothing/under/color.dm

@@ -1,12 +1,18 @@
 /obj/item/clothing/under/color
 	desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
 
+/obj/item/clothing/under/skirt/color
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/color/random
 	icon_state = "random_jumpsuit"
 
 /obj/item/clothing/under/color/random/Initialize()
 	..()
-	var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
+	var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - subtypesof(/obj/item/clothing/under/skirt/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
+
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
 		H.equip_to_slot_or_del(new C(H), SLOT_W_UNIFORM) //or else you end up with naked assistants running around everywhere...
@@ -21,6 +27,12 @@
 	item_color = "black"
 	resistance_flags = NONE
 
+/obj/item/clothing/under/skirt/color/black
+	name = "black jumpskirt"
+	icon_state = "black_skirt"
+	item_state = "bl_suit"
+	item_color = "black_skirt"
+
 /obj/item/clothing/under/color/black/ghost
 	item_flags = DROPDEL
 
@@ -28,6 +40,9 @@
 	. = ..()
 	ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
 
+/obj/item/clothing/under/color/black/ghost/Initialize()
+	. = ..()
+	ADD_TRAIT(src, NODROP, DROPDEL)
 /obj/item/clothing/under/color/grey
 	name = "grey jumpsuit"
 	desc = "A tasteful grey jumpsuit that reminds you of the good old days."
@@ -35,6 +50,13 @@
 	item_state = "gy_suit"
 	item_color = "grey"
 
+/obj/item/clothing/under/skirt/color/grey
+	name = "grey jumpskirt"
+	desc = "A tasteful grey jumpskirt that reminds you of the good old days."
+	icon_state = "grey_skirt"
+	item_state = "gy_suit"
+	item_color = "grey_skirt"
+
 /obj/item/clothing/under/color/grey/glorf
 	name = "ancient jumpsuit"
 	desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade."
@@ -49,12 +71,24 @@
 	item_state = "b_suit"
 	item_color = "blue"
 
+/obj/item/clothing/under/skirt/color/blue
+	name = "blue jumpskirt"
+	icon_state = "blue_skirt"
+	item_state = "b_suit"
+	item_color = "blue_skirt"
+
 /obj/item/clothing/under/color/green
 	name = "green jumpsuit"
 	icon_state = "green"
 	item_state = "g_suit"
 	item_color = "green"
 
+/obj/item/clothing/under/skirt/color/green
+	name = "green jumpskirt"
+	icon_state = "green_skirt"
+	item_state = "g_suit"
+	item_color = "green_skirt"
+
 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
 	desc = "Don't wear this near paranoid security officers."
@@ -62,6 +96,12 @@
 	item_state = "o_suit"
 	item_color = "orange"
 
+/obj/item/clothing/under/skirt/color/orange
+	name = "orange jumpskirt"
+	icon_state = "orange_skirt"
+	item_state = "o_suit"
+	item_color = "orange_skirt"
+
 /obj/item/clothing/under/color/pink
 	name = "pink jumpsuit"
 	icon_state = "pink"
@@ -69,66 +109,133 @@
 	item_state = "p_suit"
 	item_color = "pink"
 
+/obj/item/clothing/under/skirt/color/pink
+	name = "pink jumpskirt"
+	icon_state = "pink_skirt"
+	item_state = "p_suit"
+	item_color = "pink_skirt"
+
 /obj/item/clothing/under/color/red
 	name = "red jumpsuit"
 	icon_state = "red"
 	item_state = "r_suit"
 	item_color = "red"
 
+/obj/item/clothing/under/skirt/color/red
+	name = "red jumpskirt"
+	icon_state = "red_skirt"
+	item_state = "r_suit"
+	item_color = "red_skirt"
+
 /obj/item/clothing/under/color/white
 	name = "white jumpsuit"
 	icon_state = "white"
 	item_state = "w_suit"
 	item_color = "white"
 
+/obj/item/clothing/under/skirt/color/white
+	name = "white jumpskirt"
+	icon_state = "white_skirt"
+	item_state = "w_suit"
+	item_color = "white_skirt"
+
 /obj/item/clothing/under/color/yellow
 	name = "yellow jumpsuit"
 	icon_state = "yellow"
 	item_state = "y_suit"
 	item_color = "yellow"
 
+/obj/item/clothing/under/skirt/color/yellow
+	name = "yellow jumpskirt"
+	icon_state = "yellow_skirt"
+	item_state = "y_suit"
+	item_color = "yellow_skirt"
+
 /obj/item/clothing/under/color/darkblue
 	name = "darkblue jumpsuit"
 	icon_state = "darkblue"
 	item_state = "b_suit"
 	item_color = "darkblue"
 
+/obj/item/clothing/under/skirt/color/darkblue
+	name = "darkblue jumpskirt"
+	icon_state = "darkblue_skirt"
+	item_state = "b_suit"
+	item_color = "darkblue_skirt"
+
 /obj/item/clothing/under/color/teal
 	name = "teal jumpsuit"
 	icon_state = "teal"
 	item_state = "b_suit"
 	item_color = "teal"
 
+/obj/item/clothing/under/skirt/color/teal
+	name = "teal jumpskirt"
+	icon_state = "teal_skirt"
+	item_state = "b_suit"
+	item_color = "teal_skirt"
+
+
 /obj/item/clothing/under/color/lightpurple
 	name = "purple jumpsuit"
 	icon_state = "lightpurple"
 	item_state = "p_suit"
 	item_color = "lightpurple"
 
+/obj/item/clothing/under/skirt/color/lightpurple
+	name = "lightpurple jumpskirt"
+	icon_state = "lightpurple_skirt"
+	item_state = "p_suit"
+	item_color = "lightpurple_skirt"
+
 /obj/item/clothing/under/color/darkgreen
 	name = "darkgreen jumpsuit"
 	icon_state = "darkgreen"
 	item_state = "g_suit"
 	item_color = "darkgreen"
 
+/obj/item/clothing/under/skirt/color/darkgreen
+	name = "darkgreen jumpskirt"
+	icon_state = "darkgreen_skirt"
+	item_state = "g_suit"
+	item_color = "darkgreen_skirt"
+
 /obj/item/clothing/under/color/lightbrown
 	name = "lightbrown jumpsuit"
 	icon_state = "lightbrown"
 	item_state = "lb_suit"
 	item_color = "lightbrown"
 
+/obj/item/clothing/under/skirt/color/lightbrown
+	name = "lightbrown jumpskirt"
+	icon_state = "lightbrown_skirt"
+	item_state = "lb_suit"
+	item_color = "lightbrown_skirt"
+
 /obj/item/clothing/under/color/brown
 	name = "brown jumpsuit"
 	icon_state = "brown"
 	item_state = "lb_suit"
 	item_color = "brown"
 
+/obj/item/clothing/under/skirt/color/brown
+	name = "brown jumpskirt"
+	icon_state = "brown_skirt"
+	item_state = "lb_suit"
+	item_color = "brown_skirt"
+
 /obj/item/clothing/under/color/maroon
 	name = "maroon jumpsuit"
 	icon_state = "maroon"
 	item_state = "r_suit"
 	item_color = "maroon"
 
+/obj/item/clothing/under/skirt/color/maroon
+	name = "maroon jumpskirt"
+	icon_state = "maroon_skirt"
+	item_state = "r_suit"
+	item_color = "maroon_skirt"
+
 /obj/item/clothing/under/color/rainbow
 	name = "rainbow jumpsuit"
 	desc = "A multi-colored jumpsuit!"

code/modules/clothing/under/jobs/civilian.dm

@@ -16,6 +16,16 @@
 	item_color = "purplebartender"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/rank/bartender/skirt
+	name = "bartender's skirt"
+	desc = "It looks like it could use some more flair."
+	icon_state = "barman_skirt"
+	item_state = "bar_suit"
+	item_color = "barman_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /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"
@@ -25,6 +35,16 @@
 	sensor_mode = SENSOR_COORDS
 	random_sensor = FALSE
 
+/obj/item/clothing/under/rank/captain/skirt
+	name = "captain's jumpskirt"
+	desc = "It's a blue jumpskirt with some gold markings denoting the rank of \"Captain\"."
+	icon_state = "captain_skirt"
+	item_state = "b_suit"
+	item_color = "captain_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /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."
@@ -32,6 +52,16 @@
 	item_state = "lb_suit"
 	item_color = "qm"
 
+/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 = "qm_skirt"
+	item_state = "lb_suit"
+	item_color = "qm_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/cargotech
 	name = "cargo technician's jumpsuit"
 	desc = "Shooooorts! They're comfy and easy to wear!"
@@ -42,6 +72,15 @@
 	mutantrace_variation = MUTANTRACE_VARIATION
 	alt_covers_chest = TRUE
 
+/obj/item/clothing/under/rank/cargotech/skirt
+	name = "cargo technician's jumpskirt"
+	desc = "Skiiiiirts! They're comfy and easy to wear"
+	icon_state = "cargo_skirt"
+	item_state = "lb_suit"
+	item_color = "cargo_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
 
 /obj/item/clothing/under/rank/chaplain
 	desc = "It's a black jumpsuit, often worn by religious folk."
@@ -51,6 +90,16 @@
 	item_color = "chapblack"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/rank/chaplain/skirt
+	name = "chaplain's jumpskirt"
+	desc = "It's a black jumpskirt, often worn by religious folk."
+	icon_state = "chapblack_skirt"
+	item_state = "bl_suit"
+	item_color = "chapblack_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/chef
 	name = "cook's suit"
 	desc = "A suit which is given only to the most <b>hardcore</b> cooks in space."
@@ -58,6 +107,15 @@
 	item_color = "chef"
 	alt_covers_chest = TRUE
 
+/obj/item/clothing/under/rank/chef/skirt
+	name = "cook's skirt"
+	desc = "A skirt which is given only to the most <b>hardcore</b> cooks in space."
+	icon_state = "chef_skirt"
+	item_color = "chef_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/clown
 	name = "clown suit"
 	desc = "<i>'HONK!'</i>"
@@ -66,7 +124,6 @@
 	item_color = "clown"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/rank/blueclown
 	name = "blue clown suit"
 	desc = "<i>'BLUE HONK!'</i>"
@@ -130,7 +187,6 @@
 /obj/item/clothing/under/rank/clown/Initialize()
 	. = ..()
 	AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50)
-
 /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"
@@ -139,6 +195,16 @@
 	item_color = "hop"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/rank/head_of_personnel/skirt
+	name = "head of personnel's jumpskirt"
+	desc = "It's a jumpskirt worn by someone who works in the position of \"Head of Personnel\"."
+	icon_state = "hop_skirt"
+	item_state = "b_suit"
+	item_color = "hop_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/hydroponics
 	desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
 	name = "botanist's jumpsuit"
@@ -147,6 +213,16 @@
 	item_color = "hydroponics"
 	permeability_coefficient = 0.5
 
+/obj/item/clothing/under/rank/hydroponics/skirt
+	name = "botanist's jumpskirt"
+	desc = "It's a jumpskirt designed to protect against minor plant-related hazards."
+	icon_state = "hydroponics_skirt"
+	item_state = "g_suit"
+	item_color = "hydroponics_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /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"
@@ -154,31 +230,59 @@
 	item_color = "janitor"
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
 
+/obj/item/clothing/under/rank/janitor/skirt
+	name = "janitor's jumpskirt"
+	desc = "It's the official skirt of the station's janitor. It has minor protection from biohazards."
+	icon_state = "janitor_skirt"
+	item_color = "janitor_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/lawyer
 	desc = "Slick threads."
 	name = "Lawyer suit"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/lawyer/black
 	icon_state = "lawyer_black"
 	item_state = "lawyer_black"
 	item_color = "lawyer_black"
 
+/obj/item/clothing/under/lawyer/black/skirt
+	name = "Lawyer black suitskirt"
+	icon_state = "lawyer_black_skirt"
+	item_state = "lawyer_black"
+	item_color = "lawyer_black_skirt"
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/lawyer/female
 	icon_state = "black_suit_fem"
 	item_state = "black_suit_fem"
 	item_color = "black_suit_fem"
-
 /obj/item/clothing/under/lawyer/red
 	icon_state = "lawyer_red"
 	item_state = "lawyer_red"
 	item_color = "lawyer_red"
 
+/obj/item/clothing/under/lawyer/red/skirt
+	name = "Lawyer red suitskirt"
+	icon_state = "lawyer_red_skirt"
+	item_state = "lawyer_red"
+	item_color = "lawyer_red_skirt"
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/lawyer/blue
 	icon_state = "lawyer_blue"
 	item_state = "lawyer_blue"
 	item_color = "lawyer_blue"
 
+/obj/item/clothing/under/lawyer/blue/skirt
+	name = "Lawyer blue suitskirt"
+	icon_state = "lawyer_blue_skirt"
+	item_state = "lawyer_blue"
+	item_color = "lawyer_blue_skirt"
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/lawyer/bluesuit
 	name = "blue suit"
 	desc = "A classy suit and tie."
@@ -188,6 +292,16 @@
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
 
+/obj/item/clothing/under/lawyer/bluesuit/skirt
+	name = "blue suitskirt"
+	desc = "A classy suitskirt and tie."
+	icon_state = "bluesuit_skirt"
+	item_state = "bluesuit"
+	item_color = "bluesuit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/lawyer/purpsuit
 	name = "purple suit"
 	icon_state = "lawyer_purp"
@@ -197,6 +311,15 @@
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
 
+/obj/item/clothing/under/lawyer/purpsuit/skirt
+	name = "purple suitskirt"
+	icon_state = "lawyer_purp_skirt"
+	item_state = "lawyer_purp"
+	item_color = "lawyer_purp_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/lawyer/blacksuit
 	name = "black suit"
 	desc = "A professional black suit. Nanotrasen Investigation Bureau approved!"
@@ -206,6 +329,16 @@
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
 
+/obj/item/clothing/under/lawyer/blacksuit/skirt
+	name = "black suitskirt"
+	desc = "A professional black suitskirt. Nanotrasen Investigation Bureau approved!"
+	icon_state = "reallyblack_suit_skirt"
+	item_state = "bar_suit"
+	item_color = "reallyblack_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/curator
 	name = "sensible suit"
 	desc = "It's very... sensible."
@@ -214,6 +347,16 @@
 	item_color = "red_suit"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/rank/curator/skirt
+	name = "sensible suitskirt"
+	desc = "It's very... sensible."
+	icon_state = "red_suit_skirt"
+	item_state = "red_suit"
+	item_color = "red_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/curator/treasure_hunter
 	name = "treasure hunter uniform"
 	desc = "A rugged uniform suitable for treasure hunting."
@@ -228,13 +371,22 @@
 	item_state = "mime"
 	item_color = "mime"
 
+/obj/item/clothing/under/rank/mime/skirt
+	name = "mime's skirt"
+	desc = "It's not very colourful."
+	icon_state = "mime_skirt"
+	item_state = "mime"
+	item_color = "mime_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /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"
 	item_state = "miner"
 	item_color = "miner"
-
 /obj/item/clothing/under/rank/miner/lavaland
 	desc = "A green uniform for operating in hazardous environments."
 	name = "shaft miner's jumpsuit"

code/modules/clothing/under/jobs/engineering.dm

@@ -8,6 +8,16 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 80, "acid" = 40)
 	resistance_flags = NONE
 
+/obj/item/clothing/under/rank/chief_engineer/skirt
+	name = "chief engineer's jumpskirt"
+	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."
+	icon_state = "chief_skirt"
+	item_state = "gy_suit"
+	item_color = "chief_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/atmospheric_technician
 	desc = "It's a jumpsuit worn by atmospheric technicians."
 	name = "atmospheric technician's jumpsuit"
@@ -16,6 +26,16 @@
 	item_color = "atmos"
 	resistance_flags = NONE
 
+/obj/item/clothing/under/rank/atmospheric_technician/skirt
+	name = "atmospheric technician's jumpskirt"
+	desc = "It's a jumpskirt worn by atmospheric technicians."
+	icon_state = "atmos_skirt"
+	item_state = "atmos_suit"
+	item_color = "atmos_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /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"
@@ -24,6 +44,23 @@
 	item_color = "engine"
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20)
 	resistance_flags = NONE
+/obj/item/clothing/under/rank/engineer/hazard
+	name = "engineer's hazard jumpsuit"
+	desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
+	icon_state = "hazard"
+	item_state = "suit-orange"
+	item_color = "hazard"
+	alt_covers_chest = TRUE
+
+/obj/item/clothing/under/rank/engineer/skirt
+	name = "engineer's jumpskirt"
+	desc = "It's an orange high visibility jumpskirt worn by engineers."
+	icon_state = "engine_skirt"
+	item_state = "engi_suit"
+	item_color = "engine_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
 
 /obj/item/clothing/under/rank/roboticist
 	desc = "It's a slimming black with reinforced seams; great for industrial work."
@@ -32,3 +69,13 @@
 	item_state = "robotics"
 	item_color = "robotics"
 	resistance_flags = NONE
+
+/obj/item/clothing/under/rank/roboticist/skirt
+	name = "roboticist's jumpskirt"
+	desc = "It's a slimming black with reinforced seams; great for industrial work."
+	icon_state = "robotics_skirt"
+	item_state = "robotics"
+	item_color = "robotics_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP 

code/modules/clothing/under/jobs/medsci.dm

@@ -10,6 +10,16 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 35)
 	can_adjust = FALSE
 
+/obj/item/clothing/under/rank/research_director/skirt
+	name = "research director's vest suitskirt"
+	desc = "It's a suitskirt worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
+	icon_state = "director_skirt"
+	item_state = "lb_suit"
+	item_color = "director_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/research_director/alt
 	desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
 	name = "research director's tan suit"
@@ -20,6 +30,16 @@
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
 
+/obj/item/clothing/under/rank/research_director/alt/skirt
+	name = "research director's tan suitskirt"
+	desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
+	icon_state = "rdwhimsy_skirt"
+	item_state = "rdwhimsy"
+	item_color = "rdwhimsy_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /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"
@@ -30,6 +50,16 @@
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
 
+/obj/item/clothing/under/rank/research_director/turtleneck/skirt
+	name = "research director's turtleneck skirt"
+	desc = "A dark purple turtleneck and tan khaki skirt, for a director with a superior sense of style."
+	icon_state = "rdturtle_skirt"
+	item_state = "p_suit"
+	item_color = "rdturtle_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/scientist
 	desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
 	name = "scientist's jumpsuit"
@@ -39,6 +69,15 @@
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 
+/obj/item/clothing/under/rank/scientist/skirt
+	name = "scientist's jumpskirt"
+	desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
+	icon_state = "toxinswhite_skirt"
+	item_state = "w_suit"
+	item_color = "toxinswhite_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
 
 /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."
@@ -49,6 +88,16 @@
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65)
 
+/obj/item/clothing/under/rank/chemist/skirt
+	name = "chemist's jumpskirt"
+	desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
+	icon_state = "chemistrywhite_skirt"
+	item_state = "w_suit"
+	item_color = "chemistrywhite_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /*
  * Medical
  */
@@ -61,6 +110,16 @@
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
 
+/obj/item/clothing/under/rank/chief_medical_officer/skirt
+	name = "chief medical officer's jumpskirt"
+	desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
+	icon_state = "cmo_skirt"
+	item_state = "w_suit"
+	item_color = "cmo_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /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"
@@ -70,6 +129,16 @@
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
 
+/obj/item/clothing/under/rank/geneticist/skirt
+	name = "geneticist's jumpskirt"
+	desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
+	icon_state = "geneticswhite_skirt"
+	item_state = "w_suit"
+	item_color = "geneticswhite_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /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"
@@ -79,6 +148,16 @@
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
 
+/obj/item/clothing/under/rank/virologist/skirt
+	name = "virologist's jumpskirt"
+	desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
+	icon_state = "virologywhite_skirt"
+	item_state = "w_suit"
+	item_color = "virologywhite_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/nursesuit
 	desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
 	name = "nurse's suit"
@@ -90,7 +169,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
-
 /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"
@@ -99,24 +177,31 @@
 	item_color = "medical"
 	permeability_coefficient = 0.5
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
-
 /obj/item/clothing/under/rank/medical/blue
 	name = "medical 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_color = "scrubsblue"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/rank/medical/green
 	name = "medical 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_color = "scrubsgreen"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/rank/medical/purple
 	name = "medical 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_color = "scrubspurple"
 	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/medical/skirt
+	name = "medical doctor's jumpskirt"
+	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."
+	icon_state = "medical_skirt"
+	item_state = "w_suit"
+	item_color = "medical_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP 

code/modules/clothing/under/jobs/security.dm

@@ -4,11 +4,9 @@
  *		Detective
  *		Navy uniforms
  */
-
 /*
  * Security
  */
-
 /obj/item/clothing/under/rank/security
 	name = "security jumpsuit"
 	desc = "A tactical security jumpsuit for officers complete with Nanotrasen belt buckle."
@@ -20,14 +18,12 @@
 	alt_covers_chest = TRUE
 	sensor_mode = SENSOR_COORDS
 	random_sensor = FALSE
-
 /obj/item/clothing/under/rank/security/grey
 	name = "grey security jumpsuit"
 	desc = "A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood."
 	icon_state = "security"
 	item_state = "gy_suit"
 	item_color = "security"
-
 /obj/item/clothing/under/rank/security/skirt
 	name = "security jumpskirt"
 	desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt."
@@ -36,6 +32,7 @@
 	item_color = "secskirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE //you know now that i think of it if you adjust the skirt and the sprite disappears isn't that just like flashing everyone
+	fitted = FEMALE_UNIFORM_TOP
 
 
 /obj/item/clothing/under/rank/warden
@@ -49,7 +46,6 @@
 	alt_covers_chest = TRUE
 	sensor_mode = 3
 	random_sensor = FALSE
-
 /obj/item/clothing/under/rank/warden/grey
 	name = "grey security suit"
 	desc = "A formal relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood."
@@ -57,6 +53,16 @@
 	item_state = "gy_suit"
 	item_color = "warden"
 
+/obj/item/clothing/under/rank/warden/skirt
+	name = "warden's suitskirt"
+	desc = "A formal security suitskirt for officers complete with Nanotrasen belt buckle."
+	icon_state = "rwarden_skirt"
+	item_state = "r_suit"
+	item_color = "rwarden_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /*
  * Detective
  */
@@ -72,6 +78,16 @@
 	sensor_mode = 3
 	random_sensor = FALSE
 
+/obj/item/clothing/under/rank/det/skirt
+	name = "detective's suitskirt"
+	desc = "Someone who wears this means business."
+	icon_state = "detective_skirt"
+	item_state = "det"
+	item_color = "detective_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/det/grey
 	name = "noir suit"
 	desc = "A hard-boiled private investigator's grey suit, complete with tie clip."
@@ -80,6 +96,16 @@
 	item_color = "greydet"
 	alt_covers_chest = TRUE
 
+/obj/item/clothing/under/rank/det/grey/skirt
+	name = "noir suitskirt"
+	desc = "A hard-boiled private investigator's grey suitskirt, complete with tie clip."
+	icon_state = "greydet_skirt"
+	item_state = "greydet"
+	item_color = "greydet_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /*
  * Head of Security
  */
@@ -95,13 +121,22 @@
 	sensor_mode = 3
 	random_sensor = FALSE
 
+/obj/item/clothing/under/rank/head_of_security/skirt
+	name = "head of security's jumpskirt"
+	desc = "A security jumpskirt decorated for those few with the dedication to achieve the position of Head of Security."
+	icon_state = "rhos_skirt"
+	item_state = "r_suit"
+	item_color = "rhos_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/head_of_security/grey
 	name = "head of security's grey jumpsuit"
 	desc = "There are old men, and there are bold men, but there are very few old, bold men."
 	icon_state = "hos"
 	item_state = "gy_suit"
 	item_color = "hos"
-
 /obj/item/clothing/under/rank/head_of_security/alt
 	name = "head of security's turtleneck"
 	desc = "A stylish alternative to the normal head of security jumpsuit, complete with tactical pants."
@@ -109,10 +144,19 @@
 	item_state = "bl_suit"
 	item_color = "hosalt"
 
+/obj/item/clothing/under/rank/head_of_security/alt/skirt
+	name = "head of security's turtleneck skirt"
+	desc = "A stylish alternative to the normal head of security jumpsuit, complete with a tactical skirt."
+	icon_state = "hosalt_skirt"
+	item_state = "bl_suit"
+	item_color = "hosalt_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /*
  * Navy uniforms
  */
-
 /obj/item/clothing/under/rank/security/navyblue
 	name = "security officer's formal uniform"
 	desc = "The latest in fashionable security outfits."
@@ -120,7 +164,6 @@
 	item_state = "officerblueclothes"
 	item_color = "officerblueclothes"
 	alt_covers_chest = TRUE
-
 /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 formal uniform"
@@ -128,7 +171,6 @@
 	item_state = "hosblueclothes"
 	item_color = "hosblueclothes"
 	alt_covers_chest = TRUE
-
 /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 formal uniform"
@@ -136,11 +178,9 @@
 	item_state = "wardenblueclothes"
 	item_color = "wardenblueclothes"
 	alt_covers_chest = TRUE
-
 /*
  *Blueshirt
  */
-
 /obj/item/clothing/under/rank/security/blueshirt
 	name = "blue shirt and tie"
 	desc = "I'm a little busy right now, Calhoun."
@@ -148,3 +188,13 @@
 	item_state = "blueshift"
 	item_color = "blueshift"
 	can_adjust = FALSE
+/*
+ *Spacepol
+ */
+/obj/item/clothing/under/rank/security/spacepol
+	name = "police uniform"
+	desc = "Space not controlled by megacorporations, planets, or pirates is under the jurisdiction of Spacepol."
+	icon_state = "spacepol"
+	item_state = "spacepol"
+	item_color = "spacepol"
+	can_adjust = FALSE

code/modules/clothing/under/miscellaneous.dm

@@ -5,7 +5,6 @@
 	item_color = "red_pyjamas"
 	item_state = "w_suit"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/pj/blue
 	name = "blue pj's"
 	desc = "Sleepwear."
@@ -13,7 +12,6 @@
 	item_color = "blue_pyjamas"
 	item_state = "w_suit"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/patriotsuit
 	name = "Patriotic Suit"
 	desc = "Motorcycle not included."
@@ -21,7 +19,6 @@
 	item_state = "ek"
 	item_color = "ek"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/scratch
 	name = "white suit"
 	desc = "A white suit, suitable for an excellent host."
@@ -30,13 +27,22 @@
 	item_color = "scratch"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/scratch/skirt
+	name = "white suitskirt"
+	desc = "A white suitskirt, suitable for an excellent host."
+	icon_state = "white_suit_skirt"
+	item_state = "scratch"
+	item_color = "white_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/sl_suit
 	desc = "It's a very amish looking suit."
 	name = "amish suit"
 	icon_state = "sl_suit"
 	item_color = "sl_suit"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/roman
 	name = "\improper Roman armor"
 	desc = "Ancient Roman armor. Made of metallic and leather straps."
@@ -46,7 +52,6 @@
 	can_adjust = FALSE
 	strip_delay = 100
 	resistance_flags = NONE
-
 /obj/item/clothing/under/waiter
 	name = "waiter's outfit"
 	desc = "It's a very smart uniform with a special pocket for tip."
@@ -54,7 +59,6 @@
 	item_state = "waiter"
 	item_color = "waiter"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/rank/prisoner
 	name = "prison jumpsuit"
 	desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
@@ -65,20 +69,28 @@
 	sensor_mode = SENSOR_COORDS
 	random_sensor = FALSE
 
+/obj/item/clothing/under/rank/prisoner/skirt
+	name = "prison jumpskirt"
+	desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+	icon_state = "prisoner_skirt"
+	item_state = "o_suit"
+	item_color = "prisoner_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/rank/mailman
 	name = "mailman's jumpsuit"
 	desc = "<i>'Special delivery!'</i>"
 	icon_state = "mailman"
 	item_state = "b_suit"
 	item_color = "mailman"
-
 /obj/item/clothing/under/rank/psyche
 	name = "psychedelic jumpsuit"
 	desc = "Groovy!"
 	icon_state = "psyche"
 	item_state = "p_suit"
 	item_color = "psyche"
-
 /obj/item/clothing/under/rank/clown/sexy
 	name = "sexy-clown suit"
 	desc = "It makes you look HONKable!"
@@ -86,7 +98,6 @@
 	item_state = "sexyclown"
 	item_color = "sexyclown"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/jabroni
 	name = "Jabroni Outfit"
 	desc = "The leather club is two sectors down."
@@ -94,7 +105,6 @@
 	item_state = "darkholme"
 	item_color = "darkholme"
 	can_adjust = FALSE
-
 /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."
@@ -102,7 +112,6 @@
 	item_state = "gy_suit"
 	item_color = "vice"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/rank/centcom_officer
 	desc = "It's a jumpsuit worn by CentCom Officers."
 	name = "\improper CentCom officer's jumpsuit"
@@ -110,14 +119,12 @@
 	item_state = "g_suit"
 	item_color = "officer"
 	alt_covers_chest = TRUE
-
 /obj/item/clothing/under/rank/centcom_commander
 	desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders."
 	name = "\improper CentCom officer's jumpsuit"
 	icon_state = "centcom"
 	item_state = "dg_suit"
 	item_color = "centcom"
-
 /obj/item/clothing/under/space
 	name = "\improper NASA jumpsuit"
 	desc = "It has a NASA logo on it and is made of space-proofed materials."
@@ -134,7 +141,6 @@
 	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	can_adjust = FALSE
 	resistance_flags = NONE
-
 /obj/item/clothing/under/acj
 	name = "administrative cybernetic jumpsuit"
 	icon_state = "syndicate"
@@ -151,28 +157,24 @@
 	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
 	can_adjust = FALSE
 	resistance_flags = FIRE_PROOF | ACID_PROOF
-
 /obj/item/clothing/under/owl
 	name = "owl uniform"
 	desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction."
 	icon_state = "owl"
 	item_color = "owl"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/griffin
 	name = "griffon uniform"
 	desc = "A soft brown jumpsuit with a white feather collar made of synthetic feathers and a lust for mayhem."
 	icon_state = "griffin"
 	item_color = "griffin"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/cloud
 	name = "cloud"
 	desc = "cloud"
 	icon_state = "cloud"
 	item_color = "cloud"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/gimmick/rank/captain/suit
 	name = "captain's suit"
 	desc = "A green suit and yellow necktie. Exemplifies authority."
@@ -181,6 +183,16 @@
 	item_color = "green_suit"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/gimmick/rank/captain/suit/skirt
+	name = "green suitskirt"
+	desc = "A green suitskirt and yellow necktie. Exemplifies authority."
+	icon_state = "green_suit_skirt"
+	item_state = "dg_suit"
+	item_color = "green_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /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."
@@ -189,6 +201,16 @@
 	item_color = "teal_suit"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt
+	name = "teal suitskirt"
+	desc = "A teal suitskirt and yellow necktie. An authoritative yet tacky ensemble."
+	icon_state = "teal_suit_skirt"
+	item_state = "g_suit"
+	item_color = "teal_suit_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	fitted = FEMALE_UNIFORM_TOP
+
 /obj/item/clothing/under/suit_jacket
 	name = "black suit"
 	desc = "A black suit and red tie. Very formal."
@@ -196,21 +218,18 @@
 	item_state = "bl_suit"
 	item_color = "black_suit"
 	can_adjust = FALSE
-
 /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 = "bl_suit"
-	item_color = "black_suit"
-
+	item_color = "really_black_suit"
 /obj/item/clothing/under/suit_jacket/female
 	name = "executive suit"
 	desc = "A formal trouser suit for women, intended for the station's finest."
 	icon_state = "black_suit_fem"
 	item_state = "black_suit_fem"
 	item_color = "black_suit_fem"
-
 /obj/item/clothing/under/suit_jacket/green
 	name = "green suit"
 	desc = "A green suit and yellow necktie. Baller."
@@ -218,56 +237,48 @@
 	item_state = "dg_suit"
 	item_color = "green_suit"
 	can_adjust = FALSE
-
 /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 = "r_suit"
 	item_color = "red_suit"
-
 /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 = "charcoal_suit"
 	item_color = "charcoal_suit"
-
 /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 = "navy_suit"
 	item_color = "navy_suit"
-
 /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 = "burgundy_suit"
 	item_color = "burgundy_suit"
-
 /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 = "checkered_suit"
 	item_color = "checkered_suit"
-
 /obj/item/clothing/under/suit_jacket/tan
 	name = "tan suit"
 	desc = "A tan suit with a yellow tie. Smart, but casual."
 	icon_state = "tan_suit"
 	item_state = "tan_suit"
 	item_color = "tan_suit"
-
 /obj/item/clothing/under/suit_jacket/white
 	name = "white suit"
 	desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!"
 	icon_state = "white_suit"
 	item_state = "white_suit"
 	item_color = "white_suit"
-
 /obj/item/clothing/under/burial
 	name = "burial garments"
 	desc = "Traditional burial garments from the early 22nd century."
@@ -275,7 +286,6 @@
 	item_state = "burial"
 	item_color = "burial"
 	has_sensor = NO_SENSORS
-
 /obj/item/clothing/under/skirt/black
 	name = "black skirt"
 	desc = "A black skirt, very fancy!"
@@ -284,7 +294,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/skirt/blue
 	name = "blue skirt"
 	desc = "A blue, casual skirt."
@@ -294,7 +303,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/skirt/red
 	name = "red skirt"
 	desc = "A red, casual skirt."
@@ -304,7 +312,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/skirt/purple
 	name = "purple skirt"
 	desc = "A purple, casual skirt."
@@ -314,8 +321,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
-
 /obj/item/clothing/under/schoolgirl
 	name = "blue schoolgirl uniform"
 	desc = "It's just like one of my Japanese animes!"
@@ -325,25 +330,21 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/schoolgirl/red
 	name = "red schoolgirl uniform"
 	icon_state = "schoolgirlred"
 	item_state = "schoolgirlred"
 	item_color = "schoolgirlred"
-
 /obj/item/clothing/under/schoolgirl/green
 	name = "green schoolgirl uniform"
 	icon_state = "schoolgirlgreen"
 	item_state = "schoolgirlgreen"
 	item_color = "schoolgirlgreen"
-
 /obj/item/clothing/under/schoolgirl/orange
 	name = "orange schoolgirl uniform"
 	icon_state = "schoolgirlorange"
 	item_state = "schoolgirlorange"
 	item_color = "schoolgirlorange"
-
 /obj/item/clothing/under/overalls
 	name = "laborer's overalls"
 	desc = "A set of durable overalls for getting the job done."
@@ -351,7 +352,6 @@
 	item_state = "lb_suit"
 	item_color = "overalls"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/pirate
 	name = "pirate outfit"
 	desc = "Yarr."
@@ -359,7 +359,6 @@
 	item_state = "pirate"
 	item_color = "pirate"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/soviet
 	name = "soviet uniform"
 	desc = "For the Motherland!"
@@ -367,7 +366,6 @@
 	item_state = "soviet"
 	item_color = "soviet"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/redcoat
 	name = "redcoat uniform"
 	desc = "Looks old."
@@ -375,7 +373,6 @@
 	item_state = "redcoat"
 	item_color = "redcoat"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/kilt
 	name = "kilt"
 	desc = "Includes shoes and plaid."
@@ -385,7 +382,6 @@
 	body_parts_covered = CHEST|GROIN|LEGS|FEET
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/kilt/highlander
 	desc = "You're the only one worthy of this kilt."
 
@@ -402,7 +398,6 @@
 	body_parts_covered = CHEST|GROIN|LEGS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/gladiator
 	name = "gladiator uniform"
 	desc = "Are you not entertained? Is that not why you are here?"
@@ -413,11 +408,9 @@
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
 	resistance_flags = NONE
-
 /obj/item/clothing/under/gladiator/ash_walker
 	desc = "This gladiator uniform appears to be covered in ash and fairly dated."
 	has_sensor = NO_SENSORS
-
 /obj/item/clothing/under/sundress
 	name = "sundress"
 	desc = "Makes you want to frolic in a field of daisies."
@@ -427,7 +420,6 @@
 	body_parts_covered = CHEST|GROIN
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/captainparade
 	name = "captain's parade uniform"
 	desc = "A captain's luxury-wear, for special occasions."
@@ -435,7 +427,6 @@
 	item_state = "by_suit"
 	item_color = "captain_parade"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/hosparademale
 	name = "head of security's parade uniform"
 	desc = "A male head of security's luxury-wear, for special occasions."
@@ -443,7 +434,6 @@
 	item_state = "r_suit"
 	item_color = "hos_parade_male"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/hosparadefem
 	name = "head of security's parade uniform"
 	desc = "A female head of security's luxury-wear, for special occasions."
@@ -452,7 +442,6 @@
 	item_color = "hos_parade_fem"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /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."
@@ -460,7 +449,6 @@
 	item_state = "gy_suit"
 	item_color = "assistant_formal"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/blacktango
 	name = "black tango dress"
 	desc = "Filled with Latin fire."
@@ -469,8 +457,6 @@
 	item_color = "black_tango"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	body_parts_covered = CHEST|GROIN
-
 /obj/item/clothing/under/stripeddress
 	name = "striped dress"
 	desc = "Fashion in space."
@@ -480,7 +466,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_FULL
 	can_adjust = FALSE
-
 /obj/item/clothing/under/sailordress
 	name = "sailor dress"
 	desc = "Formal wear for a leading lady."
@@ -490,7 +475,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/redeveninggown
 	name = "red evening gown"
 	desc = "Fancy dress for space bar singers."
@@ -499,7 +483,6 @@
 	item_color = "red_evening_gown"
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/maid
 	name = "maid costume"
 	desc = "Maid in China."
@@ -509,12 +492,10 @@
 	body_parts_covered = CHEST|GROIN
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/maid/Initialize()
 	. = ..()
 	var/obj/item/clothing/accessory/maidapron/A = new (src)
 	attach_accessory(A)
-
 /obj/item/clothing/under/janimaid
 	name = "maid uniform"
 	desc = "A simple maid uniform for housekeeping."
@@ -524,7 +505,6 @@
 	body_parts_covered = CHEST|GROIN
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/plaid_skirt
 	name = "red plaid skirt"
 	desc = "A preppy red skirt with a white blouse."
@@ -534,7 +514,6 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
-
 /obj/item/clothing/under/plaid_skirt/blue
 	name = "blue plaid skirt"
 	desc = "A preppy blue skirt with a white blouse."
@@ -544,7 +523,6 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
-
 /obj/item/clothing/under/plaid_skirt/purple
 	name = "purple plaid skirt"
 	desc = "A preppy purple skirt with a white blouse."
@@ -554,7 +532,6 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
-
 /obj/item/clothing/under/singery
 	name = "yellow performer's outfit"
 	desc = "Just looking at this makes you want to sing."
@@ -565,7 +542,6 @@
 	fitted = NO_FEMALE_UNIFORM
 	alternate_worn_layer = ABOVE_SHOES_LAYER
 	can_adjust = FALSE
-
 /obj/item/clothing/under/singerb
 	name = "blue performer's outfit"
 	desc = "Just looking at this makes you want to sing."
@@ -576,7 +552,6 @@
 	alternate_worn_layer = ABOVE_SHOES_LAYER
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-
 /obj/item/clothing/under/plaid_skirt/green
 	name = "green plaid skirt"
 	desc = "A preppy green skirt with a white blouse."
@@ -586,17 +561,14 @@
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = TRUE
 	alt_covers_chest = TRUE
-
 /obj/item/clothing/under/jester
 	name = "jester suit"
 	desc = "A jolly dress, well suited to entertain your master, nuncle."
 	icon_state = "jester"
 	item_color = "jester"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/jester/alt
 	icon_state = "jester2"
-
 /obj/item/clothing/under/geisha
 	name = "geisha suit"
 	desc = "Cute space ninja senpai not included."
@@ -604,14 +576,12 @@
 	item_color = "geisha"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
-
 /obj/item/clothing/under/villain
 	name = "villain suit"
 	desc = "A change of wardrobe is necessary if you ever want to catch a real superhero."
 	icon_state = "villain"
 	item_color = "villain"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/sailor
 	name = "sailor suit"
 	desc = "Skipper's in the wardroom drinkin gin'."
@@ -619,7 +589,6 @@
 	item_state = "b_suit"
 	item_color = "sailor"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/plasmaman
 	name = "plasma envirosuit"
 	desc = "A special containment suit that allows plasma-based lifeforms to exist safely in an oxygenated environment, and automatically extinguishes them in a crisis. Despite being airtight, it's not spaceworthy."
@@ -633,17 +602,12 @@
 	var/next_extinguish = 0
 	var/extinguish_cooldown = 100
 	var/extinguishes_left = 5
-
-
 /obj/item/clothing/under/plasmaman/examine(mob/user)
 	..()
 	to_chat(user, "<span class='notice'>There are [extinguishes_left] extinguisher charges left in this suit.</span>")
-
-
 /obj/item/clothing/under/plasmaman/proc/Extinguish(mob/living/carbon/human/H)
 	if(!istype(H))
 		return
-
 	if(H.on_fire)
 		if(extinguishes_left)
 			if(next_extinguish > world.time)
@@ -654,7 +618,6 @@
 			H.ExtinguishMob()
 			new /obj/effect/particle_effect/water(get_turf(H))
 	return 0
-
 /obj/item/clothing/under/plasmaman/attackby(obj/item/E, mob/user, params)
 	..()
 	if (istype(E, /obj/item/extinguisher_refill))
@@ -668,20 +631,17 @@
 			return
 		return
 	return
-
 /obj/item/extinguisher_refill
 	name = "envirosuit extinguisher cartridge"
 	desc = "A cartridge loaded with a compressed extinguisher mix, used to refill the automatic extinguisher on plasma envirosuits."
 	icon_state = "plasmarefill"
 	icon = 'icons/obj/device.dmi'
-
 /obj/item/clothing/under/rank/security/navyblue/russian
 	name = "\improper Russian officer's uniform"
 	desc = "The latest in fashionable russian outfits."
 	icon_state = "hostanclothes"
 	item_state = "hostanclothes"
 	item_color = "hostanclothes"
-
 /obj/item/clothing/under/mummy
 	name = "mummy wrapping"
 	desc = "Return the slab or suffer my stale references."
@@ -692,7 +652,6 @@
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
 	resistance_flags = NONE
-
 /obj/item/clothing/under/scarecrow
 	name = "scarecrow clothes"
 	desc = "Perfect camouflage for hiding in botany."
@@ -703,7 +662,6 @@
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
 	resistance_flags = NONE
-
 /obj/item/clothing/under/draculass
 	name = "draculass coat"
 	desc = "A dress inspired by the ancient \"Victorian\" era."
@@ -713,8 +671,6 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	fitted = FEMALE_UNIFORM_TOP
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
-
 /obj/item/clothing/under/drfreeze
 	name = "doctor freeze's jumpsuit"
 	desc = "A modified scientist jumpsuit to look extra cool."
@@ -722,8 +678,6 @@
 	item_state = "drfreeze"
 	item_color = "drfreeze"
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
-
 /obj/item/clothing/under/lobster
 	name = "foam lobster suit"
 	desc = "Who beheaded the college mascot?"
@@ -732,8 +686,6 @@
 	item_color = "lobster"
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
-
 /obj/item/clothing/under/gondola
 	name = "gondola hide suit"
 	desc = "Now you're cooking."
@@ -741,7 +693,6 @@
 	item_state = "lb_suit"
 	item_color = "gondola"
 	can_adjust = FALSE
-
 /obj/item/clothing/under/skeleton
 	name = "skeleton jumpsuit"
 	desc = "A black jumpsuit with a white bone pattern printed on it. Spooky!"
@@ -752,6 +703,14 @@
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
 	resistance_flags = NONE
+/obj/item/clothing/under/durathread
+	name = "durathread jumpsuit"
+	desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer."
+	icon_state = "durathread"
+	item_state = "durathread"
+	item_color = "durathread"
+	can_adjust = FALSE
+	armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)
 
 /obj/item/clothing/under/gear_harness
 	name = "gear harness"

code/modules/vending/autodrobe.dm

@@ -63,6 +63,8 @@
 					/obj/item/clothing/suit/wizrobe/fake = 1,
 					/obj/item/clothing/head/wizard/fake = 1,
 					/obj/item/staff = 3,
+					/obj/item/clothing/under/rank/mime/skirt = 1,
+					/obj/item/clothing/under/gimmick/rank/captain/suit/skirt = 1,
 					/obj/item/clothing/mask/gas/sexyclown = 1,
 					/obj/item/clothing/under/rank/clown/sexy = 1,
 					/obj/item/clothing/mask/gas/sexymime = 1,

code/modules/vending/clothesmate.dm

@@ -31,6 +31,9 @@
 		            /obj/item/clothing/under/pants/tan = 4,
 		            /obj/item/clothing/under/pants/track = 3,
 		            /obj/item/clothing/suit/jacket/miljacket = 5,
+					/obj/item/clothing/under/scratch/skirt = 2,
+		            /obj/item/clothing/under/gimmick/rank/captain/suit/skirt = 2,
+		            /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt = 2,
 		            /obj/item/clothing/neck/tie/blue = 3,
 		            /obj/item/clothing/neck/tie/red = 3,
 		            /obj/item/clothing/neck/tie/black = 3,

code/modules/vending/wardrobes.dm

@@ -40,6 +40,7 @@
 					/obj/item/clothing/suit/hooded/wintercoat/medical = 3,
 					/obj/item/clothing/under/rank/nursesuit = 3,
 					/obj/item/clothing/head/nursehat = 3,
+					/obj/item/clothing/under/rank/medical/skirt= 5,
 					/obj/item/clothing/under/rank/medical/blue = 2,
 					/obj/item/clothing/under/rank/medical/green = 2,
 					/obj/item/clothing/under/rank/medical/purple = 2,
@@ -67,6 +68,7 @@
 					/obj/item/storage/backpack/satchel/eng = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/engineering = 3,
 					/obj/item/clothing/under/rank/engineer = 5,
+					/obj/item/clothing/under/rank/engineer/skirt = 5,
 					/obj/item/clothing/suit/hazardvest = 5,
 					/obj/item/clothing/shoes/workboots = 5,
 					/obj/item/clothing/head/hardhat = 5)
@@ -87,6 +89,7 @@
 					/obj/item/storage/backpack/industrial = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 5,
 					/obj/item/clothing/under/rank/atmospheric_technician = 5,
+					/obj/item/clothing/under/rank/atmospheric_technician/skirt = 5,
 					/obj/item/clothing/shoes/sneakers/black = 5)
 	refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
 
@@ -101,6 +104,7 @@
 	vend_reply = "Thank you for using the CargoDrobe!"
 	products = list(/obj/item/clothing/suit/hooded/wintercoat/cargo = 3,
 					/obj/item/clothing/under/rank/cargotech = 5,
+					/obj/item/clothing/under/rank/cargotech/skirt = 5,
 					/obj/item/clothing/shoes/sneakers/black = 5,
 					/obj/item/clothing/gloves/fingerless = 5,
 					/obj/item/clothing/head/soft = 5,
@@ -118,6 +122,7 @@
 	vend_reply = "Thank you for using the RoboDrobe!"
 	products = list(/obj/item/clothing/glasses/hud/diagnostic = 3,
 					/obj/item/clothing/under/rank/roboticist = 3,
+					/obj/item/clothing/under/rank/roboticist/skirt = 3,
 					/obj/item/clothing/suit/toggle/labcoat = 3,
 					/obj/item/clothing/shoes/sneakers/black = 3,
 					/obj/item/clothing/gloves/fingerless = 3,
@@ -140,6 +145,7 @@
 					/obj/item/storage/backpack/satchel/tox = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/science = 3,
 					/obj/item/clothing/under/rank/scientist = 4,
+					/obj/item/clothing/under/rank/scientist/skirt = 4,
 					/obj/item/clothing/suit/toggle/labcoat/science = 4,
 					/obj/item/clothing/shoes/sneakers/white = 4,
 					/obj/item/radio/headset/headset_sci = 4,
@@ -161,6 +167,7 @@
 					/obj/item/clothing/suit/apron = 3,
 					/obj/item/clothing/suit/apron/overalls = 5,
 					/obj/item/clothing/under/rank/hydroponics = 5,
+					/obj/item/clothing/under/rank/hydroponics/skirt = 5,
 					/obj/item/clothing/mask/bandana = 4)
 	refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
 
@@ -175,6 +182,9 @@
 	vend_reply = "Thank you for using the CuraDrobe!"
 	products = list(/obj/item/clothing/head/fedora/curator = 2,
 					/obj/item/clothing/suit/curator = 2,
+					/obj/item/clothing/under/rank/curator/skirt = 2,
+					/obj/item/clothing/under/gimmick/rank/captain/suit/skirt = 2,
+					/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt = 2,
 					/obj/item/clothing/under/rank/curator/treasure_hunter = 2,
 					/obj/item/clothing/shoes/workboots/mining = 2,
 					/obj/item/storage/backpack/satchel/explorer = 2,
@@ -194,6 +204,7 @@
 					/obj/item/radio/headset/headset_srv = 3,
 					/obj/item/clothing/under/sl_suit = 3,
 					/obj/item/clothing/under/rank/bartender = 3,
+					/obj/item/clothing/under/rank/bartender/skirt = 2,
 					/obj/item/clothing/under/rank/bartender/purple = 2,
 					/obj/item/clothing/accessory/waistcoat = 3,
 					/obj/item/clothing/suit/apron/purple_bartender = 2,
@@ -226,6 +237,7 @@
 					/obj/item/circuitboard/machine/dish_drive = 1,
 					/obj/item/clothing/suit/toggle/chef = 2,
 					/obj/item/clothing/under/rank/chef = 2,
+					/obj/item/clothing/under/rank/chef/skirt = 2,
 					/obj/item/clothing/head/chefhat = 2,
 					/obj/item/reagent_containers/rag = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
@@ -240,6 +252,7 @@
 	product_ads = "Come and get your janitorial clothing, now endorsed by lizard janitors everywhere!"
 	vend_reply = "Thank you for using the JaniDrobe!"
 	products = list(/obj/item/clothing/under/rank/janitor = 2,
+					/obj/item/clothing/under/rank/janitor/skirt = 2,
 					/obj/item/cartridge/janitor = 3,
 					/obj/item/clothing/gloves/color/black = 2,
 					/obj/item/clothing/head/soft/purple = 2,
@@ -267,6 +280,12 @@
 	vend_reply = "Thank you for using the LawDrobe!"
 	products = list(/obj/item/clothing/under/lawyer/female = 3,
 					/obj/item/clothing/under/lawyer/black = 3,
+					/obj/item/clothing/under/lawyer/black/skirt = 3,
+					/obj/item/clothing/under/lawyer/red/skirt = 3,
+					/obj/item/clothing/under/lawyer/bluesuit/skirt = 3,
+					/obj/item/clothing/under/lawyer/blue/skirt = 3,
+					/obj/item/clothing/under/lawyer/purpsuit/skirt = 3,
+					/obj/item/clothing/under/lawyer/blacksuit/skirt = 3,
 					/obj/item/clothing/under/lawyer/red = 3,
 					/obj/item/clothing/under/lawyer/bluesuit = 3,
 					/obj/item/clothing/suit/toggle/lawyer = 3,
@@ -291,6 +310,7 @@
 					/obj/item/storage/backpack/cultpack = 2,
 					/obj/item/clothing/accessory/pocketprotector/cosmetology = 2,
 					/obj/item/clothing/under/rank/chaplain = 2,
+					/obj/item/clothing/under/rank/chaplain/skirt = 2,
 					/obj/item/clothing/shoes/sneakers/black = 2,
 					/obj/item/clothing/suit/nun = 2,
 					/obj/item/clothing/head/nun_hood = 2,
@@ -308,6 +328,7 @@
 	product_ads = "Our clothes are 0.5% more resistant to acid spills! Get yours now!"
 	vend_reply = "Thank you for using the ChemDrobe!"
 	products = list(/obj/item/clothing/under/rank/chemist = 3,
+					/obj/item/clothing/under/rank/chemist/skirt = 3,
 					/obj/item/clothing/shoes/sneakers/white = 3,
 					/obj/item/clothing/suit/toggle/labcoat/chemist = 3,
 					/obj/item/storage/backpack/chemistry = 3,
@@ -325,6 +346,7 @@
 	product_ads = "Perfect for the mad scientist in you!"
 	vend_reply = "Thank you for using the GeneDrobe!"
 	products = list(/obj/item/clothing/under/rank/geneticist = 3,
+					/obj/item/clothing/under/rank/geneticist/skirt = 3,
 					/obj/item/clothing/shoes/sneakers/white = 3,
 					/obj/item/clothing/suit/toggle/labcoat/genetics = 3,
 					/obj/item/storage/backpack/genetics = 3,
@@ -341,6 +363,7 @@
 	product_ads = " Viruses getting you down? Then upgrade to sterilized clothing today!"
 	vend_reply = "Thank you for using the ViroDrobe"
 	products = list(/obj/item/clothing/under/rank/virologist = 3,
+					/obj/item/clothing/under/rank/virologist/skirt = 3,
 					/obj/item/clothing/shoes/sneakers/white = 3,
 					/obj/item/clothing/suit/toggle/labcoat/virologist = 3,
 					/obj/item/clothing/mask/surgical = 3,