diff --git a/code/game/objects/effects/spawners/corpsespawner.dm b/code/game/objects/effects/spawners/corpsespawner.dm index 4ba2917f817..28928065284 100644 --- a/code/game/objects/effects/spawners/corpsespawner.dm +++ b/code/game/objects/effects/spawners/corpsespawner.dm @@ -197,7 +197,8 @@ /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest/orange, /obj/item/clothing/suit/storage/hazardvest/black, - /obj/item/clothing/suit/storage/cargo_jacket/old, + /obj/item/clothing/suit/storage/cargo_jacket/black/old, + /obj/item/clothing/suit/storage/cargo_jacket/black, /obj/item/clothing/suit/storage/toggle/bomber, /obj/item/clothing/suit/storage/toggle/hoodie/black, /obj/item/clothing/suit/storage/toggle/windbreaker, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index b85e992d11e..c252633fc92 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -6,7 +6,8 @@ /obj/structure/closet/secure_closet/personal/cargotech/populate_contents() new /obj/item/clothing/under/rank/cargotech(src) - new /obj/item/clothing/suit/storage/cargo_jacket/old(src) + new /obj/item/clothing/suit/storage/cargo_jacket/black/old(src) + new /obj/item/clothing/suit/storage/cargo_jacket/black(src) new /obj/item/clothing/suit/storage/cargo_jacket(src) new /obj/item/clothing/shoes/color/black(src) new /obj/item/device/radio/headset/headset_cargo(src) diff --git a/code/modules/client/preference_setup/loadout/lists/footwear.dm b/code/modules/client/preference_setup/loadout/lists/footwear.dm index 0a821b14f53..a72e6203479 100644 --- a/code/modules/client/preference_setup/loadout/lists/footwear.dm +++ b/code/modules/client/preference_setup/loadout/lists/footwear.dm @@ -41,6 +41,7 @@ ..() var/lacey = list( "Standard" = /obj/item/clothing/shoes/reinforced, + "Leather" = /obj/item/clothing/shoes/leather, "Service" = /obj/item/clothing/shoes/reinforced/ironhammer ) gear_tweaks += new /datum/gear_tweak/path(lacey) @@ -53,10 +54,6 @@ display_name = "shoes, dress" path = /obj/item/clothing/shoes/reinforced*/ -/datum/gear/shoes/leather - display_name = "shoes, leather" - path = /obj/item/clothing/shoes/leather - /datum/gear/shoes/rainbow display_name = "shoes, rainbow" path = /obj/item/clothing/shoes/color/rainbow @@ -73,8 +70,9 @@ /datum/gear/shoes/color_presets/New() ..() var/shoes = list( - "White" = /obj/item/clothing/shoes/color/white, "Black" = /obj/item/clothing/shoes/color/black, + "White" = /obj/item/clothing/shoes/color/white, + "Grey" = /obj/item/clothing/shoes/color/grey, "Brown" = /obj/item/clothing/shoes/color/brown, "Red" = /obj/item/clothing/shoes/color/red, "Orange" = /obj/item/clothing/shoes/color/orange, diff --git a/code/modules/client/preference_setup/loadout/lists/gloves.dm b/code/modules/client/preference_setup/loadout/lists/gloves.dm index 2dcae745a5f..025349b93ff 100644 --- a/code/modules/client/preference_setup/loadout/lists/gloves.dm +++ b/code/modules/client/preference_setup/loadout/lists/gloves.dm @@ -10,6 +10,11 @@ path = /obj/item/clothing/gloves/thick cost = 3 +/datum/gear/gloves/leather + display_name = "gloves, leather" + path = /obj/item/clothing/gloves/botanic_leather + cost = 3 + /datum/gear/gloves/rainbow display_name = "gloves, rainbow" path = /obj/item/clothing/gloves/color/rainbow diff --git a/code/modules/client/preference_setup/loadout/lists/suits.dm b/code/modules/client/preference_setup/loadout/lists/suits.dm index e5874e858c5..aae61f2a909 100644 --- a/code/modules/client/preference_setup/loadout/lists/suits.dm +++ b/code/modules/client/preference_setup/loadout/lists/suits.dm @@ -133,3 +133,14 @@ /datum/gear/suit/bomj display_name = "bomj coat" path = /obj/item/clothing/suit/storage/bomj + +/datum/gear/suit/guild/black + display_name = "black guild coat" + path = /obj/item/clothing/suit/storage/cargo_jacket/black + allowed_roles = list(JOBS_CARGO) + +/datum/gear/suit/guild/black/old + display_name = "old black guild coat" + path = /obj/item/clothing/suit/storage/cargo_jacket/black/old + allowed_roles = list(JOBS_CARGO) + diff --git a/code/modules/client/preference_setup/loadout/lists/uniforms.dm b/code/modules/client/preference_setup/loadout/lists/uniforms.dm index dd1e7aa5721..05ee1c3ae65 100644 --- a/code/modules/client/preference_setup/loadout/lists/uniforms.dm +++ b/code/modules/client/preference_setup/loadout/lists/uniforms.dm @@ -1,13 +1,9 @@ // Uniform slot /datum/gear/uniform - display_name = "blazer, blue" - path = /obj/item/clothing/under/blazer - slot = slot_w_uniform - sort_category = "Uniforms and Casual Dress" - -/datum/gear/uniform/kilt display_name = "kilt" path = /obj/item/clothing/under/kilt + slot = slot_w_uniform + sort_category = "Uniforms and Casual Dress" /datum/gear/uniform/jumpsuit/rainbow display_name = "jumpsuit, rainbow" @@ -25,6 +21,10 @@ "White" = /obj/item/clothing/under/color/white, "Grey" = /obj/item/clothing/under/color/grey, "Orange" = /obj/item/clothing/under/color/orange, + "Blue" = /obj/item/clothing/under/color/blue, + "Yellow" = /obj/item/clothing/under/color/yellow, + "Red" = /obj/item/clothing/under/color/red, + "Janitor" = /obj/item/clothing/under/rank/janitor, "Crewman" = /obj/item/clothing/under/rank/crewman ) gear_tweaks += new /datum/gear_tweak/path(jumpsuit) @@ -34,6 +34,14 @@ flags = GEAR_HAS_COLOR_SELECTION path = /obj/item/clothing/under/color/white +/datum/gear/uniform/hydroponics + display_name = "hydroponist uniform" + path = /obj/item/clothing/under/rank/hydroponics + +/datum/gear/uniform/virology + display_name = "virologist uniform" + path = /obj/item/clothing/under/rank/virologist + /datum/gear/uniform/leisure display_name = "leisure suits" path = /obj/item/clothing/under/leisure @@ -44,7 +52,8 @@ "Brown Jacket" = /obj/item/clothing/under/leisure, "White Blazer" = /obj/item/clothing/under/leisure/white, "Patterned Pullover" = /obj/item/clothing/under/leisure/pullover, - "Business Casual" = /obj/item/clothing/under/leisure/joe + "Business Casual, blue" = /obj/item/clothing/under/leisure/casual/blue, + "Business Casual, red" = /obj/item/clothing/under/leisure/joe ) gear_tweaks += new /datum/gear_tweak/path(leisure) @@ -175,6 +184,7 @@ "ash" = /obj/item/clothing/under/grey, "charcoal" = /obj/item/clothing/under/black, "black formal" = /obj/item/clothing/under/tuxedo, + "tailcoat" = /obj/item/clothing/under/blazer, "tuxedo" = /obj/item/clothing/under/assistantformal ) gear_tweaks += new /datum/gear_tweak/path(suits) diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 8a33cc66fb5..ea422902c55 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -60,6 +60,7 @@ name = "black cap" initial_name = "black cap" desc = "A simple baseball cap in a tasteful black color." + icon_state = "blacksoft" /obj/item/clothing/head/soft/orange name = "orange cap" diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 6f9534b6cbf..6793303dcb9 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -14,6 +14,10 @@ name = "black shoes" icon_state = "black" +/obj/item/clothing/shoes/color/grey + name = "grey shoes" + icon_state = "grey" + /obj/item/clothing/shoes/color/white name = "white shoes" icon_state = "white" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index c38593ab193..fc14e3be92b 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -41,7 +41,7 @@ //Guild Technician /obj/item/clothing/suit/storage/cargo_jacket name = "guild technician jacket" - desc = "Stylish jacket lined with pockets. It seems to have a little protection from physical harm." + desc = "An orange and grey jacket, a hybrid of a hazard vest and a proper jacket." icon_state = "cargo_jacket" item_state = "cargo_jacket" blood_overlay_type = "coat" @@ -56,11 +56,11 @@ rad = 0 ) -/obj/item/clothing/suit/storage/cargo_jacket/old +/obj/item/clothing/suit/storage/cargo_jacket/black name = "black guild technician jacket" - desc = "Stylish jacket lined with pockets. It seems to have a little protection from physical harm. This one is done in dark black color." - icon_state = "cargo_jacket_old" - item_state = "cargo_jacket_old" + desc = "A black stylish jacket. Used by guild technicians." + icon_state = "cargo_jacket_black" + item_state = "cargo_jacket_black" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS style_coverage = COVERS_TORSO|COVERS_UPPER_ARMS @@ -73,10 +73,16 @@ rad = 0 ) +/obj/item/clothing/suit/storage/cargo_jacket/black/old + name = "old guild technician jacket" + desc = "An older version of the guild tech coat, still used occasionally." + icon_state = "cargo_jacket_old" + item_state = "cargo_jacket_old" + //Merchant /obj/item/clothing/suit/storage/qm_coat name = "guild merchant coat" - desc = "An ideal choice for a smuggler. This coat seems have good impact resistance, and is made from resistant and expensive materials." + desc = "A grungy brown coat, perfect for a smuggler." icon_state = "qm_coat" item_state = "qm_coat" blood_overlay_type = "coat" @@ -91,6 +97,12 @@ ) siemens_coefficient = 0.8 +/*/obj/item/clothing/suit/storage/qm_coat/old + name = "old brown guild coat" + desc = "One of the old merchant coat designs, passed down to technicians after it fell out of fashion." + icon_state = "qm_coat_old" + item_state = "qm_coat_old"*/ + //Botanist /obj/item/clothing/suit/apron name = "apron" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 989e9dd7d4e..e747ef32bc9 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -25,8 +25,8 @@ item_state = "b_suit" /obj/item/clothing/under/rank/cargotech - name = "cargo worker's jumpsuit" - desc = "A pair of jeans and turtleneck worn by the cargo workers." + desc = "A pair of jeans and turtleneck worn by the guild workers." + name = "guild worker's uniform" icon_state = "cargotech" item_state = "lb_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS @@ -88,14 +88,14 @@ item_state = "b_suit" /obj/item/clothing/under/rank/hydroponics - desc = "A jumpsuit designed to protect against minor plant-related hazards." + desc = "A jumpsuit from the Bradhaanata Agroponics 'Farm Yourself' kit." name = "botanist's jumpsuit" icon_state = "hydroponics" item_state = "g_suit" permeability_coefficient = 0.50 /obj/item/clothing/under/rank/janitor - desc = "It's the official uniform of the ship's janitor." + desc = "An ancient janitorial jumpsuit." name = "janitor's jumpsuit" icon_state = "janitor" item_state = "janitor" diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index e3903d3ddec..836f0eece63 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -64,8 +64,8 @@ ) /obj/item/clothing/under/rank/virologist - desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." - name = "moebius virologist's jumpsuit" + desc = "An old green shirt and khakis, originally worn by the Moebius Virology Division, now it is discarded in maintenance after their disbandment." + name = "moebius virologist's uniform" icon_state = "virology" item_state = "w_suit" permeability_coefficient = 0.50 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a5097637610..383a27d87df 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -157,8 +157,8 @@ /obj/item/clothing/under/blazer - name = "blue blazer" - desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie." + name = "black tailcoat" + desc = "A bold, yet conservative outfit; red slacks and almost Victorian style tailcoat." icon_state = "blue_blazer" item_state = "blue_blazer" @@ -210,6 +210,12 @@ obj/item/clothing/under/leisure/pullover icon_state = "joe" item_state = "joe" +/obj/item/clothing/under/leisure/casual/blue + name = "blue casual suit" + desc = "An qqua colored casual suit for office workers." + icon_state = "business_blue" + item_state = "business_blue" + obj/item/clothing/under/neon name = "green neon tracksuit" desc = "A tracksuit lined with green neon fibers. Slightly luminescent." diff --git a/icons/inventory/feet/icon.dmi b/icons/inventory/feet/icon.dmi index cade04eaedd..362a5c9ed90 100644 Binary files a/icons/inventory/feet/icon.dmi and b/icons/inventory/feet/icon.dmi differ diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi index b34ad28d3fe..fd52246b154 100644 Binary files a/icons/inventory/feet/mob.dmi and b/icons/inventory/feet/mob.dmi differ diff --git a/icons/inventory/hands/icon.dmi b/icons/inventory/hands/icon.dmi index d3241631623..a2c0c188e9f 100644 Binary files a/icons/inventory/hands/icon.dmi and b/icons/inventory/hands/icon.dmi differ diff --git a/icons/inventory/hands/mob.dmi b/icons/inventory/hands/mob.dmi index b829dcb2a74..1a45b32ef12 100644 Binary files a/icons/inventory/hands/mob.dmi and b/icons/inventory/hands/mob.dmi differ diff --git a/icons/inventory/suit/icon.dmi b/icons/inventory/suit/icon.dmi index b554cb79065..11d463fbf0c 100644 Binary files a/icons/inventory/suit/icon.dmi and b/icons/inventory/suit/icon.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 79a271c9f1d..05a7ddb7128 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/suit/mob_fem.dmi b/icons/inventory/suit/mob_fem.dmi index f3e71fa0ec9..33a6c16bdd5 100644 Binary files a/icons/inventory/suit/mob_fem.dmi and b/icons/inventory/suit/mob_fem.dmi differ diff --git a/icons/inventory/uniform/icon.dmi b/icons/inventory/uniform/icon.dmi index 42d94c737a9..7ab70f7fd76 100644 Binary files a/icons/inventory/uniform/icon.dmi and b/icons/inventory/uniform/icon.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index 077ef450330..4d1376bee8d 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ diff --git a/icons/inventory/uniform/mob_fem.dmi b/icons/inventory/uniform/mob_fem.dmi index b8564b5884e..32cd605b294 100644 Binary files a/icons/inventory/uniform/mob_fem.dmi and b/icons/inventory/uniform/mob_fem.dmi differ