diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm
index 9d9dcb6c237..95a27524bd0 100644
--- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm
+++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm
@@ -423,6 +423,24 @@ SKYRAT EDIT END */
name = "Oversized Jacket (Worn)"
icon_file = 'icons/mob/clothing/suits/jacket.dmi'
+/datum/greyscale_config/jacket_lawyer
+ name = "Formal Suit Jacket"
+ icon_file = 'icons/obj/clothing/suits/jacket.dmi'
+ json_config = 'code/datums/greyscale/json_configs/jacket_lawyer.json'
+
+/datum/greyscale_config/jacket_lawyer/worn
+ name = "Formal Suit Jacket (Worn)"
+ icon_file = 'icons/mob/clothing/suits/jacket.dmi'
+
+/datum/greyscale_config/overalls
+ name = "Overalls"
+ icon_file = 'icons/obj/clothing/suits/utility.dmi'
+ json_config = 'code/datums/greyscale/json_configs/overalls.json'
+
+/datum/greyscale_config/overalls/worn
+ name = "Overalls (Worn)"
+ icon_file = 'icons/mob/clothing/suits/utility.dmi'
+
//
// SHOES
//
diff --git a/code/datums/greyscale/json_configs/jacket_lawyer.json b/code/datums/greyscale/json_configs/jacket_lawyer.json
new file mode 100644
index 00000000000..9593f9c90c3
--- /dev/null
+++ b/code/datums/greyscale/json_configs/jacket_lawyer.json
@@ -0,0 +1,18 @@
+{
+ "jacket_lawyer": [
+ {
+ "type": "icon_state",
+ "icon_state": "suitjacket",
+ "blend_mode": "overlay",
+ "color_ids": [ 1 ]
+ }
+ ],
+ "jacket_lawyer_t": [
+ {
+ "type": "icon_state",
+ "icon_state": "suitjacket_t",
+ "blend_mode": "overlay",
+ "color_ids": [ 1 ]
+ }
+ ]
+}
diff --git a/modular_skyrat/modules/GAGS/json_configs/overalls/overalls_worn.json b/code/datums/greyscale/json_configs/overalls.json
similarity index 100%
rename from modular_skyrat/modules/GAGS/json_configs/overalls/overalls_worn.json
rename to code/datums/greyscale/json_configs/overalls.json
diff --git a/code/datums/greyscale/json_configs/ties.json b/code/datums/greyscale/json_configs/ties.json
index e9c1225d893..7f1e717c5f0 100644
--- a/code/datums/greyscale/json_configs/ties.json
+++ b/code/datums/greyscale/json_configs/ties.json
@@ -14,5 +14,14 @@
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
+ ],
+ "bowtie_greyscale": [
+ {
+ "type": "icon_state",
+ "icon_state": "bowtie_greyscale",
+ "blend_mode": "overlay",
+ "color_ids": [ 1 ]
+ }
]
+
}
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index ef93a289421..9f1bd85d066 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -40,7 +40,7 @@
/obj/item/storage/box/mousetraps = 2,
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/clothing/suit/toggle/chef = 1,
- /obj/item/clothing/under/rank/civilian/chef = 1,
+ /obj/item/clothing/under/costume/buttondown/slacks/service = 1,
/obj/item/clothing/head/utility/chefhat = 1,
/obj/item/reagent_containers/cup/rag = 1)
generate_items_inside(items_inside,src)
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 2e89d20e019..9f0be80e7a8 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -17,6 +17,19 @@
if(GET_ATOM_BLOOD_DNA_LENGTH(src))
. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
+/obj/item/clothing/neck/bowtie
+ name = "bow tie"
+ desc = "A small neosilk bowtie."
+ icon = 'icons/obj/clothing/neck.dmi'
+ icon_state = "bowtie_greyscale"
+ inhand_icon_state = "" //no inhands
+ w_class = WEIGHT_CLASS_SMALL
+ custom_price = PAYCHECK_CREW
+ greyscale_config = /datum/greyscale_config/ties
+ greyscale_config_worn = /datum/greyscale_config/ties/worn
+ greyscale_colors = "#151516ff"
+ flags_1 = IS_PLAYER_COLORABLE_1
+
/obj/item/clothing/neck/tie
name = "slick tie"
desc = "A neosilk tie."
diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm
index b25fa7a8efc..49cb7ffb174 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -82,21 +82,6 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS
allowed = list(/obj/item/storage/fancy/cigarettes, /obj/item/stack/spacecash)
-/obj/item/clothing/suit/apron/overalls
- name = "coveralls"
- desc = "A set of denim overalls."
- icon_state = "overalls"
- inhand_icon_state = "overalls"
- body_parts_covered = CHEST|GROIN|LEGS
- species_exception = list(/datum/species/golem)
-
-/obj/item/clothing/suit/apron/purple_bartender
- name = "purple bartender apron"
- desc = "A fancy purple apron for a stylish person."
- icon_state = "purplebartenderapron"
- inhand_icon_state = null
- body_parts_covered = CHEST|GROIN
-
/obj/item/clothing/suit/syndicatefake
name = "black and red space suit replica"
icon_state = "syndicate-black-red"
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index fb05df7e26d..03a10a577b4 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -40,6 +40,18 @@
inhand_icon_state = null
body_parts_covered = CHEST|GROIN|LEGS
+/obj/item/clothing/suit/apron/overalls
+ name = "coveralls"
+ desc = "A set of overalls, good for protecting thinner clothes from the elements."
+ icon_state = "overalls"
+ inhand_icon_state = ""
+ body_parts_covered = CHEST|GROIN|LEGS
+ species_exception = list(/datum/species/golem)
+ greyscale_config = /datum/greyscale_config/overalls
+ greyscale_config_worn = /datum/greyscale_config/overalls/worn
+ greyscale_colors = "#313c6e"
+ flags_1 = IS_PLAYER_COLORABLE_1
+
//Captain
/obj/item/clothing/suit/jacket/capjacket
name = "captain's parade jacket"
@@ -173,8 +185,8 @@
//Lawyer
/obj/item/clothing/suit/toggle/lawyer
- name = "blue suit jacket"
- desc = "A snappy dress jacket."
+ name = "blue formal suit jacket"
+ desc = "A professional suit jacket."
icon_state = "suitjacket_blue"
icon = 'icons/obj/clothing/suits/jacket.dmi'
worn_icon = 'icons/mob/clothing/suits/jacket.dmi'
@@ -184,17 +196,24 @@
species_exception = list(/datum/species/golem)
/obj/item/clothing/suit/toggle/lawyer/purple
- name = "purple suit jacket"
- desc = "A foppish dress jacket."
+ name = "purple formal suit jacket"
icon_state = "suitjacket_purp"
inhand_icon_state = null
/obj/item/clothing/suit/toggle/lawyer/black
- name = "black suit jacket"
- desc = "A professional suit jacket."
+ name = "black formal suit jacket"
icon_state = "suitjacket_black"
inhand_icon_state = "ro_suit"
+/obj/item/clothing/suit/toggle/lawyer/greyscale
+ name = "formal suit jacket"
+ icon_state = "jacket_lawyer"
+ inhand_icon_state = ""
+ greyscale_config = /datum/greyscale_config/jacket_lawyer
+ greyscale_config_worn = /datum/greyscale_config/jacket_lawyer/worn
+ greyscale_colors = "#ffffff"
+ flags_1 = IS_PLAYER_COLORABLE_1
+
//Mime
/obj/item/clothing/suit/toggle/suspenders
name = "suspenders"
@@ -295,7 +314,6 @@
cold_protection = CHEST|ARMS
heat_protection = CHEST|ARMS
-//Robotocist
/datum/armor/jacket_curator
melee = 25
bullet = 10
@@ -303,6 +321,7 @@
energy = 35
acid = 45
+//Robotocist
/obj/item/clothing/suit/hooded/techpriest
name = "techpriest robes"
desc = "For those who REALLY love their toasters."
diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm
index 31a691668a2..891c560e1f0 100644
--- a/code/modules/clothing/under/jobs/civilian/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian/civilian.dm
@@ -4,29 +4,12 @@
icon = 'icons/obj/clothing/under/civilian.dmi'
worn_icon = 'icons/mob/clothing/under/civilian.dmi'
-/obj/item/clothing/under/rank/civilian/bartender
- desc = "It looks like it could use some more flair."
- name = "bartender's uniform"
- icon_state = "barman"
- inhand_icon_state = "bar_suit"
- alt_covers_chest = TRUE
-
/obj/item/clothing/under/rank/civilian/bartender/purple
desc = "It looks like it has lots of flair!"
name = "purple bartender's uniform"
icon_state = "purplebartender"
can_adjust = FALSE
-/obj/item/clothing/under/rank/civilian/bartender/skirt
- name = "bartender's skirt"
- desc = "It looks like it could use some more flair."
- icon_state = "barman_skirt"
- inhand_icon_state = "bar_suit"
- body_parts_covered = CHEST|GROIN|ARMS
- dying_key = DYE_REGISTRY_JUMPSKIRT
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
/obj/item/clothing/under/rank/civilian/chaplain
desc = "It's a black jumpsuit, often worn by religious folk."
name = "chaplain's jumpsuit"
@@ -44,22 +27,6 @@
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-/obj/item/clothing/under/rank/civilian/chef
- name = "cook's suit"
- desc = "A suit which is given only to the most hardcore cooks in space."
- icon_state = "chef"
- inhand_icon_state = "chef"
- alt_covers_chest = TRUE
-
-/obj/item/clothing/under/rank/civilian/chef/skirt
- name = "cook's skirt"
- desc = "A skirt which is given only to the most hardcore cooks in space."
- icon_state = "chef_skirt"
- body_parts_covered = CHEST|GROIN|ARMS
- dying_key = DYE_REGISTRY_JUMPSKIRT
- female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-
/obj/item/clothing/under/rank/civilian/head_of_personnel
desc = "A slick uniform worn by those to earn the position of \"Head of Personnel\"."
name = "head of personnel's uniform"
@@ -142,8 +109,10 @@
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/lawyer
- desc = "Slick threads."
name = "Lawyer suit"
+ desc = "Slick threads."
+ icon = 'icons/obj/clothing/under/suits.dmi'
+ worn_icon = 'icons/mob/clothing/under/suits.dmi'
can_adjust = FALSE
/obj/item/clothing/under/rank/civilian/lawyer/dye_item(dye_color, dye_key_override)
@@ -173,8 +142,6 @@
desc = "A tacky suit perfect for a CRIMINAL lawyer!"
icon_state = "good_suit"
inhand_icon_state = "good_suit"
- icon = 'icons/obj/clothing/under/suits.dmi'
- worn_icon = 'icons/mob/clothing/under/suits.dmi'
/obj/item/clothing/under/rank/civilian/lawyer/beige/skirt
name = "good lawyer's suitskirt"
@@ -212,18 +179,21 @@
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
/obj/item/clothing/under/rank/civilian/lawyer/bluesuit
- name = "blue suit"
- desc = "A classy suit."
- icon_state = "bluesuit"
- inhand_icon_state = "b_suit"
+ name = "blue buttondown suit"
+ icon = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
+ worn_icon = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
+ icon_state = "buttondown_slacks"
+ greyscale_config = /datum/greyscale_config/buttondown_slacks
+ greyscale_config_worn = /datum/greyscale_config/buttondown_slacks/worn
+ greyscale_colors = "#EEEEEE#CBDBFC#17171B#2B65A8"
can_adjust = TRUE
alt_covers_chest = TRUE
/obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt
- name = "blue suitskirt"
- desc = "A classy suitskirt."
- icon_state = "bluesuit_skirt"
- inhand_icon_state = "b_suit"
+ name = "blue buttondown suitskirt"
+ icon_state = "buttondown_skirt"
+ greyscale_config = /datum/greyscale_config/buttondown_skirt
+ greyscale_config_worn = /datum/greyscale_config/buttondown_skirt/worn
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
@@ -247,6 +217,7 @@
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
/obj/item/clothing/under/rank/civilian/lawyer/galaxy
+ icon = 'icons/obj/clothing/under/lawyer_galaxy.dmi'
worn_icon = 'icons/mob/clothing/under/lawyer_galaxy.dmi'
can_adjust = FALSE
name = "blue galaxy suit"
diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm
index 0d33c968e56..13a4162ff3b 100644
--- a/code/modules/jobs/job_types/bartender.dm
+++ b/code/modules/jobs/job_types/bartender.dm
@@ -48,7 +48,8 @@
jobtype = /datum/job/bartender
id_trim = /datum/id_trim/job/bartender
- uniform = /obj/item/clothing/under/rank/civilian/bartender
+ neck = /obj/item/clothing/neck/bowtie
+ uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
suit = /obj/item/clothing/suit/armor/vest
backpack_contents = list(
/obj/item/storage/box/beanbag = 1,
diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm
index 66af08e4b8d..a3f03c2d9b1 100644
--- a/code/modules/jobs/job_types/cook.dm
+++ b/code/modules/jobs/job_types/cook.dm
@@ -63,7 +63,7 @@
jobtype = /datum/job/cook
id_trim = /datum/id_trim/job/cook/chef
- uniform = /obj/item/clothing/under/rank/civilian/chef
+ uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
suit = /obj/item/clothing/suit/toggle/chef
backpack_contents = list(
/obj/item/choice_beacon/ingredient = 1,
diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm
index 38e352c7ce0..de461380b54 100644
--- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm
@@ -129,7 +129,8 @@
name = "Space Bartender"
id = /obj/item/card/id/advanced
id_trim = /datum/id_trim/space_bartender
- uniform = /obj/item/clothing/under/rank/civilian/bartender
+ neck = /obj/item/clothing/neck/bowtie
+ uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
suit = /obj/item/clothing/suit/armor/vest
back = /obj/item/storage/backpack
glasses = /obj/item/clothing/glasses/sunglasses/reagent
diff --git a/code/modules/mob_spawn/ghost_roles/unused_roles.dm b/code/modules/mob_spawn/ghost_roles/unused_roles.dm
index 4473960502c..817b2154986 100644
--- a/code/modules/mob_spawn/ghost_roles/unused_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/unused_roles.dm
@@ -129,7 +129,8 @@
/datum/outfit/cryobartender
name = "Cryogenic Bartender"
- uniform = /obj/item/clothing/under/rank/civilian/bartender
+ neck = /obj/item/clothing/neck/bowtie
+ uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
suit = /obj/item/clothing/suit/armor/vest
back = /obj/item/storage/backpack
glasses = /obj/item/clothing/glasses/sunglasses/reagent
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index e88e31b678e..908dee4d5bc 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -161,6 +161,7 @@
"products" = list(
/obj/item/clothing/under/costume/buttondown/slacks/service = 1,
/obj/item/clothing/under/costume/buttondown/skirt/service = 1,
+ /obj/item/clothing/neck/bowtie = 2,
/obj/item/clothing/accessory/waistcoat = 1,
/obj/item/clothing/under/suit/waiter = 1,
/obj/item/clothing/suit/apron = 1,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 266b61fa7f3..0e6d72d4e69 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -25,6 +25,7 @@
/obj/item/clothing/neck/large_scarf/blue = 6,
/obj/item/clothing/neck/infinity_scarf = 6,
/obj/item/clothing/neck/tie = 6,
+ /obj/item/clothing/neck/bowtie = 6,
/obj/item/clothing/head/rasta = 3,
/obj/item/clothing/head/chaplain/kippah = 3,
/obj/item/clothing/head/chaplain/taqiyah/red = 3,
@@ -81,7 +82,6 @@
/obj/item/clothing/under/dress/striped = 1,
/obj/item/clothing/under/dress/sailor = 1,
/obj/item/clothing/under/dress/redeveninggown = 1,
- /obj/item/clothing/suit/apron/purple_bartender = 2,
/obj/item/clothing/under/misc/pj/blue = 2,
/obj/item/clothing/under/misc/pj/red = 2,
),
@@ -94,6 +94,7 @@
/obj/item/clothing/suit/toggle/jacket/sweater = 4,
/obj/item/clothing/suit/jacket/oversized = 4,
/obj/item/clothing/suit/jacket/fancy = 4,
+ /obj/item/clothing/suit/toggle/lawyer/greyscale = 4,
/obj/item/clothing/suit/hooded/wintercoat/custom = 2,
/obj/item/clothing/suit/hooded/wintercoat = 2,
/obj/item/clothing/under/suit/navy = 1,
@@ -116,6 +117,7 @@
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2,
/obj/item/clothing/under/rank/civilian/bartender/purple = 2,
/obj/item/clothing/suit/jacket/miljacket = 1,
+ /obj/item/clothing/suit/apron/overalls = 2,
),
),
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 49861498095..956ba8f57fb 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -283,6 +283,7 @@
/obj/item/clothing/under/rank/captain/suit/skirt = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 1,
+ /obj/item/clothing/suit/toggle/lawyer/greyscale = 1,
/obj/item/storage/backpack/satchel/explorer = 1,
/obj/item/storage/bag/books = 1,
/obj/item/radio/headset/headset_srv = 2,
@@ -350,11 +351,11 @@
/obj/item/clothing/head/hats/tophat = 2,
/obj/item/clothing/head/soft/black = 2,
/obj/item/clothing/neck/petcollar = 1,
+ /obj/item/clothing/neck/bowtie = 2,
/obj/item/clothing/under/costume/buttondown/slacks/service = 2,
- /obj/item/clothing/under/rank/civilian/bartender = 2,
+ /obj/item/clothing/under/costume/buttondown/skirt/service = 2,
/obj/item/clothing/under/rank/civilian/bartender/purple = 2,
- /obj/item/clothing/under/rank/civilian/bartender/skirt = 2,
- /obj/item/clothing/suit/apron/purple_bartender = 2,
+ /obj/item/clothing/suit/toggle/lawyer/greyscale = 1,
/obj/item/clothing/suit/armor/vest/alt = 1,
/obj/item/clothing/shoes/sneakers/black = 2,
/obj/item/storage/belt/bandolier = 1,
@@ -384,8 +385,8 @@
/obj/item/clothing/accessory/waistcoat = 2,
/obj/item/clothing/head/soft/mime = 2,
/obj/item/clothing/head/utility/chefhat = 2,
- /obj/item/clothing/under/rank/civilian/chef = 2,
- /obj/item/clothing/under/rank/civilian/chef/skirt = 2,
+ /obj/item/clothing/under/costume/buttondown/slacks/service = 2,
+ /obj/item/clothing/under/costume/buttondown/skirt/service = 2,
/obj/item/clothing/under/rank/civilian/cookjorts = 2,
/obj/item/clothing/under/suit/waiter = 2,
/obj/item/clothing/suit/apron/chef = 2,
@@ -458,9 +459,12 @@
/obj/item/clothing/under/rank/civilian/lawyer/purpsuit = 1,
/obj/item/clothing/under/rank/civilian/lawyer/purpsuit/skirt = 1,
/obj/item/clothing/suit/toggle/lawyer/purple = 1,
+ /obj/item/clothing/under/costume/buttondown/slacks/service = 1,
+ /obj/item/clothing/under/costume/buttondown/skirt/service = 1,
+ /obj/item/clothing/suit/toggle/lawyer/black = 1,
+ /obj/item/clothing/suit/toggle/lawyer/greyscale = 1,
/obj/item/clothing/under/suit/black = 1,
/obj/item/clothing/under/suit/black/skirt = 1,
- /obj/item/clothing/suit/toggle/lawyer/black = 1,
/obj/item/clothing/under/rank/civilian/lawyer/beige = 1,
/obj/item/clothing/under/rank/civilian/lawyer/beige/skirt = 1,
/obj/item/clothing/under/suit/black_really = 1,
diff --git a/icons/mob/clothing/head/utility.dmi b/icons/mob/clothing/head/utility.dmi
index 85b0b17b66b..3f3a668181c 100644
Binary files a/icons/mob/clothing/head/utility.dmi and b/icons/mob/clothing/head/utility.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index 00f2af446db..beb1aa34d59 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suits/jacket.dmi b/icons/mob/clothing/suits/jacket.dmi
index f9b7b5d31a2..7a9896096bb 100644
Binary files a/icons/mob/clothing/suits/jacket.dmi and b/icons/mob/clothing/suits/jacket.dmi differ
diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi
index 6300eb8e067..86038a5f6d5 100644
Binary files a/icons/mob/clothing/suits/utility.dmi and b/icons/mob/clothing/suits/utility.dmi differ
diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi
index 667d98b5361..7283996c3b1 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/suits.dmi b/icons/mob/clothing/under/suits.dmi
index e0981dbe580..e3800e2bd04 100644
Binary files a/icons/mob/clothing/under/suits.dmi and b/icons/mob/clothing/under/suits.dmi differ
diff --git a/icons/obj/clothing/head/utility.dmi b/icons/obj/clothing/head/utility.dmi
index 2d8f274c94e..9571b2add78 100644
Binary files a/icons/obj/clothing/head/utility.dmi and b/icons/obj/clothing/head/utility.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index 1f75bd6c12b..acd00a44889 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/clothing/suits/jacket.dmi b/icons/obj/clothing/suits/jacket.dmi
index bcde51f037e..314c96ef383 100644
Binary files a/icons/obj/clothing/suits/jacket.dmi and b/icons/obj/clothing/suits/jacket.dmi differ
diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi
index d7bb4e9bfa6..595746191d3 100644
Binary files a/icons/obj/clothing/suits/utility.dmi and b/icons/obj/clothing/suits/utility.dmi differ
diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi
index 04c37b2356e..8552c5b9660 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/lawyer_galaxy.dmi b/icons/obj/clothing/under/lawyer_galaxy.dmi
new file mode 100644
index 00000000000..88ffcf44132
Binary files /dev/null and b/icons/obj/clothing/under/lawyer_galaxy.dmi differ
diff --git a/icons/obj/clothing/under/suits.dmi b/icons/obj/clothing/under/suits.dmi
index 604e3787b24..42c79981df6 100644
Binary files a/icons/obj/clothing/under/suits.dmi and b/icons/obj/clothing/under/suits.dmi differ
diff --git a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm
index c6a8d47b037..cd1c15d216f 100644
--- a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm
+++ b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm
@@ -87,14 +87,6 @@
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
gets_cropped_on_taurs = FALSE
-/obj/item/clothing/under/rank/civilian/bartender/skirt
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
- gets_cropped_on_taurs = FALSE
-
-/obj/item/clothing/under/rank/civilian/chef/skirt
- supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
- gets_cropped_on_taurs = FALSE
-
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
gets_cropped_on_taurs = FALSE
diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm
index da4c0537db3..b3bb1e22fbc 100644
--- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm
+++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm
@@ -1,9 +1,12 @@
/obj/item/clothing/under/rank/civilian
worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi' //Anything that was in TG's civilian.dmi, should be in our civilian_digi.dmi
-/obj/item/clothing/under/rank/civilian/lawyer/beige //Some FOOL upstream has this item's worn and object icons seperate. This sucks.
+/obj/item/clothing/under/rank/civilian/lawyer // Lawyers' suits are in TG's suits.dmi
worn_icon_digi = 'modular_skyrat/master_files/icons/mob/clothing/under/suits_digi.dmi'
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit // EXCEPT THIS ONE.
+ greyscale_config_worn_digi = /datum/greyscale_config/buttondown_slacks/worn/digi
+
/obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/civilian.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi'
diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi
index 04ef955454a..7d748461858 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi and b/modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/suit.dmi b/modular_skyrat/master_files/icons/mob/clothing/suit.dmi
index 71016a61e4e..cf43274be05 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/suit.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suit.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi
index e0c28318614..a873d24de49 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi
index f759798da57..f29940e8527 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi
index 7b129cf66ab..fc9fddc928d 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/suits.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/suits.dmi
index e67fbd9e89b..aa746169deb 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/suits.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/suits.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/suits_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/suits_digi.dmi
index bf4fcd4f9f6..3202b5117c9 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/suits_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/suits_digi.dmi differ
diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm
index 23b611ff0d3..d560d196031 100644
--- a/modular_skyrat/modules/GAGS/greyscale_configs.dm
+++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm
@@ -553,18 +553,17 @@
// OVERALLS
-/datum/greyscale_config/overalls
- name = "Overalls"
- icon_file = 'modular_skyrat/modules/GAGS/icons/suit/suit.dmi'
- json_config = 'modular_skyrat/modules/GAGS/json_configs/overalls/overalls.json'
-
-/datum/greyscale_config/overalls/worn
- name = "Overalls (Worn)"
- json_config = 'modular_skyrat/modules/GAGS/json_configs/overalls/overalls_worn.json'
-
/datum/greyscale_config/overalls/worn/digi
name = "Overalls (Worn, Digi)"
- icon_file = 'modular_skyrat/modules/GAGS/icons/suit/suit_digi.dmi'
+ icon_file = 'modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi'
+
+/datum/greyscale_config/overalls/worn/vox
+ name = "Overalls (Worn, Vox)"
+ icon_file = 'modular_skyrat/master_files/icons/mob/clothing/species/vox/suit.dmi'
+
+/datum/greyscale_config/overalls/worn/better_vox
+ name = "Overalls (Worn, Better Vox)"
+ icon_file = 'modular_skyrat/modules/better_vox/icons/clothing/suit.dmi'
// URBAN COAT
@@ -698,11 +697,11 @@
icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_vox.dmi'
/datum/greyscale_config/jumpsuit/worn/better_vox
- name = "Jumpsuit (Worn) - Better Vox"
+ name = "Jumpsuit (Worn, Better Vox)"
icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi'
/datum/greyscale_config/jumpsuit/prison/worn/better_vox
- name = "Prison Jumpsuit (Worn) - Better Vox"
+ name = "Prison Jumpsuit (Worn, Better Vox)"
icon_file = 'modular_skyrat/modules/GAGS/icons/jumpsuit_better_vox.dmi'
/datum/greyscale_config/jumpsuit/worn/taur_snake
diff --git a/modular_skyrat/modules/GAGS/json_configs/overalls/overalls.json b/modular_skyrat/modules/GAGS/json_configs/overalls/overalls.json
deleted file mode 100644
index 4db3f080caa..00000000000
--- a/modular_skyrat/modules/GAGS/json_configs/overalls/overalls.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "overalls": [
- {
- "type": "icon_state",
- "icon_state": "overalls_obj",
- "blend_mode": "overlay",
- "color_ids": [ 1 ]
- }
- ]
-}
diff --git a/modular_skyrat/modules/better_vox/icons/clothing/suit.dmi b/modular_skyrat/modules/better_vox/icons/clothing/suit.dmi
index fb397dba36e..adfd1c200c5 100644
Binary files a/modular_skyrat/modules/better_vox/icons/clothing/suit.dmi and b/modular_skyrat/modules/better_vox/icons/clothing/suit.dmi differ
diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm b/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm
index a22533e2f2b..19a3bf83462 100644
--- a/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm
@@ -303,16 +303,12 @@
greyscale_config_worn_vox = /datum/greyscale_config/apron/worn/oldvox
flags_1 = IS_PLAYER_COLORABLE_1
-/obj/item/clothing/suit/apron/overalls/greyscale
- desc = "A set of overalls."
- icon_state = "overalls"
- greyscale_config = /datum/greyscale_config/overalls
- greyscale_config_worn = /datum/greyscale_config/overalls/worn
+/obj/item/clothing/suit/apron/overalls
greyscale_config_worn_digi = /datum/greyscale_config/overalls/worn/digi
- greyscale_colors = "#594032"
- flags_1 = IS_PLAYER_COLORABLE_1
+ greyscale_config_worn_better_vox = /datum/greyscale_config/overalls/worn/better_vox
+ greyscale_config_worn_vox = /datum/greyscale_config/overalls/worn/vox
-/obj/item/clothing/suit/apron/overalls/greyscale/Initialize(mapload)
+/obj/item/clothing/suit/apron/overalls/Initialize(mapload)
. = ..()
allowed += list(
/obj/item/flashlight,
@@ -331,31 +327,3 @@
/obj/item/storage/bag/construction,
/obj/item/t_scanner,
)
-
-/obj/item/clothing/suit/apron/overalls/greyscale/examine(mob/user)
- . = ..()
-
- . += span_notice("With Alt + Click you can switch this between making it overclothes or jumpsuit slot wearable.")
-
- return .
-
-/obj/item/clothing/suit/apron/overalls/greyscale/AltClick(mob/user)
- . = ..()
- if(!iscarbon(user))
- return
- var/mob/living/carbon/carbon_user = user
- if(carbon_user.get_item_by_slot(slot_flags) == src)
- to_chat(user, span_warning("You must take [src] off before adjusting it!"))
- return
- if(!user.is_holding(src))
- to_chat(user, span_warning("You must be holding [src] in order to adjust it!"))
- return
- switch(slot_flags)
- if(ITEM_SLOT_ICLOTHING)
- slot_flags = ITEM_SLOT_OCLOTHING
- to_chat(user, span_warning("You adjust [src] to let you wear it over jumpsuits."))
- return
- if(ITEM_SLOT_OCLOTHING)
- slot_flags = ITEM_SLOT_ICLOTHING
- to_chat(user, span_warning("You adjust [src] to let you wear it as a jumpsuit."))
- return
diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm
index fe832e72297..a054c4e4ddc 100644
--- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm
+++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm
@@ -60,24 +60,28 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su
* SUITS / SUIT JACKETS
*/
+/datum/loadout_item/suit/recolorable
+ name = "Recolorable Formal Suit Jacket"
+ item_path = /obj/item/clothing/suit/toggle/lawyer/greyscale
+
/datum/loadout_item/suit/black_suit_jacket
- name = "Black Suit Jacket"
+ name = "Black Formal Suit Jacket"
item_path = /obj/item/clothing/suit/toggle/lawyer/black
/datum/loadout_item/suit/blue_suit_jacket
- name = "Blue Suit Jacket"
+ name = "Blue Formal Suit Jacket"
item_path = /obj/item/clothing/suit/toggle/lawyer
/datum/loadout_item/suit/purple_suit_jacket
- name = "Purple Suit Jacket"
+ name = "Purple Formal Suit Jacket"
item_path = /obj/item/clothing/suit/toggle/lawyer/purple
/datum/loadout_item/suit/white_suit_jacket
- name = "White Suit Jacket"
+ name = "White Formal Suit Jacket"
item_path = /obj/item/clothing/suit/toggle/lawyer/white
/datum/loadout_item/suit/suitblackbetter
- name = "Light Black Suit Jacket"
+ name = "Light Black Formal Suit Jacket"
item_path = /obj/item/clothing/suit/toggle/lawyer/black/better
/datum/loadout_item/suit/suitwhite
@@ -279,20 +283,12 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su
* MISC
*/
-/datum/loadout_item/suit/purple_apron
- name = "Purple Apron"
- item_path = /obj/item/clothing/suit/apron/purple_bartender
-
/datum/loadout_item/suit/recolorable_apron
name = "Recolorable Apron"
item_path = /obj/item/clothing/suit/apron/chef/colorable_apron
/datum/loadout_item/suit/recolorable_overalls
name = "Recolorable Overalls"
- item_path = /obj/item/clothing/suit/apron/overalls/greyscale
-
-/datum/loadout_item/suit/denim_overalls
- name = "Denim Overalls"
item_path = /obj/item/clothing/suit/apron/overalls
/datum/loadout_item/suit/redhood
diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm
index 0b630c0fff0..06c8ee402bc 100644
--- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm
+++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm
@@ -658,11 +658,11 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
item_path = /obj/item/clothing/under/rank/civilian/lawyer/black/skirt
/datum/loadout_item/under/formal/blue_suit
- name = "Blue Suit"
+ name = "Blue Buttondown Suit"
item_path = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit
/datum/loadout_item/under/formal/blue_suitskirt
- name = "Blue Suitskirt"
+ name = "Blue Buttondown Suitskirt"
item_path = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit/skirt
/datum/loadout_item/under/formal/blue_lawyer_suit