diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
index 6973fd04ad3766..a6a82e09ead405 100644
--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -21,6 +21,13 @@
time = 40
category = CAT_CLOTHING
+/datum/crafting_recipe/durathread_jumpskirt
+ name = "Durathread Jumpskirt"
+ result = /obj/item/clothing/under/misc/durathread/skirt
+ reqs = list(/obj/item/stack/sheet/durathread = 4)
+ time = 40
+ category = CAT_CLOTHING
+
/datum/crafting_recipe/durathread_beret
name = "Durathread Beret"
result = /obj/item/clothing/head/beret/durathread
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 47e4b9c3bc1527..4d40dc77c2873d 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -321,6 +321,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
GLOBAL_LIST_INIT(durathread_recipes, list ( \
new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/misc/durathread, 4, time = 40),
+ new/datum/stack_recipe("durathread jumpskirt", /obj/item/clothing/under/misc/durathread/skirt, 4, time = 40),
new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \
new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/durathread, 1, time = 25), \
diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm
index 9d7b0dd3a0dec6..79e1381d3389dd 100644
--- a/code/modules/clothing/outfits/plasmaman.dm
+++ b/code/modules/clothing/outfits/plasmaman.dm
@@ -111,7 +111,7 @@
name = "Atmospherics Plasmaman"
head = /obj/item/clothing/head/helmet/space/plasmaman/atmospherics
- uniform = /obj/item/clothing/under/plasmaman/atmospherics
+ uniform = /obj/item/clothing/under/plasmaman/engineering/atmospherics
/datum/outfit/plasmaman/mime
name = "Plasmamime"
@@ -126,3 +126,123 @@
head = /obj/item/clothing/head/helmet/space/plasmaman/clown
uniform = /obj/item/clothing/under/plasmaman/clown
mask = /obj/item/clothing/mask/gas/clown_hat
+
+//skirts
+
+/datum/outfit/plasmaman/bar/skirt
+ name = "Bartender Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/white
+ uniform = /obj/item/clothing/under/plasmaman/enviroslacks
+
+/datum/outfit/plasmaman/chef/skirt
+ name = "Chef Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/white
+ uniform = /obj/item/clothing/under/plasmaman/chef
+
+/datum/outfit/plasmaman/botany/skirt
+ name = "Botany Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/botany
+ uniform = /obj/item/clothing/under/plasmaman/botany
+
+//curator has no skirt
+
+/datum/outfit/plasmaman/chaplain/skirt
+ name = "Chaplain Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/chaplain
+ uniform = /obj/item/clothing/under/plasmaman/chaplain
+
+/datum/outfit/plasmaman/janitor/skirt
+ name = "Janitor Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/janitor
+ uniform = /obj/item/clothing/under/plasmaman/janitor
+
+/datum/outfit/plasmaman/security/skirt
+ name = "Security Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/security
+ uniform = /obj/item/clothing/under/plasmaman/security
+
+/datum/outfit/plasmaman/detective/skirt
+ name = "Detective Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/white
+ uniform = /obj/item/clothing/under/plasmaman/enviroslacks
+ ears = /obj/item/radio/headset/headset_sec
+
+/datum/outfit/plasmaman/warden/skirt
+ name = "Warden Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/security/warden
+ uniform = /obj/item/clothing/under/plasmaman/security/warden
+
+/datum/outfit/plasmaman/cargo/skirt
+ name = "Cargo Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/cargo
+ uniform = /obj/item/clothing/under/plasmaman/cargo
+
+/datum/outfit/plasmaman/mining/skirt
+ name = "Mining Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/mining
+ uniform = /obj/item/clothing/under/plasmaman/mining
+
+/datum/outfit/plasmaman/medical/skirt
+ name = "Medical Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/medical
+ uniform = /obj/item/clothing/under/plasmaman/medical
+
+/datum/outfit/plasmaman/viro/skirt
+ name = "Virology Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/viro
+ uniform = /obj/item/clothing/under/plasmaman/viro
+
+/datum/outfit/plasmaman/chemist/skirt
+ name = "Chemist Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/chemist
+ uniform = /obj/item/clothing/under/plasmaman/chemist
+
+/datum/outfit/plasmaman/genetics/skirt
+ name = "Genetics Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/genetics
+ uniform = /obj/item/clothing/under/plasmaman/genetics
+
+/datum/outfit/plasmaman/science/skirt
+ name = "Science Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/science
+ uniform = /obj/item/clothing/under/plasmaman/science
+
+/datum/outfit/plasmaman/robotics/skirt
+ name = "Robotics Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/robotics
+ uniform = /obj/item/clothing/under/plasmaman/robotics
+
+/datum/outfit/plasmaman/engineering/skirt
+ name = "Engineering Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/engineering
+ uniform = /obj/item/clothing/under/plasmaman/engineering
+
+/datum/outfit/plasmaman/atmospherics/skirt
+ name = "Atmospherics Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/atmospherics
+ uniform = /obj/item/clothing/under/plasmaman/engineering/atmospherics
+
+/datum/outfit/plasmaman/mime/skirt
+ name = "Plasmamime With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/mime
+ uniform = /obj/item/clothing/under/plasmaman/mime
+ mask = /obj/item/clothing/mask/gas/mime
\ No newline at end of file
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index d0193e5391a14a..ee85f2cf714f9b 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -362,6 +362,14 @@
r_hand= /obj/item/tank/internals/plasmaman/belt/full
mask = /obj/item/clothing/mask/breath
+/datum/outfit/plasmaman/skirt
+ name = "Plasmaman With Skirt"
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman
+ uniform = /obj/item/clothing/under/plasmaman/skirt
+ r_hand= /obj/item/tank/internals/plasmaman/belt/full
+ mask = /obj/item/clothing/mask/breath
+
/datum/outfit/death_commando
name = "Death Commando"
diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
index 02f9691779feed..12144b521ae866 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
@@ -4,12 +4,23 @@
icon_state = "cargo_envirosuit"
item_state = "cargo_envirosuit"
+/obj/item/clothing/under/plasmaman/cargo/skirt
+ name = "cargo plasma enviroskirt"
+ desc = "A joint enviroskirt used by plasmamen quartermasters and cargo techs alike, due to the logistical problems of differenciating the two with the length of their pant legs."
+ icon_state = "cargo_envirosuit"
+ item_state = "cargo_enviroskirt"
+
/obj/item/clothing/under/plasmaman/mining
name = "mining plasma envirosuit"
desc = "An air-tight khaki suit designed for operations on lavaland by plasmamen."
icon_state = "explorer_envirosuit"
item_state = "explorer_envirosuit"
+/obj/item/clothing/under/plasmaman/mining/skirt
+ name = "mining plasma enviroskirt"
+ desc = "An air-tight khaki suit designed for operations on lavaland by plasmamen."
+ icon_state = "explorer_envirosuit"
+ item_state = "explorer_enviroskirt"
/obj/item/clothing/under/plasmaman/chef
name = "chef's plasma envirosuit"
@@ -17,18 +28,36 @@
icon_state = "chef_envirosuit"
item_state = "chef_envirosuit"
+/obj/item/clothing/under/plasmaman/chef/skirt
+ name = "chef's plasma enviroskirt"
+ desc = "A white plasmaman enviroskirt designed for cullinary practices. One might question why a member of a species that doesn't need to eat would become a chef."
+ icon_state = "chef_envirosuit"
+ item_state = "chef_enviroskirt"
+
/obj/item/clothing/under/plasmaman/enviroslacks
name = "enviroslacks"
desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nano-Trasen for it's detectives, lawyers, and bar-tenders alike."
icon_state = "enviroslacks"
item_state = "enviroslacks"
+/obj/item/clothing/under/plasmaman/enviroslacks/skirt
+ name = "enviroslacks"
+ desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nano-Trasen for it's detectives, lawyers, and bar-tenders alike."
+ icon_state = "enviroslacks"
+ item_state = "enviroskirts"
+
/obj/item/clothing/under/plasmaman/chaplain
name = "chaplain's plasma envirosuit"
desc = "An envirosuit specially designed for only the most pious of plasmamen."
icon_state = "chap_envirosuit"
item_state = "chap_envirosuit"
+/obj/item/clothing/under/plasmaman/chaplain/skirt
+ name = "chaplain's plasma enviroskirt"
+ desc = "An enviroskirt specially designed for only the most pious of plasmamen."
+ icon_state = "chap_envirosuit"
+ item_state = "chap_enviroskirt"
+
/obj/item/clothing/under/plasmaman/curator
name = "curator's plasma envirosuit"
desc = "Made out of a modified voidsuit, this suit was Nano-Trasen's first solution to the *logistical problems* that come with employing plasmamen. Due to the modifications, the suit is no longer space-worthy. Despite their limitations, these suits are still in used by historian and old-styled plasmamen alike."
@@ -41,12 +70,23 @@
icon_state = "janitor_envirosuit"
item_state = "janitor_envirosuit"
+/obj/item/clothing/under/plasmaman/janitor/skirt
+ name = "janitor's plasma enviroskirt"
+ desc = "A grey and purple enviroskirt designated for plasmamen janitors."
+ icon_state = "janitor_envirosuit"
+ item_state = "janitor_enviroskirt"
+
/obj/item/clothing/under/plasmaman/botany
name = "botany envirosuit"
desc = "A green and blue envirosuit designed to protect plasmamen from minor plant-related injuries."
icon_state = "botany_envirosuit"
item_state = "botany_envirosuit"
+/obj/item/clothing/under/plasmaman/botany/skirt
+ name = "botany enviroskirt"
+ desc = "A green and blue enviroskirt designed to protect plasmamen from minor plant-related injuries."
+ icon_state = "botany_envirosuit"
+ item_state = "botany_enviroskirt"
/obj/item/clothing/under/plasmaman/mime
name = "mime envirosuit"
@@ -54,6 +94,12 @@
icon_state = "mime_envirosuit"
item_state = "mime_envirosuit"
+/obj/item/clothing/under/plasmaman/mime/skirt
+ name = "mime enviroskirt"
+ desc = "It's not very colourful."
+ icon_state = "mime_envirosuit"
+ item_state = "mime_enviroskirt"
+
/obj/item/clothing/under/plasmaman/clown
name = "clown envirosuit"
desc = "'HONK!'"
@@ -72,5 +118,5 @@
extinguishes_left--
H.visible_message("[H]'s suit spews out a tonne of space lube!","Your suit spews out a tonne of space lube!")
H.ExtinguishMob()
- new /obj/effect/particle_effect/foam(loc) //Truely terrifying.
+ new /obj/effect/particle_effect/foam(loc) //Truly terrifying.
return 0
diff --git a/code/modules/clothing/under/jobs/Plasmaman/engineering.dm b/code/modules/clothing/under/jobs/Plasmaman/engineering.dm
index 06a3dff5ce99fd..cbf1f38f1296a5 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/engineering.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/engineering.dm
@@ -5,9 +5,20 @@
item_state = "engineer_envirosuit"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 10, "fire" = 95, "acid" = 95)
-/obj/item/clothing/under/plasmaman/atmospherics
+/obj/item/clothing/under/plasmaman/engineering/skirt
+ name = "engineering plasma enviroskirt"
+ desc = "An air-tight suit designed to be used by plasmamen exployed as engineers, the usual purple stripes being replaced by engineer's orange. It protects the user from fire and acid damage."
+ icon_state = "engineer_enviroskirt"
+ item_state = "engineer_enviroskirt"
+
+/obj/item/clothing/under/plasmaman/engineering/atmospherics
name = "atmospherics plasma envirosuit"
desc = "An air-tight suit designed to be used by plasmamen exployed as atmos technicians, the usual purple stripes being replaced by atmos's blue."
icon_state = "atmos_envirosuit"
item_state = "atmos_envirosuit"
+/obj/item/clothing/under/plasmaman/engineering/atmospherics/skirt
+ name = "atmospherics plasma enviroskirt"
+ desc = "An air-tight suit designed to be used by plasmamen exployed as atmos technicians, the usual purple stripes being replaced by atmos's blue."
+ icon_state = "atmos_enviroskirt"
+ item_state = "atmos_enviroskirt"
diff --git a/code/modules/clothing/under/jobs/Plasmaman/medsci.dm b/code/modules/clothing/under/jobs/Plasmaman/medsci.dm
index 798ff5d7dc1da8..d8a7fad7905401 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/medsci.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/medsci.dm
@@ -4,32 +4,68 @@
icon_state = "doctor_envirosuit"
item_state = "doctor_envirosuit"
+/obj/item/clothing/under/plasmaman/medical/skirt
+ name = "medical plasma enviroskirt"
+ desc = "A suit designed for the station's more plasma-based doctors."
+ icon_state = "doctor_enviroskirt"
+ item_state = "doctor_enviroskirt"
+
/obj/item/clothing/under/plasmaman/science
name = "science plasma envirosuit"
desc = "A plasmaman envirosuit designed for scientists."
icon_state = "scientist_envirosuit"
item_state = "scientist_envirosuit"
+/obj/item/clothing/under/plasmaman/science/skirt
+ name = "science plasma enviroskirt"
+ desc = "A plasmaman enviroskirt designed for scientists."
+ icon_state = "scientist_enviroskirt"
+ item_state = "scientist_enviroskirt"
+
/obj/item/clothing/under/plasmaman/robotics
name = "robotics plasma envirosuit"
desc = "A plasmaman envirosuit designed for roboticists."
icon_state = "roboticist_envirosuit"
item_state = "roboticist_envirosuit"
+/obj/item/clothing/under/plasmaman/robotics/skirt
+ name = "robotics plasma enviroskirt"
+ desc = "A plasmaman enviroskirt designed for roboticists."
+ icon_state = "roboticist_enviroskirt"
+ item_state = "roboticist_enviroskirt"
+
/obj/item/clothing/under/plasmaman/viro
name = "virology plasma envirosuit"
desc = "The suit worn by the safest people on the station, those who are completely immune to the monstrosities they create."
icon_state = "virologist_envirosuit"
item_state = "virologist_envirosuit"
+/obj/item/clothing/under/plasmaman/viro/skirt
+ name = "virology plasma enviroskirt"
+ desc = "The skirt worn by the safest people on the station, those who are completely immune to the monstrosities they create."
+ icon_state = "virologist_enviroskirt"
+ item_state = "virologist_enviroskirt"
+
/obj/item/clothing/under/plasmaman/genetics
name = "genetics plasma envirosuit"
desc = "A plasmaman envirosuit designed for geneticists."
icon_state = "geneticist_envirosuit"
item_state = "geneticist_envirosuit"
+/obj/item/clothing/under/plasmaman/genetics/skirt
+ name = "genetics plasma enviroskirt"
+ desc = "A plasmaman enviroskirt designed for geneticists."
+ icon_state = "geneticist_enviroskirt"
+ item_state = "geneticist_enviroskirt"
+
/obj/item/clothing/under/plasmaman/chemist
name = "chemistry plasma envirosuit"
desc = "A plasmaman envirosuit designed for chemists."
icon_state = "chemist_envirosuit"
item_state = "chemist_envirosuit"
+
+/obj/item/clothing/under/plasmaman/chemist/skirt
+ name = "chemistry plasma enviroskirt"
+ desc = "A plasmaman enviroskirt designed for chemists."
+ icon_state = "chemist_enviroskirt"
+ item_state = "chemist_enviroskirt"
diff --git a/code/modules/clothing/under/jobs/Plasmaman/security.dm b/code/modules/clothing/under/jobs/Plasmaman/security.dm
index 2f8c4e96b3a179..57ce0d7a2db901 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/security.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/security.dm
@@ -5,8 +5,20 @@
item_state = "security_envirosuit"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
+/obj/item/clothing/under/plasmaman/security/skirt
+ name = "security plasma enviroskirt"
+ desc = "A plasmaman containment skirtsuit designed for security officers, offering a limited amount of extra protection. This one has plastic tubing 'stockings'."
+ icon_state = "security_enviroskirt"
+ item_state = "security_enviroskirt"
+
/obj/item/clothing/under/plasmaman/security/warden
name = "warden plasma envirosuit"
desc = "A plasmaman containment suit designed for the warden, white stripes being added to differeciate them from other members of security."
icon_state = "warden_envirosuit"
item_state = "warden_envirosuit"
+
+/obj/item/clothing/under/plasmaman/security/warden/skirt
+ name = "warden plasma enviroskirt"
+ desc = "A plasmaman containment skirtsuit designed for the warden, white stripes being added to differeciate them from other members of security. This one has plastic tubing 'stockings'."
+ icon_state = "warden_enviroskirt"
+ item_state = "warden_enviroskirt"
\ No newline at end of file
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 0465ac7cf3d7d9..f2da1309fd24dc 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -130,6 +130,13 @@
return
return
+/obj/item/clothing/under/plasmaman/skirt
+ name = "plasma enviroskirt"
+ desc = "A special containment skirtsuit 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. This one has plastic tubing 'stockings'."
+ icon_state = "plasmamanskirt"
+ item_state = "plasmamanskirt"
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
+
/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."
@@ -143,3 +150,10 @@
item_state = "durathread"
can_adjust = FALSE
armor = list("melee" = 10, "laser" = 10, "fire" = 40, "acid" = 10, "bomb" = 5)
+
+/obj/item/clothing/under/misc/durathread/skirt
+ name = "durathread jumpskirt"
+ desc = "A jumpskirt made from durathread, its resilient fibres provide some protection to the wearer."
+ icon_state = "durathreadskirt"
+ item_state = "durathreadskirt"
+ armor = list("melee" = 9, "laser" = 9, "fire" = 39, "acid" = 9, "bomb" = 4)
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index b5063d6c12b67b..dddae6867e9c4c 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -57,69 +57,140 @@
/datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE)
var/current_job = J.title
var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman
- switch(current_job)
- if("Chaplain")
- O = new /datum/outfit/plasmaman/chaplain
+ var/skirt_or_no_skirt = H.jumpsuit_style
+ if(skirt_or_no_skirt == PREF_SUIT)
+ switch(current_job)
+ if("Chaplain")
+ O = new /datum/outfit/plasmaman/chaplain
- if("Curator")
- O = new /datum/outfit/plasmaman/curator
+ if("Curator")
+ O = new /datum/outfit/plasmaman/curator
- if("Janitor")
- O = new /datum/outfit/plasmaman/janitor
+ if("Janitor")
+ O = new /datum/outfit/plasmaman/janitor
- if("Botanist")
- O = new /datum/outfit/plasmaman/botany
+ if("Botanist")
+ O = new /datum/outfit/plasmaman/botany
- if("Bartender", "Lawyer")
- O = new /datum/outfit/plasmaman/bar
+ if("Bartender", "Lawyer")
+ O = new /datum/outfit/plasmaman/bar
- if("Cook")
- O = new /datum/outfit/plasmaman/chef
+ if("Cook")
+ O = new /datum/outfit/plasmaman/chef
- if("Security Officer")
- O = new /datum/outfit/plasmaman/security
+ if("Security Officer")
+ O = new /datum/outfit/plasmaman/security
- if("Detective")
- O = new /datum/outfit/plasmaman/detective
+ if("Detective")
+ O = new /datum/outfit/plasmaman/detective
- if("Warden")
- O = new /datum/outfit/plasmaman/warden
+ if("Warden")
+ O = new /datum/outfit/plasmaman/warden
- if("Cargo Technician", "Quartermaster")
- O = new /datum/outfit/plasmaman/cargo
+ if("Cargo Technician", "Quartermaster")
+ O = new /datum/outfit/plasmaman/cargo
- if("Shaft Miner")
- O = new /datum/outfit/plasmaman/mining
+ if("Shaft Miner")
+ O = new /datum/outfit/plasmaman/mining
- if("Medical Doctor")
- O = new /datum/outfit/plasmaman/medical
+ if("Medical Doctor")
+ O = new /datum/outfit/plasmaman/medical
- if("Chemist")
- O = new /datum/outfit/plasmaman/chemist
+ if("Chemist")
+ O = new /datum/outfit/plasmaman/chemist
- if("Geneticist")
- O = new /datum/outfit/plasmaman/genetics
+ if("Geneticist")
+ O = new /datum/outfit/plasmaman/genetics
- if("Roboticist")
- O = new /datum/outfit/plasmaman/robotics
+ if("Roboticist")
+ O = new /datum/outfit/plasmaman/robotics
- if("Virologist")
- O = new /datum/outfit/plasmaman/viro
+ if("Virologist")
+ O = new /datum/outfit/plasmaman/viro
- if("Scientist")
- O = new /datum/outfit/plasmaman/science
+ if("Scientist")
+ O = new /datum/outfit/plasmaman/science
- if("Station Engineer")
- O = new /datum/outfit/plasmaman/engineering
+ if("Station Engineer")
+ O = new /datum/outfit/plasmaman/engineering
- if("Atmospheric Technician")
- O = new /datum/outfit/plasmaman/atmospherics
+ if("Atmospheric Technician")
+ O = new /datum/outfit/plasmaman/atmospherics
- if("Mime")
- O = new /datum/outfit/plasmaman/mime
+ if("Mime")
+ O = new /datum/outfit/plasmaman/mime
- if("Clown")
- O = new /datum/outfit/plasmaman/clown
+ if("Clown")
+ O = new /datum/outfit/plasmaman/clown
+
+ else if(skirt_or_no_skirt == PREF_SKIRT)
+ switch(current_job)
+
+ if("Assistant")
+ O = new /datum/outfit/plasmaman/skirt
+
+ if("Chaplain")
+ O = new /datum/outfit/plasmaman/chaplain/skirt
+
+ if("Curator")
+ O = new /datum/outfit/plasmaman/curator //no skirts for you
+
+ if("Janitor")
+ O = new /datum/outfit/plasmaman/janitor/skirt
+
+ if("Botanist")
+ O = new /datum/outfit/plasmaman/botany/skirt
+
+ if("Bartender", "Lawyer")
+ O = new /datum/outfit/plasmaman/bar/skirt
+
+ if("Cook")
+ O = new /datum/outfit/plasmaman/chef/skirt
+
+ if("Security Officer")
+ O = new /datum/outfit/plasmaman/security/skirt
+
+ if("Detective")
+ O = new /datum/outfit/plasmaman/detective/skirt
+
+ if("Warden")
+ O = new /datum/outfit/plasmaman/warden/skirt
+
+ if("Cargo Technician", "Quartermaster")
+ O = new /datum/outfit/plasmaman/cargo/skirt
+
+ if("Shaft Miner")
+ O = new /datum/outfit/plasmaman/mining/skirt
+
+ if("Medical Doctor")
+ O = new /datum/outfit/plasmaman/medical/skirt
+
+ if("Chemist")
+ O = new /datum/outfit/plasmaman/chemist/skirt
+
+ if("Geneticist")
+ O = new /datum/outfit/plasmaman/genetics/skirt
+
+ if("Roboticist")
+ O = new /datum/outfit/plasmaman/robotics/skirt
+
+ if("Virologist")
+ O = new /datum/outfit/plasmaman/viro/skirt
+
+ if("Scientist")
+ O = new /datum/outfit/plasmaman/science/skirt
+
+ if("Station Engineer")
+ O = new /datum/outfit/plasmaman/engineering/skirt
+
+ if("Atmospheric Technician")
+ O = new /datum/outfit/plasmaman/atmospherics/skirt
+
+ if("Mime")
+ O = new /datum/outfit/plasmaman/mime/skirt
+
+ if("Clown")
+ O = new /datum/outfit/plasmaman/clown //no clown skirts. never
H.equipOutfit(O, visualsOnly)
H.internal = H.get_item_for_held_index(2)
diff --git a/icons/mob/clothing/under/misc.dmi b/icons/mob/clothing/under/misc.dmi
index c9b63732efd05c..b6dfa98a6b442b 100644
Binary files a/icons/mob/clothing/under/misc.dmi and b/icons/mob/clothing/under/misc.dmi differ
diff --git a/icons/mob/clothing/under/plasmaman.dmi b/icons/mob/clothing/under/plasmaman.dmi
index 949a3224a62fd5..f6effb1b121387 100644
Binary files a/icons/mob/clothing/under/plasmaman.dmi and b/icons/mob/clothing/under/plasmaman.dmi differ