diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
index dd11ede058e..8f2843acb81 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
@@ -2180,7 +2180,7 @@
/area/ruin/unpowered/BMPship/Aft)
"gT" = (
/obj/structure/closet,
-/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
+/obj/item/clothing/under/rank/procedure/iaa/blue,
/obj/item/clothing/suit/apron,
/turf/simulated/floor/plasteel,
/area/ruin/unpowered/BMPship/Aft)
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
index 955f79d52c4..462687c8173 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
@@ -4684,7 +4684,7 @@
/obj/structure/table,
/obj/structure/bedsheetbin,
/obj/item/clothing/accessory/black,
-/obj/item/clothing/under/rank/civilian/lawyer/black,
+/obj/item/clothing/under/rank/procedure/lawyer/black,
/turf/simulated/floor/plasteel/airless{
icon_state = "barber";
name = "floor"
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index e14b1942e87..ae1be9f66b7 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -3568,7 +3568,7 @@
pixel_y = 3
},
/obj/item/clothing/under/rank/centcom/officer,
-/obj/item/clothing/under/rank/centcom/representative{
+/obj/item/clothing/under/rank/procedure/representative{
pixel_x = 3;
pixel_y = -3
},
diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm
index a0918ac3c69..34d2a86aeaf 100644
--- a/code/datums/spells/cluwne.dm
+++ b/code/datums/spells/cluwne.dm
@@ -80,5 +80,5 @@
unEquip(gloves, 1)
qdel(G)
- equip_to_slot_if_possible(new /obj/item/clothing/under/rank/civilian/lawyer/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
+ equip_to_slot_if_possible(new /obj/item/clothing/under/rank/procedure/lawyer/black, SLOT_HUD_JUMPSUIT, TRUE, TRUE)
equip_to_slot_if_possible(new /obj/item/clothing/shoes/black, SLOT_HUD_SHOES, TRUE, TRUE)
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index c16aa06f36a..ca6eac1b5d9 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -138,7 +138,7 @@
/datum/outfit/job/nanotrasenrep
name = "Nanotrasen Representative"
jobtype = /datum/job/nanotrasenrep
- uniform = /obj/item/clothing/under/rank/centcom/representative
+ uniform = /obj/item/clothing/under/rank/procedure/representative
suit = /obj/item/clothing/suit/storage/ntrep
shoes = /obj/item/clothing/shoes/centcom
glasses = /obj/item/clothing/glasses/hud/skills/sunglasses
@@ -183,7 +183,7 @@
/datum/outfit/job/blueshield
name = "Blueshield"
jobtype = /datum/job/blueshield
- uniform = /obj/item/clothing/under/rank/centcom/blueshield
+ uniform = /obj/item/clothing/under/rank/procedure/blueshield
suit = /obj/item/clothing/suit/armor/vest/blueshield
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/jackboots
@@ -229,7 +229,7 @@
/datum/outfit/job/judge
name = "Magistrate"
jobtype = /datum/job/judge
- uniform = /obj/item/clothing/under/rank/centcom/magistrate
+ uniform = /obj/item/clothing/under/rank/procedure/magistrate
suit = /obj/item/clothing/suit/magirobe
gloves = /obj/item/clothing/gloves/color/white
shoes = /obj/item/clothing/shoes/centcom
@@ -271,8 +271,8 @@
/datum/outfit/job/lawyer
name = "Internal Affairs Agent"
jobtype = /datum/job/lawyer
- uniform = /obj/item/clothing/under/rank/civilian/internalaffairs
- suit = /obj/item/clothing/suit/storage/internalaffairs
+ uniform = /obj/item/clothing/under/rank/procedure/iaa
+ suit = /obj/item/clothing/suit/storage/iaa/blackjacket
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/radio/headset/headset_iaa/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/read_only
diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm
index f07f6721bf8..835d431e756 100644
--- a/code/game/machinery/vendors/wardrobe_vendors.dm
+++ b/code/game/machinery/vendors/wardrobe_vendors.dm
@@ -712,38 +712,50 @@
ads_list = list("OBJECTION! Get the rule of law for yourself!")
vend_reply = "Thank you for using the LawDrobe!"
- products = list(/obj/item/clothing/under/rank/civilian/internalaffairs = 2,
- /obj/item/clothing/under/rank/civilian/lawyer/bluesuit = 2,
- /obj/item/clothing/under/rank/civilian/lawyer/purple = 2,
- /obj/item/clothing/under/rank/civilian/lawyer/black = 2,
- /obj/item/clothing/under/rank/civilian/lawyer/red = 2,
- /obj/item/clothing/under/rank/civilian/lawyer/blue = 2,
+ products = list(/obj/item/clothing/under/rank/procedure/iaa = 2,
+ /obj/item/clothing/under/rank/procedure/iaa/blue = 2,
+ /obj/item/clothing/under/rank/procedure/iaa/purple = 2,
+ /obj/item/clothing/under/rank/procedure/lawyer/black = 2,
+ /obj/item/clothing/under/rank/procedure/lawyer/black/skirt = 2,
+ /obj/item/clothing/under/rank/procedure/lawyer/red = 2,
+ /obj/item/clothing/under/rank/procedure/lawyer/red/skirt = 2,
+ /obj/item/clothing/under/rank/procedure/lawyer/blue = 2,
+ /obj/item/clothing/under/rank/procedure/lawyer/blue/skirt = 2,
+ /obj/item/clothing/under/rank/procedure/lawyer/goodman = 2,
+ /obj/item/clothing/under/rank/procedure/lawyer/goodman/skirt = 2,
/obj/item/clothing/under/suit/female = 2,
- /obj/item/clothing/suit/storage/internalaffairs = 2,
- /obj/item/clothing/suit/storage/lawyer/bluejacket = 2,
- /obj/item/clothing/suit/storage/lawyer/purpjacket = 2,
+ /obj/item/clothing/suit/storage/iaa/blackjacket = 2,
+ /obj/item/clothing/suit/storage/iaa/bluejacket = 2,
+ /obj/item/clothing/suit/storage/iaa/purplejacket = 2,
/obj/item/clothing/shoes/laceup = 2,
/obj/item/clothing/shoes/black = 2,
/obj/item/clothing/shoes/brown = 2,
/obj/item/clothing/glasses/sunglasses/big = 2,
- /obj/item/clothing/accessory/lawyers_badge = 2)
+ /obj/item/clothing/accessory/lawyers_badge = 2,
+ /obj/item/clothing/accessory/armband/procedure = 2)
contraband = list(/obj/item/toy/figure/crew/lawyer = 1)
- prices = list(/obj/item/clothing/under/rank/civilian/internalaffairs = 50,
- /obj/item/clothing/under/rank/civilian/lawyer/bluesuit = 50,
- /obj/item/clothing/under/rank/civilian/lawyer/purple = 50,
- /obj/item/clothing/under/rank/civilian/lawyer/black = 50,
- /obj/item/clothing/under/rank/civilian/lawyer/red = 50,
- /obj/item/clothing/under/rank/civilian/lawyer/blue = 50,
+ prices = list(/obj/item/clothing/under/rank/procedure/iaa = 50,
+ /obj/item/clothing/under/rank/procedure/iaa/blue = 50,
+ /obj/item/clothing/under/rank/procedure/iaa/purple = 50,
+ /obj/item/clothing/under/rank/procedure/lawyer/black = 50,
+ /obj/item/clothing/under/rank/procedure/lawyer/black/skirt = 50,
+ /obj/item/clothing/under/rank/procedure/lawyer/red = 50,
+ /obj/item/clothing/under/rank/procedure/lawyer/red/skirt = 50,
+ /obj/item/clothing/under/rank/procedure/lawyer/blue = 50,
+ /obj/item/clothing/under/rank/procedure/lawyer/blue/skirt = 50,
+ /obj/item/clothing/under/rank/procedure/lawyer/goodman = 50,
+ /obj/item/clothing/under/rank/procedure/lawyer/goodman/skirt = 50,
/obj/item/clothing/under/suit/female = 50,
- /obj/item/clothing/suit/storage/internalaffairs = 75,
- /obj/item/clothing/suit/storage/lawyer/bluejacket = 75,
- /obj/item/clothing/suit/storage/lawyer/purpjacket = 75,
+ /obj/item/clothing/suit/storage/iaa/blackjacket = 75,
+ /obj/item/clothing/suit/storage/iaa/bluejacket = 75,
+ /obj/item/clothing/suit/storage/iaa/purplejacket = 75,
/obj/item/clothing/shoes/laceup = 30,
/obj/item/clothing/shoes/black = 20,
/obj/item/clothing/shoes/brown = 20,
/obj/item/clothing/glasses/sunglasses/big = 30,
- /obj/item/clothing/accessory/lawyers_badge = 50)
+ /obj/item/clothing/accessory/lawyers_badge = 50,
+ /obj/item/clothing/accessory/armband/procedure = 20)
refill_canister = /obj/item/vending_refill/lawdrobe
diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm
index 344be6016cf..8b634d50003 100644
--- a/code/game/objects/items/weapons/storage/garment.dm
+++ b/code/game/objects/items/weapons/storage/garment.dm
@@ -57,10 +57,8 @@
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/dress(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/dress_hr(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/red(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/oldman(src)
+ new /obj/item/clothing/under/rank/civilian/head_of_personnel/dress_hr(src)
+ new /obj/item/clothing/under/rank/civilian/head_of_personnel/oldman(src)
new /obj/item/clothing/under/suit/female(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
@@ -139,11 +137,9 @@
/obj/item/storage/bag/garment/nanotrasen_representative/populate_contents()
new /obj/item/clothing/head/ntrep(src)
- new /obj/item/clothing/under/rank/centcom/representative(src)
- new /obj/item/clothing/under/rank/centcom/representative/skirt(src)
- new /obj/item/clothing/under/rank/centcom/representative/formal(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/oldman(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
+ new /obj/item/clothing/under/rank/procedure/representative(src)
+ new /obj/item/clothing/under/rank/procedure/representative/skirt(src)
+ new /obj/item/clothing/under/rank/procedure/representative/formal(src)
new /obj/item/clothing/under/suit/female(src)
new /obj/item/clothing/shoes/centcom(src)
new /obj/item/clothing/shoes/sandal/fancy(src)
@@ -158,9 +154,9 @@
/obj/item/storage/bag/garment/magistrate/populate_contents()
new /obj/item/clothing/head/justice_wig(src)
new /obj/item/clothing/head/powdered_wig(src)
- new /obj/item/clothing/under/rank/centcom/magistrate(src)
- new /obj/item/clothing/under/rank/centcom/magistrate/skirt(src)
- new /obj/item/clothing/under/rank/centcom/magistrate/formal(src)
+ new /obj/item/clothing/under/rank/procedure/magistrate(src)
+ new /obj/item/clothing/under/rank/procedure/magistrate/skirt(src)
+ new /obj/item/clothing/under/rank/procedure/magistrate/formal(src)
new /obj/item/clothing/suit/magirobe(src)
new /obj/item/clothing/shoes/centcom(src)
new /obj/item/clothing/glasses/sunglasses(src)
@@ -173,9 +169,9 @@
/obj/item/storage/bag/garment/blueshield/populate_contents()
new /obj/item/clothing/head/beret/centcom/officer(src)
new /obj/item/clothing/head/beret/centcom/officer/navy(src)
- new /obj/item/clothing/under/rank/centcom/blueshield(src)
- new /obj/item/clothing/under/rank/centcom/blueshield/skirt(src)
- new /obj/item/clothing/under/rank/centcom/blueshield/formal(src)
+ new /obj/item/clothing/under/rank/procedure/blueshield(src)
+ new /obj/item/clothing/under/rank/procedure/blueshield/skirt(src)
+ new /obj/item/clothing/under/rank/procedure/blueshield/formal(src)
new /obj/item/clothing/suit/armor/vest/blueshield(src)
new /obj/item/clothing/suit/storage/blueshield(src)
new /obj/item/clothing/shoes/centcom(src)
@@ -240,26 +236,6 @@
new /obj/item/clothing/accessory/holster/armpit(src)
new /obj/item/clothing/glasses/sunglasses/yeah(src)
-/obj/item/storage/bag/garment/iaa
- name = "internal affairs agent's garment bag"
- desc = "A bag for storing extra clothes and shoes. This one belongs to the internal affairs agent."
-
-/obj/item/storage/bag/garment/iaa/populate_contents()
- new /obj/item/clothing/under/rank/civilian/lawyer/black(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/red(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/blue(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/purple(src)
- new /obj/item/clothing/under/rank/civilian/lawyer/bluesuit(src)
- new /obj/item/clothing/under/suit/female(src)
- new /obj/item/clothing/suit/storage/lawyer/bluejacket(src)
- new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
- new /obj/item/clothing/shoes/brown(src)
- new /obj/item/clothing/shoes/black(src)
- new /obj/item/clothing/under/rank/civilian/internalaffairs(src)
- new /obj/item/clothing/suit/storage/internalaffairs(src)
- new /obj/item/clothing/glasses/sunglasses/big(src)
- new /obj/item/clothing/glasses/sunglasses/big(src)
-
/obj/item/storage/bag/garment/chaplain
name = "chaplain's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the chaplain."
diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
index ee151c4e8e7..6de3e2dd9fe 100644
--- a/code/modules/client/preference/loadout/loadout_suit.dm
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -202,15 +202,15 @@
/datum/gear/suit/blacksuit
display_name = "Suit jacket, black"
- path = /obj/item/clothing/suit/storage/lawyer/blackjacket
+ path = /obj/item/clothing/suit/storage/iaa/blackjacket
/datum/gear/suit/bluesuit
display_name = "Suit jacket, blue"
- path = /obj/item/clothing/suit/storage/lawyer/bluejacket
+ path = /obj/item/clothing/suit/storage/iaa/bluejacket
/datum/gear/suit/purplesuit
display_name = "Suit jacket, purple"
- path = /obj/item/clothing/suit/storage/lawyer/purpjacket
+ path = /obj/item/clothing/suit/storage/iaa/purplejacket
//Mantles!
/datum/gear/suit/mantle
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 479685ea4fc..0de18c3d4b0 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -205,17 +205,17 @@
/datum/gear/uniform/skirt/job/magistrate
display_name = "Skirt, magistrate"
- path = /obj/item/clothing/under/rank/centcom/magistrate/skirt
+ path = /obj/item/clothing/under/rank/procedure/magistrate/skirt
allowed_roles = list("Magistrate")
/datum/gear/uniform/skirt/job/ntrep
display_name = "Skirt, nt rep"
- path = /obj/item/clothing/under/rank/centcom/representative/skirt
+ path = /obj/item/clothing/under/rank/procedure/representative/skirt
allowed_roles = list("Nanotrasen Representative")
/datum/gear/uniform/skirt/job/blueshield
display_name = "Skirt, blueshield"
- path = /obj/item/clothing/under/rank/centcom/blueshield/skirt
+ path = /obj/item/clothing/under/rank/procedure/blueshield/skirt
allowed_roles = list("Blueshield")
diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm
index 7d3460e4fc2..53b42f0e0b7 100644
--- a/code/modules/clothing/suits/job_suits.dm
+++ b/code/modules/clothing/suits/job_suits.dm
@@ -208,43 +208,40 @@
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
-//Lawyer
-/obj/item/clothing/suit/storage/lawyer
+//Internal Affairs
+/obj/item/clothing/suit/storage/iaa
+ desc = "A snappy dress jacket."
+ blood_overlay_type = "coat"
+ body_parts_covered = UPPER_TORSO | ARMS
sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
+ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
)
-/obj/item/clothing/suit/storage/lawyer/blackjacket
+/obj/item/clothing/suit/storage/iaa/blackjacket
name = "black suit jacket"
- desc = "A snappy dress jacket."
icon_state = "suitjacket_black_open"
item_state = "suitjacket_black_open"
- blood_overlay_type = "coat"
- body_parts_covered = UPPER_TORSO|ARMS
- ignore_suitadjust = 0
- suit_adjusted = 1
+ ignore_suitadjust = FALSE
+ suit_adjusted = TRUE
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
-/obj/item/clothing/suit/storage/lawyer/bluejacket
+/obj/item/clothing/suit/storage/iaa/bluejacket
name = "blue suit jacket"
- desc = "A snappy dress jacket."
icon_state = "suitjacket_blue_open"
item_state = "suitjacket_blue_open"
- blood_overlay_type = "coat"
- body_parts_covered = UPPER_TORSO|ARMS
- ignore_suitadjust = 0
- suit_adjusted = 1
+ ignore_suitadjust = FALSE
+ suit_adjusted = TRUE
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
-/obj/item/clothing/suit/storage/lawyer/purpjacket
+/obj/item/clothing/suit/storage/iaa/purplejacket
name = "purple suit jacket"
- desc = "A snappy dress jacket."
- icon_state = "suitjacket_purp"
- item_state = "suitjacket_purp"
- blood_overlay_type = "coat"
- body_parts_covered = UPPER_TORSO|ARMS
+ icon_state = "suitjacket_purple"
+ item_state = "suitjacket_purple"
//Head of Security
/obj/item/clothing/suit/mantle/armor
@@ -269,23 +266,7 @@
item_state = "hopmantle"
armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
-//Internal Affairs
-/obj/item/clothing/suit/storage/internalaffairs
- name = "\improper Internal Affairs jacket"
- desc = "A smooth black jacket."
- icon_state = "ia_jacket_open"
- item_state = "ia_jacket_open"
- blood_overlay_type = "coat"
- body_parts_covered = UPPER_TORSO|ARMS
- ignore_suitadjust = 0
- suit_adjusted = 1
- actions_types = list(/datum/action/item_action/button)
- adjust_flavour = "unbutton"
-
- sprite_sheets = list(
- "Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
- )
-
+//Dignitaries
/obj/item/clothing/suit/storage/ntrep
name = "\improper Nanotrasen Representative jacket"
desc = "A fancy black jacket; standard issue to Nanotrasen Representatives."
diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm
index 23a22fd77e7..13bbc917809 100644
--- a/code/modules/clothing/under/accessories/armband.dm
+++ b/code/modules/clothing/under/accessories/armband.dm
@@ -52,3 +52,9 @@
desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green."
icon_state = "medgreen"
item_color = "medgreen"
+
+/obj/item/clothing/accessory/armband/procedure
+ name = "procedure armband"
+ desc = "An armband, worn by the crew to display which department they're assigned to. This one is lavender."
+ icon_state = "procedure"
+ item_color = "procedure"
diff --git a/code/modules/clothing/under/centcom.dm b/code/modules/clothing/under/centcom.dm
index 99025fd5ed9..640e2125927 100644
--- a/code/modules/clothing/under/centcom.dm
+++ b/code/modules/clothing/under/centcom.dm
@@ -104,58 +104,6 @@
name = "\improper Trans-Solar Federation commander's uniform"
desc = "Gold trim on space-black cloth, this uniform is worn by generals of the Trans-Solar Federation. It has exotic materials for protection."
-/obj/item/clothing/under/rank/centcom/representative
- name = "\improper Nanotrasen representative's uniform"
- desc = "Fine black cotton pants and white shirt with blue and gold trim."
- icon_state = "ntrep"
- item_state = "ntrep"
- item_color = "ntrep"
-
-/obj/item/clothing/under/rank/centcom/representative/skirt
- name = "\improper Nanotrasen representative's skirt"
- desc = "A silky black skirt and white shirt with blue and gold trim."
- icon_state = "ntrep_skirt"
- item_state = "ntrep_skirt"
- item_color = "ntrep_skirt"
-
-/obj/item/clothing/under/rank/centcom/representative/formal
- name = "formal Nanotrasen representative's uniform"
- desc = "A formal black suit with gold trim and a blue tie, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder."
- icon_state = "ntrep_formal"
- item_state = "ntrep_formal"
- item_color = "ntrep_formal"
- displays_id = FALSE
-
-/obj/item/clothing/under/rank/centcom/representative/formal/Initialize(mapload)
- . = ..()
- desc = "A formal black suit with gold trim and a blue tie, this uniform bears [station_name()] on the left shoulder."
-
-/obj/item/clothing/under/rank/centcom/magistrate
- name = "magistrate's uniform"
- desc = "Fine black cotton pants and white shirt with a black tie and gold trim."
- icon_state = "magistrate"
- item_state = "magistrate"
- item_color = "magistrate"
-
-/obj/item/clothing/under/rank/centcom/magistrate/skirt
- name = "magistrate's skirt"
- desc = "A silky black skirt and white shirt with a black tie and gold trim."
- icon_state = "magistrate_skirt"
- item_state = "magistrate_skirt"
- item_color = "magistrate_skirt"
-
-/obj/item/clothing/under/rank/centcom/magistrate/formal
- name = "formal magistrate's uniform"
- desc = "A formal black suit with gold trim and a snazzy red tie, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder."
- icon_state = "magistrate_formal"
- item_state = "magistrate_formal"
- item_color = "magistrate_formal"
- displays_id = FALSE
-
-/obj/item/clothing/under/rank/centcom/magistrate/formal/Initialize(mapload)
- . = ..()
- desc = "A formal black suit with gold trim and a snazzy red tie, this uniform displays the rank of \"Magistrate\" and bears [station_name()] on the left shoulder."
-
/obj/item/clothing/under/rank/centcom/diplomatic
name = "\improper Nanotrasen diplomatic uniform"
desc = "A very gaudy and official looking uniform of the Nanotrasen Diplomatic Corps."
@@ -163,28 +111,3 @@
item_state = "g_suit"
item_color = "presidente"
displays_id = FALSE
-
-/obj/item/clothing/under/rank/centcom/blueshield
- name = "blueshield's uniform"
- desc = "A short-sleeved black uniform, paired with grey armored cargo pants, all made out of a sturdy material. Blueshield standard issue."
- icon_state = "blueshield"
- item_state = "blueshield"
- item_color = "blueshield"
- armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20)
-
-/obj/item/clothing/under/rank/centcom/blueshield/skirt
- name = "blueshield's skirt"
- desc = "A short, black and grey with blue markings skirted uniform. For the feminine Blueshield."
- icon_state = "blueshield_skirt"
- item_state = "blueshield_skirt"
- item_color = "blueshield_skirt"
- armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20)
-
-/obj/item/clothing/under/rank/centcom/blueshield/formal
- name = "formal blueshield's uniform"
- desc = "A formal black suit with blue trim and tie, this uniform bears \"Close Protection\" on the left shoulder. It's got exotic materials for protection."
- icon_state = "blueshield_formal"
- item_state = "blueshield_formal"
- item_color = "blueshield_formal"
- armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20)
- displays_id = FALSE
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index ef8bca04906..ad4d59225f1 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -28,6 +28,19 @@
item_state = "hopwhimsy"
item_color = "hopwhimsy"
+/obj/item/clothing/under/rank/civilian/head_of_personnel/oldman
+ name = "old man's suit"
+ desc = "A classic suit for the older gentleman with built in back support."
+ icon_state = "oldman"
+ item_state = "oldman"
+ item_color = "oldman"
+
+/obj/item/clothing/under/rank/civilian/head_of_personnel/dress_hr
+ name = "human resources director's uniform"
+ desc = "Superior class for the nosy H.R. Director."
+ icon_state = "huresource"
+ item_color = "huresource"
+
/obj/item/clothing/under/rank/civilian/bartender
desc = "It looks like it could use some more flair."
name = "bartender's uniform"
@@ -128,58 +141,3 @@
icon_state = "barber"
item_state = "barber"
item_color = "barber"
-
-
-/obj/item/clothing/under/rank/civilian/internalaffairs
- desc = "The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched."
- name = "Internal Affairs uniform"
- icon_state = "internalaffairs"
- item_state = "internalaffairs"
- item_color = "internalaffairs"
-
-/obj/item/clothing/under/rank/civilian/lawyer
- name = "lawyer suit"
- desc = "Slick threads."
-
-/obj/item/clothing/under/rank/civilian/lawyer/black
- icon_state = "lawyer_black"
- item_state = "lawyer_black"
- item_color = "lawyer_black"
-
-/obj/item/clothing/under/rank/civilian/lawyer/red
- name = "lawyer red suit"
- icon_state = "lawyer_red"
- item_state = "lawyer_red"
- item_color = "lawyer_red"
-
-/obj/item/clothing/under/rank/civilian/lawyer/blue
- name = "lawyer blue suit"
- icon_state = "lawyer_blue"
- item_state = "lawyer_blue"
- item_color = "lawyer_blue"
-
-/obj/item/clothing/under/rank/civilian/lawyer/purple
- name = "lawyer purple suit"
- icon_state = "lawyer_purp"
- item_state = "lawyer_purp"
- item_color = "lawyer_purp"
-
-/obj/item/clothing/under/rank/civilian/lawyer/bluesuit
- name = "blue suit"
- desc = "A classy suit and tie"
- icon_state = "bluesuit"
- item_state = "bluesuit"
- item_color = "bluesuit"
-
-/obj/item/clothing/under/rank/civilian/lawyer/oldman
- name = "Old Man's Suit"
- desc = "A classic suit for the older gentleman with built in back support."
- icon_state = "oldman"
- item_state = "oldman"
- item_color = "oldman"
-
-/obj/item/clothing/under/rank/civilian/lawyer/dress_hr
- name = "human resources director's uniform"
- desc = "Superior class for the nosy H.R. Director."
- icon_state = "huresource"
- item_color = "huresource"
diff --git a/code/modules/clothing/under/jobs/procedure.dm b/code/modules/clothing/under/jobs/procedure.dm
new file mode 100644
index 00000000000..3cbd3852f33
--- /dev/null
+++ b/code/modules/clothing/under/jobs/procedure.dm
@@ -0,0 +1,158 @@
+/obj/item/clothing/under/rank/procedure
+ icon = 'icons/obj/clothing/under/procedure.dmi'
+
+ sprite_sheets = list(
+ "Human" = 'icons/mob/clothing/under/procedure.dmi',
+ "Vox" = 'icons/mob/clothing/species/vox/under/procedure.dmi',
+ "Drask" = 'icons/mob/clothing/species/drask/under/procedure.dmi',
+ "Grey" = 'icons/mob/clothing/species/grey/under/procedure.dmi',
+ "Kidan" = 'icons/mob/clothing/species/kidan/under/procedure.dmi'
+ )
+
+/obj/item/clothing/under/rank/procedure/representative
+ name = "\improper Nanotrasen representative's uniform"
+ desc = "Fine black cotton pants and white shirt, with blue and gold trim."
+ icon_state = "ntrep"
+ item_state = "ntrep"
+ item_color = "ntrep"
+
+/obj/item/clothing/under/rank/procedure/representative/skirt
+ name = "\improper Nanotrasen representative's skirt"
+ desc = "A silky black skirt and white shirt, with blue and gold trim."
+ icon_state = "ntrep_skirt"
+ item_state = "ntrep_skirt"
+ item_color = "ntrep_skirt"
+
+/obj/item/clothing/under/rank/procedure/representative/formal
+ name = "formal Nanotrasen representative's uniform"
+ desc = "A formal black suit with gold trim and a blue tie, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder."
+ icon_state = "ntrep_formal"
+ item_state = "ntrep_formal"
+ item_color = "ntrep_formal"
+ displays_id = FALSE
+
+/obj/item/clothing/under/rank/procedure/representative/formal/Initialize(mapload)
+ . = ..()
+ desc = "A formal black suit with gold trim and a blue tie, this uniform bears [station_name()] on the left shoulder."
+
+/obj/item/clothing/under/rank/procedure/magistrate
+ name = "magistrate's uniform"
+ desc = "Fine black cotton pants and white shirt, with a black tie and gold trim."
+ icon_state = "magistrate"
+ item_state = "magistrate"
+ item_color = "magistrate"
+
+/obj/item/clothing/under/rank/procedure/magistrate/skirt
+ name = "magistrate's skirt"
+ desc = "A silky black skirt and white shirt, with a black tie and gold trim."
+ icon_state = "magistrate_skirt"
+ item_state = "magistrate_skirt"
+ item_color = "magistrate_skirt"
+
+/obj/item/clothing/under/rank/procedure/magistrate/formal
+ name = "formal magistrate's uniform"
+ desc = "A formal black suit with gold trim and a snazzy red tie, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder."
+ icon_state = "magistrate_formal"
+ item_state = "magistrate_formal"
+ item_color = "magistrate_formal"
+ displays_id = FALSE
+
+/obj/item/clothing/under/rank/procedure/magistrate/formal/Initialize(mapload)
+ . = ..()
+ desc = "A formal black suit with gold trim and a snazzy red tie, this uniform displays the rank of \"Magistrate\" and bears [station_name()] on the left shoulder."
+
+/obj/item/clothing/under/rank/procedure/blueshield
+ name = "blueshield's uniform"
+ desc = "A short-sleeved black uniform, paired with grey armored cargo pants, all made out of a sturdy material. Blueshield standard issue."
+ icon_state = "blueshield"
+ item_state = "blueshield"
+ item_color = "blueshield"
+ armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20)
+
+/obj/item/clothing/under/rank/procedure/blueshield/skirt
+ name = "blueshield's skirt"
+ desc = "A short, black and grey with blue markings skirted uniform. For the feminine Blueshield."
+ icon_state = "blueshield_skirt"
+ item_state = "blueshield_skirt"
+ item_color = "blueshield_skirt"
+
+/obj/item/clothing/under/rank/procedure/blueshield/formal
+ name = "formal blueshield's uniform"
+ desc = "A formal black suit with blue trim and tie, this uniform bears \"Close Protection\" on the left shoulder. It has exotic materials for protection."
+ icon_state = "blueshield_formal"
+ item_state = "blueshield_formal"
+ item_color = "blueshield_formal"
+ displays_id = FALSE
+
+/obj/item/clothing/under/rank/procedure/iaa
+ name = "Internal Affairs uniform"
+ desc = "The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched."
+ icon_state = "iaa"
+ item_state = "iaa"
+ item_color = "iaa"
+
+/obj/item/clothing/under/rank/procedure/iaa/purple
+ name = "purple suit"
+ desc = "A fancy set of purple slacks with a black waistcoat and puffy white tie. Exquisite."
+ icon_state = "iaa_purple"
+ item_state = "iaa_purple"
+ item_color = "iaa_purple"
+
+/obj/item/clothing/under/rank/procedure/iaa/blue
+ name = "blue suit"
+ desc = "Classy blue suit pants, white ironed shirt and a red tie. Professional."
+ icon_state = "iaa_blue"
+ item_state = "iaa_blue"
+ item_color = "iaa_blue"
+
+/obj/item/clothing/under/rank/procedure/lawyer
+ name = "lawyer suit"
+ desc = "Slick threads."
+
+/obj/item/clothing/under/rank/procedure/lawyer/black
+ icon_state = "lawyer_black"
+ item_state = "lawyer_black"
+ item_color = "lawyer_black"
+
+/obj/item/clothing/under/rank/procedure/lawyer/black/skirt
+ name = "lawyer skirt"
+ icon_state = "lawyer_black_skirt"
+ item_state = "lawyer_black_skirt"
+ item_color = "lawyer_black_skirt"
+
+/obj/item/clothing/under/rank/procedure/lawyer/red
+ name = "lawyer red suit"
+ icon_state = "lawyer_red"
+ item_state = "lawyer_red"
+ item_color = "lawyer_red"
+
+/obj/item/clothing/under/rank/procedure/lawyer/red/skirt
+ name = "lawyer red skirt"
+ icon_state = "lawyer_red_skirt"
+ item_state = "lawyer_red_skirt"
+ item_color = "lawyer_red_skirt"
+
+/obj/item/clothing/under/rank/procedure/lawyer/blue
+ name = "lawyer blue suit"
+ icon_state = "lawyer_blue"
+ item_state = "lawyer_blue"
+ item_color = "lawyer_blue"
+
+/obj/item/clothing/under/rank/procedure/lawyer/blue/skirt
+ name = "lawyer blue skirt"
+ icon_state = "lawyer_blue_skirt"
+ item_state = "lawyer_blue_skirt"
+ item_color = "lawyer_blue_skirt"
+
+/obj/item/clothing/under/rank/procedure/lawyer/goodman
+ name = "criminal lawyer suit"
+ desc = "It's all good, man!"
+ icon_state = "lawyer_goodman"
+ item_state = "lawyer_goodman"
+ item_color = "lawyer_goodman"
+
+/obj/item/clothing/under/rank/procedure/lawyer/goodman/skirt
+ name = "criminal lawyer skirt"
+ icon_state = "lawyer_goodman_skirt"
+ item_state = "lawyer_goodman_skirt"
+ item_color = "lawyer_goodman_skirt"
diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm
index d6647d42023..1c54a3b1f85 100644
--- a/code/modules/supply/supply_packs/pack_miscellaneous.dm
+++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm
@@ -384,12 +384,12 @@
contains = list(/obj/item/clothing/under/dress/blacktango,
/obj/item/clothing/under/misc/assistantformal,
/obj/item/clothing/under/misc/assistantformal,
- /obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
- /obj/item/clothing/suit/storage/lawyer/bluejacket,
- /obj/item/clothing/under/rank/civilian/lawyer/purple,
- /obj/item/clothing/suit/storage/lawyer/purpjacket,
- /obj/item/clothing/under/rank/civilian/lawyer/black,
- /obj/item/clothing/suit/storage/lawyer/blackjacket,
+ /obj/item/clothing/under/rank/procedure/iaa/blue,
+ /obj/item/clothing/suit/storage/iaa/bluejacket,
+ /obj/item/clothing/under/rank/procedure/iaa/purple,
+ /obj/item/clothing/suit/storage/iaa/purplejacket,
+ /obj/item/clothing/under/rank/procedure/iaa,
+ /obj/item/clothing/suit/storage/iaa/blackjacket,
/obj/item/clothing/accessory/waistcoat,
/obj/item/clothing/accessory/blue,
/obj/item/clothing/accessory/red,
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index 26b687a3c91..148c5355577 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/centcom.dmi b/icons/mob/clothing/species/drask/under/centcom.dmi
index 21e88ec9ff6..b72065bc560 100644
Binary files a/icons/mob/clothing/species/drask/under/centcom.dmi and b/icons/mob/clothing/species/drask/under/centcom.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/civilian.dmi b/icons/mob/clothing/species/drask/under/civilian.dmi
index 20225ada383..65abb049671 100644
Binary files a/icons/mob/clothing/species/drask/under/civilian.dmi and b/icons/mob/clothing/species/drask/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/drask/under/procedure.dmi b/icons/mob/clothing/species/drask/under/procedure.dmi
new file mode 100644
index 00000000000..7bfe17ce39b
Binary files /dev/null and b/icons/mob/clothing/species/drask/under/procedure.dmi differ
diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi
index bd5018237a1..836eb20cc58 100644
Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ
diff --git a/icons/mob/clothing/species/grey/under/centcom.dmi b/icons/mob/clothing/species/grey/under/centcom.dmi
index f0b1e4778f1..d2f4093ce7c 100644
Binary files a/icons/mob/clothing/species/grey/under/centcom.dmi and b/icons/mob/clothing/species/grey/under/centcom.dmi differ
diff --git a/icons/mob/clothing/species/grey/under/civilian.dmi b/icons/mob/clothing/species/grey/under/civilian.dmi
index df23eb1e675..a05f1c92099 100644
Binary files a/icons/mob/clothing/species/grey/under/civilian.dmi and b/icons/mob/clothing/species/grey/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/grey/under/procedure.dmi b/icons/mob/clothing/species/grey/under/procedure.dmi
new file mode 100644
index 00000000000..65b3d0ca39e
Binary files /dev/null and b/icons/mob/clothing/species/grey/under/procedure.dmi differ
diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi
index 37483c8c8a5..bf89ab29c2a 100644
Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ
diff --git a/icons/mob/clothing/species/kidan/under/centcom.dmi b/icons/mob/clothing/species/kidan/under/centcom.dmi
index 54cc3b85c6e..934bf4ed851 100644
Binary files a/icons/mob/clothing/species/kidan/under/centcom.dmi and b/icons/mob/clothing/species/kidan/under/centcom.dmi differ
diff --git a/icons/mob/clothing/species/kidan/under/procedure.dmi b/icons/mob/clothing/species/kidan/under/procedure.dmi
new file mode 100644
index 00000000000..ec1a77971c6
Binary files /dev/null and b/icons/mob/clothing/species/kidan/under/procedure.dmi differ
diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
index 64328976000..b6d2acc4390 100644
Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/centcom.dmi b/icons/mob/clothing/species/vox/under/centcom.dmi
index 7078f770479..5b28723cdbf 100644
Binary files a/icons/mob/clothing/species/vox/under/centcom.dmi and b/icons/mob/clothing/species/vox/under/centcom.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/civilian.dmi b/icons/mob/clothing/species/vox/under/civilian.dmi
index c6c38904981..873a6838fd3 100644
Binary files a/icons/mob/clothing/species/vox/under/civilian.dmi and b/icons/mob/clothing/species/vox/under/civilian.dmi differ
diff --git a/icons/mob/clothing/species/vox/under/procedure.dmi b/icons/mob/clothing/species/vox/under/procedure.dmi
new file mode 100644
index 00000000000..8edfb44e536
Binary files /dev/null and b/icons/mob/clothing/species/vox/under/procedure.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index ae15981af3e..04c0bd0a4b5 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/under/centcom.dmi b/icons/mob/clothing/under/centcom.dmi
index b9cc635973a..7f83f454855 100644
Binary files a/icons/mob/clothing/under/centcom.dmi and b/icons/mob/clothing/under/centcom.dmi differ
diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi
index 154566254e8..6eda3ab2810 100644
Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ
diff --git a/icons/mob/clothing/under/procedure.dmi b/icons/mob/clothing/under/procedure.dmi
new file mode 100644
index 00000000000..3b2b9d6b97c
Binary files /dev/null and b/icons/mob/clothing/under/procedure.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index 2cdfc3f6c21..fd40d8db061 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 87c41ff2190..d632609fbb6 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
index c281779c4ce..d9a988e02d2 100644
Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ
diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi
index 77daf1f1a15..727aaa91163 100644
Binary files a/icons/obj/clothing/ties_overlay.dmi and b/icons/obj/clothing/ties_overlay.dmi differ
diff --git a/icons/obj/clothing/under/centcom.dmi b/icons/obj/clothing/under/centcom.dmi
index 52a80bcb918..870a5b964eb 100644
Binary files a/icons/obj/clothing/under/centcom.dmi and b/icons/obj/clothing/under/centcom.dmi differ
diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi
index 1e621147798..770a8cd4679 100644
Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ
diff --git a/icons/obj/clothing/under/procedure.dmi b/icons/obj/clothing/under/procedure.dmi
new file mode 100644
index 00000000000..a78e716bf8b
Binary files /dev/null and b/icons/obj/clothing/under/procedure.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 8adcdde194e..c8915258baa 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1618,6 +1618,7 @@
#include "code\modules\clothing\under\jobs\civilian.dm"
#include "code\modules\clothing\under\jobs\engineering_jumpsuits.dm"
#include "code\modules\clothing\under\jobs\medical_jumpsuits.dm"
+#include "code\modules\clothing\under\jobs\procedure.dm"
#include "code\modules\clothing\under\jobs\rnd.dm"
#include "code\modules\clothing\under\jobs\security_jumpsuits.dm"
#include "code\modules\clothing\under\jobs\plasmamen\_plasmamen.dm"