From 0a16c274fa2e7927f81032ca5cc87e63edc7e942 Mon Sep 17 00:00:00 2001 From: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Date: Thu, 1 Dec 2022 17:04:46 -0500 Subject: [PATCH] Adds a subtype of that coat I added that's slightly shorter (#17807) * the s * oop --- .../modules/GAGS/greyscale_configs.dm | 9 ++ .../tailored_short_jacket.json | 102 ++++++++++++++++++ .../tailored_short_jacket_worn.json | 102 ++++++++++++++++++ .../modules/clothing/suits/coats.dm | 7 ++ .../loadout_items/loadout_datum_suit.dm | 4 + 5 files changed, 224 insertions(+) create mode 100644 modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket.json create mode 100644 modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket_worn.json diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm index 9d82c7c3950..c083622d852 100644 --- a/modular_skyrat/modules/GAGS/greyscale_configs.dm +++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm @@ -626,6 +626,15 @@ name = "Tailored Jacket (Worn)" json_config = 'modular_skyrat/modules/GAGS/json_configs/suits/tailored_jacket/tailored_jacket_worn.json' +/datum/greyscale_config/tailored_short_jacket + name = "Tailored Short Jacket" + icon_file = 'modular_skyrat/modules/GAGS/icons/suit/suit.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket.json' + +/datum/greyscale_config/tailored_short_jacket/worn + name = "Tailored Short Jacket (Worn)" + json_config = 'modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket_worn.json' + /* * UNDER diff --git a/modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket.json b/modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket.json new file mode 100644 index 00000000000..5828e14317e --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket.json @@ -0,0 +1,102 @@ +{ + "tailored_jacket": [ + { + "type": "icon_state", + "icon_state": "longcoat_base_obj", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_longsleeves", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_collar", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_neckfluff_obj", + "blend_mode": "overlay", + "color_ids": [ 4 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_sidelines", + "blend_mode": "overlay", + "color_ids": [ 5 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_shoulders", + "blend_mode": "overlay", + "color_ids": [ 6 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_trim", + "blend_mode": "overlay", + "color_ids": [ 7 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_armstripes_long", + "blend_mode": "overlay", + "color_ids": [ 8 ] + } + ], + "tailored_jacket_t": [ + { + "type": "icon_state", + "icon_state": "longcoat_base_obj", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_shortsleeves", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_collar", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_neckfluff_obj", + "blend_mode": "overlay", + "color_ids": [ 4 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_sidelines", + "blend_mode": "overlay", + "color_ids": [ 5 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_shoulders", + "blend_mode": "overlay", + "color_ids": [ 6 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_trim", + "blend_mode": "overlay", + "color_ids": [ 7 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_armstripes_short", + "blend_mode": "overlay", + "color_ids": [ 8 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket_worn.json b/modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket_worn.json new file mode 100644 index 00000000000..d80a02109c3 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/suits/tailored_short_jacket/tailored_short_jacket_worn.json @@ -0,0 +1,102 @@ +{ + "tailored_jacket": [ + { + "type": "icon_state", + "icon_state": "longcoat_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_longsleeves", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_collar", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_neckfluff", + "blend_mode": "overlay", + "color_ids": [ 4 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_sidelines", + "blend_mode": "overlay", + "color_ids": [ 5 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_shoulders", + "blend_mode": "overlay", + "color_ids": [ 6 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_trim", + "blend_mode": "overlay", + "color_ids": [ 7 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_armstripes_long", + "blend_mode": "overlay", + "color_ids": [ 8 ] + } + ], + "tailored_jacket_t": [ + { + "type": "icon_state", + "icon_state": "longcoat_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_shortsleeves", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_collar", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_neckfluff", + "blend_mode": "overlay", + "color_ids": [ 4 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_sidelines", + "blend_mode": "overlay", + "color_ids": [ 5 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_shoulders", + "blend_mode": "overlay", + "color_ids": [ 6 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_trim", + "blend_mode": "overlay", + "color_ids": [ 7 ] + }, + { + "type": "icon_state", + "icon_state": "longcoat_armstripes_short", + "blend_mode": "overlay", + "color_ids": [ 8 ] + } + ] +} diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm b/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm index 42eb39298c6..d25881e1824 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/coats.dm @@ -297,3 +297,10 @@ /obj/item/clothing/suit/tailored_jacket/Initialize(mapload) . = ..() AddComponent(/datum/component/toggle_icon, "sleeves") + +/obj/item/clothing/suit/tailored_jacket/short + name = "tailored short jacket" + desc = "A jacket tailor made for... however it looks right now!" + greyscale_config = /datum/greyscale_config/tailored_short_jacket + greyscale_config_worn = /datum/greyscale_config/tailored_short_jacket/worn + greyscale_colors = "#8c8c8c#8c8c8c#8c8c8c#bf9f78#8c8c8c#8c8c8c#bf9f78#8c8c8c" 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 d8c04215c31..13eaaf13952 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -169,6 +169,10 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su name = "Recolorable Tailored Jacket" item_path = /obj/item/clothing/suit/tailored_jacket +/datum/loadout_item/suit/tailored_short_jacket + name = "Recolorable Tailored Short Jacket" + item_path = /obj/item/clothing/suit/tailored_jacket/short + /datum/loadout_item/suit/ethereal_raincoat name = "Ethereal Raincoat" item_path = /obj/item/clothing/suit/hooded/ethereal_raincoat