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 a2ee0402c8b..9d9dcb6c237 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -344,6 +344,17 @@ SKYRAT EDIT END */ icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi' json_config = 'code/datums/greyscale/json_configs/buttondown_shorts_worn.json' //Ditto +/datum/greyscale_config/buttondown_skirt + name = "Buttondown with Skirt" + icon_file = 'icons/obj/clothing/under/shorts_pants_shirts.dmi' + json_config = 'code/datums/greyscale/json_configs/buttondown_skirt.json' + +/datum/greyscale_config/buttondown_skirt/worn + name = "Buttondown with Skirt (Worn)" + icon_file = 'icons/mob/clothing/under/shorts_pants_shirts.dmi' + json_config = 'code/datums/greyscale/json_configs/buttondown_skirt_worn.json' + + // // SUITS // diff --git a/code/datums/greyscale/json_configs/buttondown_shorts_worn.json b/code/datums/greyscale/json_configs/buttondown_shorts_worn.json index 8c4f4daf067..2575a5d1f8f 100644 --- a/code/datums/greyscale/json_configs/buttondown_shorts_worn.json +++ b/code/datums/greyscale/json_configs/buttondown_shorts_worn.json @@ -24,5 +24,31 @@ "blend_mode": "overlay", "color_ids": [ 4 ] } + ], + "buttondown_shorts_d": [ + { + "type": "icon_state", + "icon_state": "buttondown_d", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buckle", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "belt", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "shorts", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } ] } diff --git a/code/datums/greyscale/json_configs/buttondown_skirt.json b/code/datums/greyscale/json_configs/buttondown_skirt.json new file mode 100644 index 00000000000..60d3d500f28 --- /dev/null +++ b/code/datums/greyscale/json_configs/buttondown_skirt.json @@ -0,0 +1,28 @@ +{ + "buttondown_skirt": [ + { + "type": "icon_state", + "icon_state": "buttondown", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buttondown_obj_buckle", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "buttondown_obj_belt", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "buttondown_obj_skirt", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/buttondown_skirt_worn.json b/code/datums/greyscale/json_configs/buttondown_skirt_worn.json new file mode 100644 index 00000000000..e34a900caf4 --- /dev/null +++ b/code/datums/greyscale/json_configs/buttondown_skirt_worn.json @@ -0,0 +1,54 @@ +{ + "buttondown_skirt": [ + { + "type": "icon_state", + "icon_state": "buttondown", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buckle", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "belt", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "skirt", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } + ], + "buttondown_skirt_d": [ + { + "type": "icon_state", + "icon_state": "buttondown_d", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buckle", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "belt", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "skirt", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/buttondown_slacks_worn.json b/code/datums/greyscale/json_configs/buttondown_slacks_worn.json index e92706ef5bc..149ec9fefc6 100644 --- a/code/datums/greyscale/json_configs/buttondown_slacks_worn.json +++ b/code/datums/greyscale/json_configs/buttondown_slacks_worn.json @@ -24,5 +24,31 @@ "blend_mode": "overlay", "color_ids": [ 4 ] } + ], + "buttondown_slacks_d": [ + { + "type": "icon_state", + "icon_state": "buttondown_d", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "buckle", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "belt", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "slacks", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } ] } diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 18380a92fe8..fe8edb52475 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -109,6 +109,7 @@ new /obj/item/clothing/under/rank/rnd/research_director(src) new /obj/item/clothing/under/rank/rnd/research_director/skirt(src) new /obj/item/clothing/under/rank/rnd/research_director/alt(src) + new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src) new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src) new /obj/item/clothing/suit/toggle/labcoat/skyrat/rd(src) //SKYRAT EDIT ADDITION diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 463d446c8ba..80dfd65b71f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -56,6 +56,7 @@ /obj/structure/closet/secure_closet/psychology/PopulateContents() ..() new /obj/item/clothing/under/costume/buttondown/slacks/service(src) + new /obj/item/clothing/under/costume/buttondown/skirt/service(src) new /obj/item/clothing/neck/tie/black(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/storage/backpack/medic(src) diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index de811974185..5a42d6596e6 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -265,7 +265,8 @@ icon = 'icons/obj/clothing/under/shorts_pants_shirts.dmi' worn_icon = 'icons/mob/clothing/under/shorts_pants_shirts.dmi' species_exception = list(/datum/species/golem) - can_adjust = FALSE + can_adjust = TRUE + alt_covers_chest = TRUE /obj/item/clothing/under/costume/buttondown/slacks name = "buttondown shirt with slacks" @@ -290,6 +291,21 @@ greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C" flags_1 = IS_PLAYER_COLORABLE_1 +/obj/item/clothing/under/costume/buttondown/skirt + name = "buttondown shirt with skirt" + desc = "A fancy buttondown shirt with skirt." + icon_state = "buttondown_skirt" + greyscale_config = /datum/greyscale_config/buttondown_skirt + greyscale_config_worn = /datum/greyscale_config/buttondown_skirt/worn + greyscale_colors = "#EEEEEE#EE8E2E#222227#D8D39C" + body_parts_covered = CHEST|GROIN|ARMS + flags_1 = IS_PLAYER_COLORABLE_1 + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/costume/buttondown/skirt/service //preset one to be a formal white shirt and black skirt + greyscale_colors = "#EEEEEE#CBDBFC#17171B#222227" + /obj/item/clothing/under/costume/jackbros name = "jack bros outfit" desc = "For when it's time to hee some hos." diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index 8bf31531d1f..dc5937e4e02 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -42,6 +42,17 @@ greyscale_config = /datum/greyscale_config/buttondown_slacks greyscale_config_worn = /datum/greyscale_config/buttondown_slacks/worn greyscale_colors = "#ffeeb6#c2d3da#402912#615233" + can_adjust = TRUE + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/rnd/research_director/alt/skirt + name = "research director's tan 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 + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/under/rank/rnd/research_director/turtleneck desc = "A Nanotrasen-purple turtleneck and black jeans, for a director with a superior sense of style." diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 5d6a57315a1..e88e31b678e 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -160,6 +160,7 @@ "icon" = "kitchen-set", "products" = list( /obj/item/clothing/under/costume/buttondown/slacks/service = 1, + /obj/item/clothing/under/costume/buttondown/skirt/service = 1, /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 b933a55591a..266b61fa7f3 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -69,6 +69,7 @@ /obj/item/clothing/under/shorts/jeanshorts = 5, /obj/item/clothing/under/costume/buttondown/slacks = 4, /obj/item/clothing/under/costume/buttondown/shorts = 4, + /obj/item/clothing/under/costume/buttondown/skirt = 4, /obj/item/clothing/under/dress/sundress = 2, /obj/item/clothing/under/dress/tango = 2, /obj/item/clothing/under/dress/skirt/plaid = 4, @@ -100,7 +101,8 @@ /obj/item/clothing/under/suit/burgundy = 1, /obj/item/clothing/under/suit/charcoal = 1, /obj/item/clothing/under/suit/white = 1, - /obj/item/clothing/under/costume/buttondown/slacks/service = 1, + /obj/item/clothing/under/costume/buttondown/slacks/service = 4, + /obj/item/clothing/under/costume/buttondown/skirt/service = 4, /obj/item/clothing/suit/jacket/bomber = 2, /obj/item/clothing/suit/jacket/puffer/vest = 2, /obj/item/clothing/suit/jacket/puffer = 2, diff --git a/icons/mob/clothing/under/shorts_pants_shirts.dmi b/icons/mob/clothing/under/shorts_pants_shirts.dmi index 54c0a052b6a..8a81dcf55dd 100644 Binary files a/icons/mob/clothing/under/shorts_pants_shirts.dmi and b/icons/mob/clothing/under/shorts_pants_shirts.dmi differ diff --git a/icons/obj/clothing/under/shorts_pants_shirts.dmi b/icons/obj/clothing/under/shorts_pants_shirts.dmi index 36d283dbfc4..26ffec00e19 100644 Binary files a/icons/obj/clothing/under/shorts_pants_shirts.dmi and b/icons/obj/clothing/under/shorts_pants_shirts.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts.dmi index 288355762ca..d5f3d49a366 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi index 08fc223f99b..8d0800f7eea 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_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 0b8d1091ef7..e67fbd9e89b 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 c41f7c6f783..bf4fcd4f9f6 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/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 5baa7beae07..0b630c0fff0 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 @@ -239,6 +239,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Recolorable Buttondown Shirt with Shorts" item_path = /obj/item/clothing/under/costume/buttondown/shorts +/datum/loadout_item/under/miscellaneous/buttondown_skirt + name = "Recolorable Buttondown Shirt with Skirt" + item_path = /obj/item/clothing/under/costume/buttondown/skirt + /datum/loadout_item/under/miscellaneous/vicvest name = "Recolorable Buttondown Shirt with Double-Breasted Vest" item_path = /obj/item/clothing/under/pants/skyrat/vicvest