diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index fe8edb52475..9398b675b1b 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -148,6 +148,7 @@ new /obj/item/clothing/suit/hooded/wintercoat/cargo/qm(src) new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/gloves/fingerless(src) + new /obj/item/clothing/suit/jacket/quartermaster(src) new /obj/item/clothing/head/soft(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/neck/cloak/qm(src) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 03a10a577b4..9ede713238c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -205,6 +205,27 @@ icon_state = "suitjacket_black" inhand_icon_state = "ro_suit" +// Cargo + +/obj/item/clothing/suit/toggle/cargo_tech + name = "cargo gorka" + desc = "A brown and black puffy jacket; made from synthetic fabric. Inspired by old Eastern European designs." + icon_state = "cargo_jacket" + icon = 'icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'icons/mob/clothing/suits/jacket.dmi' + inhand_icon_state = null + blood_overlay_type = "coat" + body_parts_covered = CHEST|ARMS + +// Quartermaster + +/obj/item/clothing/suit/jacket/quartermaster + name = "quatermaster's overcoat" + desc = "A luxury, brown double-breasted overcoat, made from kangaroo skin. It's gold cuffs linked are styled on the credits symbol. It makes you feel more important then you probably are." + icon_state = "qm_coat" + blood_overlay_type = "coat" + body_parts_covered = CHEST|GROIN|LEGS|ARMS + /obj/item/clothing/suit/toggle/lawyer/greyscale name = "formal suit jacket" icon_state = "jacket_lawyer" diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index d1f1ab01d90..73a1842df25 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -3,31 +3,36 @@ worn_icon = 'icons/mob/clothing/under/cargo.dmi' /obj/item/clothing/under/rank/cargo/qm - name = "quartermaster's jumpsuit" - desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." + name = "quartermaster's outfit" + desc = "A brown dress shirt, coupled with a pair of black slacks. It's specially designed to prevent back injuries caused by pushing paper." icon_state = "qm" inhand_icon_state = "lb_suit" + alt_covers_chest = FALSE /obj/item/clothing/under/rank/cargo/qm/skirt - name = "quartermaster's jumpskirt" - desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." + name = "quartermaster's skirt" + desc = "A brown dress shirt, coupled with a long pleated black skirt. It's specially designed to prevent back injuries caused by pushing paper." icon_state = "qm_skirt" inhand_icon_state = "lb_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/cargo/tech - name = "cargo technician's jumpsuit" - desc = "Shooooorts! They're comfy and easy to wear!" + name = "cargo technician's outfit" + desc = "A brown sweater and black jeans, because, honestly, who likes shorts?" icon_state = "cargotech" inhand_icon_state = "lb_suit" + +/obj/item/clothing/under/rank/cargo/tech/alt + name = "cargo technician's shorts" + desc = "I like shooooorts! They're comfy and easy to wear!" + icon_state = "cargotech_alt" + inhand_icon_state = "lb_suit" body_parts_covered = CHEST|GROIN|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION /obj/item/clothing/under/rank/cargo/tech/skirt - name = "cargo technician's jumpskirt" + name = "cargo technician's skirt" desc = "Skiiiiirts! They're comfy and easy to wear!" icon_state = "cargo_skirt" inhand_icon_state = "lb_suit" diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index a6c398feafd..dd269bc7e37 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -46,6 +46,7 @@ id_trim = /datum/id_trim/job/cargo_technician uniform = /obj/item/clothing/under/rank/cargo/tech belt = /obj/item/modular_computer/pda/cargo + suit = /obj/item/clothing/suit/toggle/cargo_tech ears = /obj/item/radio/headset/headset_cargo l_hand = /obj/item/universal_scanner diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index bc23cdc2f86..6ac1db2824b 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -46,9 +46,10 @@ id = /obj/item/card/id/advanced/silver uniform = /obj/item/clothing/under/rank/cargo/qm belt = /obj/item/modular_computer/pda/heads/quartermaster + suit = /obj/item/clothing/suit/jacket/quartermaster ears = /obj/item/radio/headset/heads/qm glasses = /obj/item/clothing/glasses/sunglasses - shoes = /obj/item/clothing/shoes/sneakers/brown + shoes = /obj/item/clothing/shoes/laceup l_hand = /obj/item/clipboard chameleon_extras = /obj/item/stamp/head/qm diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index 3ec27995181..8227cf09989 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -102,7 +102,7 @@ /obj/item/modular_computer/pda/heads/quartermaster name = "quartermaster PDA" greyscale_config = /datum/greyscale_config/tablet/stripe_thick - greyscale_colors = "#D6B328#6506CA#927444" + greyscale_colors = "#c4b787#18191e#8b4c31" inserted_item = /obj/item/pen/survival stored_paper = 20 starting_programs = list( @@ -247,7 +247,7 @@ /obj/item/modular_computer/pda/cargo name = "cargo technician PDA" - greyscale_colors = "#D6B328#6506CA" + greyscale_colors = "#8b4c31#2c2e32" stored_paper = 20 starting_programs = list( /datum/computer_file/program/shipping, @@ -258,7 +258,7 @@ /obj/item/modular_computer/pda/shaftminer name = "shaft miner PDA" greyscale_config = /datum/greyscale_config/tablet/stripe_thick - greyscale_colors = "#927444#D6B328#6C3BA1" + greyscale_colors = "#927444#8b4c31#4c202d" /** * Service diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png index ea311025f84..2742f0fb8f8 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png differ diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 86a1b7c3167..1596b4e9f0d 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -153,7 +153,9 @@ /obj/item/clothing/mask/bandana/striped/cargo = 3, /obj/item/clothing/head/soft = 3, /obj/item/clothing/under/rank/cargo/tech = 3, + /obj/item/clothing/under/rank/cargo/tech/alt = 3, /obj/item/clothing/under/rank/cargo/tech/skirt = 3, + /obj/item/clothing/suit/toggle/cargo_tech = 3, /obj/item/clothing/suit/hooded/wintercoat/cargo = 3, /obj/item/clothing/gloves/fingerless = 3, /obj/item/clothing/shoes/sneakers/black = 3, diff --git a/icons/mob/clothing/head/hats.dmi b/icons/mob/clothing/head/hats.dmi index 3676c8f5485..1806b193066 100644 Binary files a/icons/mob/clothing/head/hats.dmi and b/icons/mob/clothing/head/hats.dmi differ diff --git a/icons/mob/clothing/suits/jacket.dmi b/icons/mob/clothing/suits/jacket.dmi index 7a9896096bb..2466bcda85e 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/under/cargo.dmi b/icons/mob/clothing/under/cargo.dmi index 01b5ad6c99d..a3050f905b6 100644 Binary files a/icons/mob/clothing/under/cargo.dmi and b/icons/mob/clothing/under/cargo.dmi differ diff --git a/icons/mob/human/species/misc/digitigrade.dmi b/icons/mob/human/species/misc/digitigrade.dmi index ce246d0d8d7..e0d20013abe 100644 Binary files a/icons/mob/human/species/misc/digitigrade.dmi and b/icons/mob/human/species/misc/digitigrade.dmi differ diff --git a/icons/obj/clothing/head/hats.dmi b/icons/obj/clothing/head/hats.dmi index f420521a0aa..e8662998fd8 100644 Binary files a/icons/obj/clothing/head/hats.dmi and b/icons/obj/clothing/head/hats.dmi differ diff --git a/icons/obj/clothing/suits/jacket.dmi b/icons/obj/clothing/suits/jacket.dmi index 314c96ef383..3ac958c1c38 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/under/cargo.dmi b/icons/obj/clothing/under/cargo.dmi index 5ea90482faf..4f9fe47a3f6 100644 Binary files a/icons/obj/clothing/under/cargo.dmi and b/icons/obj/clothing/under/cargo.dmi differ diff --git a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/suit.dm b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/suit.dm index 991e1288db6..54a180753a7 100644 --- a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/suit.dm +++ b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/suit.dm @@ -119,6 +119,12 @@ /obj/item/clothing/suit/hooded/wintercoat supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON +/obj/item/clothing/suit/toggle/cargo_tech + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/suit/jacket/quartermaster + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + /** * NONE(Squash) * Clothing that does not have a digitigrade version, and thus will squash legs to fit. diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi index 64fbefeed4e..66e60c5c3c0 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/cargo.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi index 2f5d8e83baa..eaba4d79fd3 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/cargo_digi.dmi differ 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 a054c4e4ddc..c419fa1baaf 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -613,6 +613,16 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su item_path = /obj/item/clothing/suit/gorka/supply restricted_roles = list(JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_CUSTOMS_AGENT) +/datum/loadout_item/suit/cargo_gorka_jacket + name = "Cargo Gorka Jacket" + item_path = /obj/item/clothing/suit/toggle/cargo_tech + restricted_roles = list(JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_CUSTOMS_AGENT) + +/datum/loadout_item/suit/qm_jacket + name = "Quartermaster's Overcoat" + item_path = /obj/item/clothing/suit/jacket/quartermaster + restricted_roles = list(JOB_QUARTERMASTER) + // LABCOATS /datum/loadout_item/suit/labcoat_highvis name = "High-Vis Labcoat" 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 06c8ee402bc..cd486b453d1 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 @@ -573,6 +573,11 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ item_path = /obj/item/clothing/under/rank/cargo/tech/skyrat/casualman restricted_roles = list(JOB_CARGO_TECHNICIAN) +/datum/loadout_item/under/miscellaneous/cargo_shorts + name = "Cargo Tech Shorts" + item_path = /obj/item/clothing/under/rank/cargo/tech/alt + restricted_roles = list(JOB_CARGO_TECHNICIAN) + /datum/loadout_item/under/miscellaneous/cargo_black name = "Black Cargo Uniform" item_path = /obj/item/clothing/under/rank/cargo/tech/skyrat/evil