diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index 782f8933cc1..69019e3a54e 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -123664,7 +123664,7 @@ dir = 8 }, /obj/structure/closet/cabinet, -/obj/item/clothing/suit/jacket/det_suit, +/obj/item/clothing/suit/toggle/jacket/det_trench, /obj/item/clothing/head/fedora/det_hat, /obj/item/toy/crayon/white, /turf/open/floor/wood/large, diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index f8b7d292ac2..15ba5ef894f 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -14058,7 +14058,7 @@ /area/station/command/meeting_room) "eYI" = ( /obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/suit/jacket/det_suit, +/obj/item/clothing/suit/toggle/jacket/det_trench, /obj/item/clothing/gloves/color/black, /obj/item/clothing/head/fedora/det_hat/minor, /obj/effect/decal/cleanable/dirt/dust, 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 886c6637c62..90e37470871 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -508,6 +508,24 @@ name = "Sweater (Worn)" icon_file = 'icons/mob/clothing/suits/jacket.dmi' +/datum/greyscale_config/blazer + name = "Blazer" + icon_file = 'icons/obj/clothing/suits/jacket.dmi' + json_config = 'code/datums/greyscale/json_configs/blazer.json' + +/datum/greyscale_config/blazer/worn + name = "Blazer (Worn)" + icon_file = 'icons/mob/clothing/suits/jacket.dmi' + +/datum/greyscale_config/trenchcoat + name = "Trenchcoat" + icon_file = 'icons/obj/clothing/suits/jacket.dmi' + json_config = 'code/datums/greyscale/json_configs/trenchcoat.json' + +/datum/greyscale_config/trenchcoat/worn + name = "Trenchcoat (Worn)" + icon_file = 'icons/mob/clothing/suits/jacket.dmi' + /datum/greyscale_config/jacket_oversized name = "Oversized Jacket" icon_file = 'icons/obj/clothing/suits/jacket.dmi' diff --git a/code/datums/greyscale/json_configs/blazer.json b/code/datums/greyscale/json_configs/blazer.json new file mode 100644 index 00000000000..d756f3db33e --- /dev/null +++ b/code/datums/greyscale/json_configs/blazer.json @@ -0,0 +1,10 @@ +{ + "blazer": [ + { + "type": "icon_state", + "icon_state": "blazer", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/trenchcoat.json b/code/datums/greyscale/json_configs/trenchcoat.json new file mode 100644 index 00000000000..2fbd1cc0ce6 --- /dev/null +++ b/code/datums/greyscale/json_configs/trenchcoat.json @@ -0,0 +1,18 @@ +{ + "trenchcoat": [ + { + "type": "icon_state", + "icon_state": "trenchcoat", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ], + "trenchcoat_t": [ + { + "type": "icon_state", + "icon_state": "trenchcoat_t", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/quirks/neutral_quirks/monochromatic.dm b/code/datums/quirks/neutral_quirks/monochromatic.dm index 3295ca321a8..aa84e1d7f42 100644 --- a/code/datums/quirks/neutral_quirks/monochromatic.dm +++ b/code/datums/quirks/neutral_quirks/monochromatic.dm @@ -5,8 +5,8 @@ value = 0 medical_record_text = "Patient is afflicted with almost complete color blindness." mail_goodies = list( // Noir detective wannabe + /obj/item/clothing/suit/toggle/jacket/det_trench/noir, /obj/item/clothing/suit/jacket/det_suit/noir, - /obj/item/clothing/suit/jacket/det_suit/dark, /obj/item/clothing/head/fedora/beige, /obj/item/clothing/head/fedora/white, ) diff --git a/code/modules/antagonists/spy/spy.dm b/code/modules/antagonists/spy/spy.dm index 65dba0ef2eb..4d76e075935 100644 --- a/code/modules/antagonists/spy/spy.dm +++ b/code/modules/antagonists/spy/spy.dm @@ -205,7 +205,7 @@ gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/fedora - suit = /obj/item/clothing/suit/jacket/trenchcoat + suit = /obj/item/clothing/suit/jacket/leather_trenchcoat glasses = /obj/item/clothing/glasses/osi ears = /obj/item/radio/headset diff --git a/code/modules/bitrunning/objects/clothing.dm b/code/modules/bitrunning/objects/clothing.dm index 731b7dc2cca..b523882be7c 100644 --- a/code/modules/bitrunning/objects/clothing.dm +++ b/code/modules/bitrunning/objects/clothing.dm @@ -4,8 +4,8 @@ desc = "Vintage wrap around sunglasses. Provides a little protection." icon_state = "jensenshades" -/obj/item/clothing/suit/jacket/trenchcoat - name = "trenchcoat" +/obj/item/clothing/suit/jacket/leather_trenchcoat + name = "leather trenchcoat" desc = "A long, black trenchcoat. Makes you feel like you're the one, but you're not." - icon_state = "trenchcoat" + icon_state = "leather_trenchcoat" flags_inv = HIDEBELT diff --git a/code/modules/bitrunning/orders/flair.dm b/code/modules/bitrunning/orders/flair.dm index 0b1b79b03d0..d37ab7061a5 100644 --- a/code/modules/bitrunning/orders/flair.dm +++ b/code/modules/bitrunning/orders/flair.dm @@ -32,7 +32,7 @@ cost_per_order = 1000 /datum/orderable_item/bitrunning_flair/trenchcoat - purchase_path = /obj/item/clothing/suit/jacket/trenchcoat + purchase_path = /obj/item/clothing/suit/jacket/leather_trenchcoat cost_per_order = 1000 /datum/orderable_item/bitrunning_flair/jackboots diff --git a/code/modules/bitrunning/outfits.dm b/code/modules/bitrunning/outfits.dm index afad097773c..5e9f7d12c97 100644 --- a/code/modules/bitrunning/outfits.dm +++ b/code/modules/bitrunning/outfits.dm @@ -7,7 +7,7 @@ uniform = /obj/item/clothing/under/abductor gloves = /obj/item/clothing/gloves/fingerless shoes = /obj/item/clothing/shoes/jackboots - suit = /obj/item/clothing/suit/jacket/trenchcoat + suit = /obj/item/clothing/suit/jacket/leather_trenchcoat id = /obj/item/card/id/advanced diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 3f10afb3158..60d8ab847ee 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -59,7 +59,7 @@ name = "tournament gangster" uniform = /obj/item/clothing/under/rank/security/detective - suit = /obj/item/clothing/suit/jacket/det_suit + suit = /obj/item/clothing/suit/toggle/jacket/det_trench glasses = /obj/item/clothing/glasses/thermal/monocle head = /obj/item/clothing/head/fedora/det_hat l_hand = /obj/item/gun/ballistic diff --git a/code/modules/clothing/suits/jacket.dm b/code/modules/clothing/suits/jacket.dm index 176661dbb57..15dad0e32e6 100644 --- a/code/modules/clothing/suits/jacket.dm +++ b/code/modules/clothing/suits/jacket.dm @@ -16,17 +16,53 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT species_exception = list(/datum/species/golem) +/obj/item/clothing/suit/toggle/jacket + icon = 'icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'icons/mob/clothing/suits/jacket.dmi' + allowed = list( + /obj/item/flashlight, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + /obj/item/toy, + /obj/item/storage/fancy/cigarettes, + /obj/item/lighter, + /obj/item/radio, + /obj/item/storage/belt/holster, + ) + body_parts_covered = CHEST|GROIN|ARMS + cold_protection = CHEST|GROIN|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + species_exception = list(/datum/species/golem) + /obj/item/clothing/suit/toggle/jacket/sweater name = "sweater jacket" desc = "A sweater jacket." icon_state = "sweater" - icon = 'icons/obj/clothing/suits/jacket.dmi' - worn_icon = 'icons/mob/clothing/suits/jacket.dmi' greyscale_config = /datum/greyscale_config/sweater greyscale_config_worn = /datum/greyscale_config/sweater/worn greyscale_colors = "#414344" flags_1 = IS_PLAYER_COLORABLE_1 +/obj/item/clothing/suit/toggle/jacket/trenchcoat + name = "trenchcoat" + desc = "A multi-purpose trenchcoat." + icon_state = "trenchcoat" + greyscale_config = /datum/greyscale_config/trenchcoat + greyscale_config_worn = /datum/greyscale_config/trenchcoat/worn + greyscale_colors = "#414344" + flags_1 = IS_PLAYER_COLORABLE_1 + blood_overlay_type = "coat" + flags_inv = HIDEBELT + +/obj/item/clothing/suit/jacket/blazer + name = "blazer jacket" + desc = "A blazer jacket." + icon_state = "blazer" + greyscale_config = /datum/greyscale_config/blazer + greyscale_config_worn = /datum/greyscale_config/blazer/worn + greyscale_colors = "#414344" + flags_1 = IS_PLAYER_COLORABLE_1 + /obj/item/clothing/suit/jacket/oversized name = "oversized jacket" desc = "An oversized jacket." diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 80ef39e0496..7cdde7ac96c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -115,16 +115,13 @@ ) //Detective -/obj/item/clothing/suit/jacket/det_suit - name = "trenchcoat" +/obj/item/clothing/suit/toggle/jacket/det_trench + name = "brown trenchcoat" desc = "A 18th-century multi-purpose trenchcoat. Someone who wears this means serious business." - icon_state = "detective" + icon_state = "det_trenchcoat" inhand_icon_state = "det_suit" blood_overlay_type = "coat" - body_parts_covered = CHEST|GROIN|ARMS armor_type = /datum/armor/jacket_det_suit - cold_protection = CHEST|GROIN|ARMS - heat_protection = CHEST|GROIN|ARMS flags_inv = HIDEBELT /datum/armor/jacket_det_suit @@ -134,39 +131,41 @@ energy = 35 acid = 45 +/obj/item/clothing/suit/toggle/jacket/det_trench/Initialize(mapload) + . = ..() + allowed = GLOB.detective_vest_allowed + +/obj/item/clothing/suit/toggle/jacket/det_trench/noir + name = "noir trenchcoat" + desc = "A hard-boiled private investigator's dark trenchcoat." + icon_state = "noir_trenchcoat" + inhand_icon_state = null + +/obj/item/clothing/suit/jacket/det_suit + name = "brown blazer jacket" + desc = "A suit jacket perfect for dinner dates and criminal investigations." + icon_state = "det_blazer" + armor_type = /datum/armor/jacket_det_suit + inhand_icon_state = null + /obj/item/clothing/suit/jacket/det_suit/Initialize(mapload) . = ..() allowed = GLOB.detective_vest_allowed -/obj/item/clothing/suit/jacket/det_suit/dark - name = "noir trenchcoat" - desc = "A hard-boiled private investigator's dark trenchcoat." - icon_state = "noirdet" - inhand_icon_state = null - /obj/item/clothing/suit/jacket/det_suit/noir - name = "noir suit coat" - desc = "A dapper private investigator's dark suit coat." - icon_state = "detsuit" - inhand_icon_state = null - -/obj/item/clothing/suit/jacket/det_suit/brown - name = "brown suit jacket" - desc = "A suit jacket perfect for dinner dates and criminal investigations." - icon_state = "detsuit_brown" - inhand_icon_state = null + name = "noir blazer jacket" + desc = "A dapper private investigator's dark suit jacket." + icon_state = "noir_blazer" /obj/item/clothing/suit/jacket/det_suit/kim name = "aerostatic bomber jacket" desc = "A jacket once worn by the revolutionary air brigades during the Antecentennial Revolution. There are quite a few pockets on the inside, mostly for storing notebooks and compasses." icon_state = "aerostatic_bomber_jacket" - inhand_icon_state = null /obj/item/clothing/suit/jacket/det_suit/disco name = "disco ass blazer" desc = "Looks like someone skinned this blazer off some long extinct disco-animal. It has an enigmatic white rectangle on the back and the right sleeve." icon_state = "jamrock_blazer" - inhand_icon_state = null //Engineering /obj/item/clothing/suit/hazardvest diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 2c8f7c61748..46491b38ea5 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -54,7 +54,7 @@ id_trim = /datum/id_trim/job/detective uniform = /obj/item/clothing/under/rank/security/detective - suit = /obj/item/clothing/suit/jacket/det_suit + suit = /obj/item/clothing/suit/toggle/jacket/det_trench backpack_contents = list( /obj/item/detective_scanner = 1, /obj/item/melee/baton = 1, diff --git a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm index f8a0f2f801d..1b247189a43 100644 --- a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm +++ b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm @@ -73,7 +73,7 @@ uniform = /obj/item/clothing/under/rank/security/officer/formal head = /obj/item/clothing/head/soft/veteran mask = /obj/item/cigarette/cigar - suit = /obj/item/clothing/suit/jacket/trenchcoat + suit = /obj/item/clothing/suit/jacket/leather_trenchcoat belt = /obj/item/storage/belt/holster/detective/full/ert //M1911 pistol ears = /obj/item/radio/headset/heads/hos/advisor glasses = /obj/item/clothing/glasses/eyepatch diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index 0fdc90c2f32..2fbd07d516a 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -61,7 +61,7 @@ uniform = /obj/item/clothing/under/rank/security/detective neck = /obj/item/clothing/neck/tie/detective shoes = /obj/item/clothing/shoes/sneakers/brown - suit = /obj/item/clothing/suit/jacket/det_suit + suit = /obj/item/clothing/suit/toggle/jacket/det_trench gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/fedora/det_hat mask = /obj/item/cigarette diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index df34918a5dc..9ad6ff54dfd 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -96,6 +96,8 @@ "icon" = "vest", "products" = list( /obj/item/clothing/suit/toggle/jacket/sweater = 4, + /obj/item/clothing/suit/jacket/blazer = 4, + /obj/item/clothing/suit/toggle/jacket/trenchcoat = 4, /obj/item/clothing/suit/jacket/oversized = 4, /obj/item/clothing/suit/jacket/fancy = 4, /obj/item/clothing/suit/toggle/lawyer/greyscale = 4, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index f24dc687f3e..97692eb8ba9 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -673,8 +673,8 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) /obj/item/clothing/head/fedora/det_hat = 2, /obj/item/clothing/under/rank/security/detective = 2, /obj/item/clothing/under/rank/security/detective/skirt = 2, + /obj/item/clothing/suit/toggle/jacket/det_trench = 2, /obj/item/clothing/suit/jacket/det_suit = 2, - /obj/item/clothing/suit/jacket/det_suit/brown = 2, /obj/item/clothing/shoes/sneakers/brown = 2, /obj/item/clothing/gloves/latex = 2, /obj/item/clothing/gloves/color/black = 2, @@ -683,7 +683,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) /obj/item/clothing/under/rank/security/detective/noir/skirt = 2, /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/head/fedora = 2, - /obj/item/clothing/suit/jacket/det_suit/dark = 1, + /obj/item/clothing/suit/toggle/jacket/det_trench/noir = 1, /obj/item/clothing/suit/jacket/det_suit/noir = 1, /obj/item/clothing/neck/tie/disco = 1, /obj/item/clothing/under/rank/security/detective/disco = 1, diff --git a/icons/mob/clothing/suits/jacket.dmi b/icons/mob/clothing/suits/jacket.dmi index 3cd0f0c464b..c4769456050 100644 Binary files a/icons/mob/clothing/suits/jacket.dmi and b/icons/mob/clothing/suits/jacket.dmi differ diff --git a/icons/obj/clothing/suits/jacket.dmi b/icons/obj/clothing/suits/jacket.dmi index 53d035518e7..ff06a4806b2 100644 Binary files a/icons/obj/clothing/suits/jacket.dmi and b/icons/obj/clothing/suits/jacket.dmi differ