diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_fugitive.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_fugitive.png index dfa55d8d19ad1..5bb73c2d0c53e 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_fugitive.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_fugitive.png differ diff --git a/modular_doppler/loadout_categories/categories/shoes.dm b/modular_doppler/loadout_categories/categories/shoes.dm index 75621b6b095fa..389615c57040a 100644 --- a/modular_doppler/loadout_categories/categories/shoes.dm +++ b/modular_doppler/loadout_categories/categories/shoes.dm @@ -35,6 +35,10 @@ name = "Jackboots" item_path = /obj/item/clothing/shoes/jackboots +/datum/loadout_item/shoes/jackboots/greyscale + name = "Custom Jackboots" + item_path = /obj/item/clothing/shoes/jackboots/recolorable + /datum/loadout_item/shoes/workboots name = "Work Boots" item_path = /obj/item/clothing/shoes/workboots @@ -95,6 +99,26 @@ name = "Colonial Half-boots" item_path = /obj/item/clothing/shoes/jackboots/colonial +/datum/loadout_item/shoes/colonial_boots/greyscale + name = "Custom Colonial Half-boots" + item_path = /obj/item/clothing/shoes/jackboots/colonial/greyscale + /datum/loadout_item/shoes/frontier_boots name = "Heavy Boots" item_path = /obj/item/clothing/shoes/jackboots/frontier_colonist + +/datum/loadout_item/shoes/greyscale_laceups + name = "Custom Laceups" + item_path = /obj/item/clothing/shoes/colorable_laceups + +/datum/loadout_item/shoes/greyscale_sandals + name = "Custom Sandals" + item_path = /obj/item/clothing/shoes/colorable_sandals + +/datum/loadout_item/shoes/wraps + name = "Cloth Footwraps" + item_path = /obj/item/clothing/shoes/wraps + +/datum/loadout_item/shoes/wraps/leggy + name = "Cloth Legwraps" + item_path = /obj/item/clothing/shoes/wraps/leggy diff --git a/modular_doppler/loadout_categories/categories/undersuit.dm b/modular_doppler/loadout_categories/categories/undersuit.dm index b811519abc237..42f8f5d5cf6a6 100644 --- a/modular_doppler/loadout_categories/categories/undersuit.dm +++ b/modular_doppler/loadout_categories/categories/undersuit.dm @@ -73,6 +73,14 @@ name = "Shorts" item_path = /obj/item/clothing/under/shorts +/datum/loadout_item/undersuit/pants/shorts/shorter + name = "Short Shorts" + item_path = /obj/item/clothing/under/shorts/shorter + +/datum/loadout_item/undersuit/pants/shorts/shorter/shortest + name = "Shortest Shorts" + item_path = /obj/item/clothing/under/shorts/shorter/shortest + /datum/loadout_item/undersuit/pants/slacks name = "Slacks" item_path = /obj/item/clothing/under/pants/slacks @@ -85,6 +93,14 @@ name = "Jean Shorts" item_path = /obj/item/clothing/under/shorts/jeanshorts +/datum/loadout_item/undersuit/pants/jeans/shorts/shorter + name = "Short Jean Shorts" + item_path = /obj/item/clothing/under/shorts/shorter/jeans + +/datum/loadout_item/undersuit/pants/jeans/shorts/shorter/shortest + name = "Shortest Jean Shorts" + item_path = /obj/item/clothing/under/shorts/shorter/jeans/shortest + /datum/loadout_item/undersuit/pants/track name = "Track Pants" item_path = /obj/item/clothing/under/pants/track @@ -97,6 +113,10 @@ name = "JUNCO megacargo pants" item_path = /obj/item/clothing/under/pants/big_pants +/datum/loadout_item/undersuit/pants/skirt + name = "Simple Skirt" + item_path = /obj/item/clothing/under/shorts/shorter/skirt + /* * BUTTONDOWNS */ @@ -174,6 +194,68 @@ name = "Strapless Dress" item_path = /obj/item/clothing/under/dress/doppler/strapless +/// JAPANESE/LUNAR BREAKER + +/datum/loadout_item/undersuit/dress/qipao + name = "Qipao" + item_path = /obj/item/clothing/under/dress/doppler/qipao + +/datum/loadout_item/undersuit/dress/qipao/customtrim + name = "Qipao (Custom Trim)" + item_path = /obj/item/clothing/under/dress/doppler/qipao/customtrim + +/datum/loadout_item/undersuit/dress/cheongsam + name = "Cheongsam" + item_path = /obj/item/clothing/under/dress/doppler/cheongsam + +/datum/loadout_item/undersuit/dress/cheongsam/customtrim + name = "Cheongsam (Custom Trim)" + item_path = /obj/item/clothing/under/dress/doppler/cheongsam/customtrim + +/datum/loadout_item/undersuit/dress/yukata + name = "Basic Yukata" + item_path = /obj/item/clothing/under/dress/doppler/yukata + +/datum/loadout_item/undersuit/dress/yukata/tg + name = "Yukata" + item_path = /obj/item/clothing/under/costume/yukata + +/datum/loadout_item/undersuit/dress/yukata/tg/greyscale + name = "Custom Yukata" + item_path = /obj/item/clothing/under/costume/yukata/greyscale + +/datum/loadout_item/undersuit/dress/yukata/tg/green + name = "Aqua Yukata" + item_path = /obj/item/clothing/under/costume/yukata/green + +/datum/loadout_item/undersuit/dress/yukata/tg/green/greyscale + name = "Custom Floral Yukata" + item_path = /obj/item/clothing/under/costume/yukata/green/greyscale + +/datum/loadout_item/undersuit/dress/yukata/tg/white + name = "White Yukata" + item_path = /obj/item/clothing/under/costume/yukata/white + +/datum/loadout_item/undersuit/dress/yukata/tg/white/greyscale + name = "Custom Snowy Yukata" + item_path = /obj/item/clothing/under/costume/yukata/white/greyscale + +/datum/loadout_item/undersuit/dress/kimono + name = "Kimono" + item_path = /obj/item/clothing/under/costume/kimono + +/datum/loadout_item/undersuit/dress/kimono/greyscale + name = "Custom Kimono" + item_path = /obj/item/clothing/under/costume/kimono/greyscale + +/datum/loadout_item/undersuit/dress/kimono/red + name = "Red Kimono" + item_path = /obj/item/clothing/under/costume/kimono/red + +/datum/loadout_item/undersuit/dress/kimono/purple + name = "Purple Kimono" + item_path = /obj/item/clothing/under/costume/kimono/purple + /* * MISCELLANEOUS */ diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_shoes.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_shoes.dm new file mode 100644 index 0000000000000..0077d8383cc20 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_shoes.dm @@ -0,0 +1,55 @@ +/* \ / \/ \/ \/ / , + \ \ \/ \/ \/ \ \/ \/ / + .\ \/ \/ \/ \/ \/ / / / + *hedgehog noise* ) ' / / \/ \/ \/ \/ \/ \ \/ \ + This dm contains \ .' ) \/ \/ \/ \/ \/ \/ \ / \ + all face grayscales \ / o ) \/ \/ \/ \/ \/ \/ \// / + o'_ ',__ .' ,.,.,.,.,.,.,.,'- ' + // \\ // \\ + '' '' '' '' +*/ + +// WRAPS + +/datum/greyscale_config/legwraps + name = "Legwraps" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/wraps.json' + +/datum/greyscale_config/legwraps/worn + name = "Legwraps (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi' + +/datum/greyscale_config/legwraps/worn/digi + name = "Legwraps (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual_digi.dmi' + +// CASUAL OPTIONS + +/datum/greyscale_config/casualshoes + name = "Casual Shoes" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/casual.json' + +/datum/greyscale_config/casualshoes/worn + name = "Casual Shoes (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi' + +/datum/greyscale_config/casualshoes/worn/digi + name = "Casual Shoes (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual_digi.dmi' + +// FANCY BOOTS + +/datum/greyscale_config/boots + name = "Boots" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/boots.json' + +/datum/greyscale_config/boots/worn + name = "Boots (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi' + +/datum/greyscale_config/boots/worn/digi + name = "Boots (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual_digi.dmi' diff --git a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm index 1e7b383302aa0..b0aeed8e5c539 100644 --- a/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm +++ b/modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm @@ -130,3 +130,155 @@ /datum/greyscale_config/pentagram_dress/worn name = "Pentagram Strapped Dress (Worn)" icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi' + +/// LUNAR JAPANESE SECTION + +/datum/greyscale_config/lunar_japanese + name = "Lunar Japanese Costume" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/dresses.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese.json' + +/datum/greyscale_config/lunar_japanese/worn + name = "Lunar Japanese Costume (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi' + +/datum/greyscale_config/lunar_japanese/worn/digi + name = "Lunar Japanese Costume (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi' + +/datum/greyscale_config/lunar_japanese/bicol + name = "Bicolor Lunar Japanese Costume" + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_bicol.json' + +/datum/greyscale_config/lunar_japanese/bicol/worn + name = "Bicolor Lunar Japanese Costume (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi' + +/datum/greyscale_config/lunar_japanese/bicol/worn/digi + name = "Bicolor Lunar Japanese Costume (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi' + +/datum/greyscale_config/lunar_japanese/tricol + name = "Tricolor Lunar Japanese Costume" + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tricol.json' + +/datum/greyscale_config/lunar_japanese/tricol/worn + name = "Tricolor Lunar Japanese Costume (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi' + +/datum/greyscale_config/lunar_japanese/tricol/worn/digi + name = "Tricolor Lunar Japanese Costume (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi' + +/// GAGS-IFIED TG LUNAR JAPANESE SECTION + +/datum/greyscale_config/lunar_japanese/tg + name = "TG Lunar Japanese Costume" + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tg.json' + +/datum/greyscale_config/lunar_japanese/tg/worn + name = "TG Lunar Japanese Costume (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi' + +/datum/greyscale_config/lunar_japanese/tg/worn/digi + name = "TG Lunar Japanese Costume (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi' + +/datum/greyscale_config/lunar_japanese/tg/decorated + name = "Decorated TG Lunar Japanese Costume" + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tg_decorated.json' + +/datum/greyscale_config/lunar_japanese/tg/decorated/worn + name = "Decorated TG Lunar Japanese Costume (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi' + +/datum/greyscale_config/lunar_japanese/tg/decorated/worn/digi + name = "Decorated TG Lunar Japanese Costume (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi' + + + +///////// +//PANTS// +///////// + +/datum/greyscale_config/slacks + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi' + +/datum/greyscale_config/slacks/worn + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi' + +/datum/greyscale_config/slacks/worn/digi + name = "Slacks (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi' + +/datum/greyscale_config/shorts + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi' + +/datum/greyscale_config/shorts/worn + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi' + +/datum/greyscale_config/shorts/worn/digi + name = "Shorts (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi' + +/datum/greyscale_config/jeans + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi' + +/datum/greyscale_config/jeans/worn + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi' + +/datum/greyscale_config/jeans/worn/digi + name = "Jeans (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi' + +/datum/greyscale_config/jeanshorts + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi' + +/datum/greyscale_config/jeanshorts/worn + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi' + +/datum/greyscale_config/jeanshorts/worn/digi + name = "Jeans Shorts (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi' + +/// CUSTOM PANTS GAGSIFICATIONS + +/datum/greyscale_config/camo_pants + name = "Camo Pants" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/camo_pants.json' + +/datum/greyscale_config/camo_pants/worn + name = "Camo Pants (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi' + +/datum/greyscale_config/camo_pants/worn/digi + name = "Camo Pants (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi' + +/datum/greyscale_config/track_pants + name = "Track Pants" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/track_pants.json' + +/datum/greyscale_config/track_pants/worn + name = "Track Pants (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi' + +/datum/greyscale_config/track_pants/worn/digi + name = "Track Pants (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi' + +/datum/greyscale_config/skimpypants + name = "Skimpy Pants" + icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi' + json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/skimpypants.json' + +/datum/greyscale_config/skimpypants/worn + name = "Skimpy Pants (Worn)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi' + +/datum/greyscale_config/skimpypants/worn/digi + name = "Skimpy Pants (Worn, Digi)" + icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi' diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/boots.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/boots.json new file mode 100644 index 0000000000000..ac53d4d877ed2 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/boots.json @@ -0,0 +1,18 @@ +{ + "boots": [ + { + "type": "icon_state", + "icon_state": "boots", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ], + "boots_colonial": [ + { + "type": "icon_state", + "icon_state": "boots_colonial", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/casual.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/casual.json new file mode 100644 index 0000000000000..15a893900ef06 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/casual.json @@ -0,0 +1,18 @@ +{ + "sandals": [ + { + "type": "icon_state", + "icon_state": "sandals", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ], + "laceups": [ + { + "type": "icon_state", + "icon_state": "laceups", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/wraps.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/wraps.json new file mode 100644 index 0000000000000..d1678c032cbdc --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/shoes/wraps.json @@ -0,0 +1,18 @@ +{ + "wrap": [ + { + "type": "icon_state", + "icon_state": "wrap", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ], + "legwrap": [ + { + "type": "icon_state", + "icon_state": "legwrap", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/camo_pants.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/camo_pants.json new file mode 100644 index 0000000000000..e2bb7457b6587 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/camo_pants.json @@ -0,0 +1,27 @@ +{ + "camopants": [ + { + "type": "icon_state", + "icon_state": "camopants_camo1", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "camopants_camo2", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "camopants_camo3", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "camopants_buckle", + "blend_mode": "overlay" + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese.json new file mode 100644 index 0000000000000..0137727ec0422 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese.json @@ -0,0 +1,15 @@ +{ + "qipao": [ + { + "type": "icon_state", + "icon_state": "qipao_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "qipao_trim", + "blend_mode": "overlay" + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_bicol.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_bicol.json new file mode 100644 index 0000000000000..cf6c19cf77093 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_bicol.json @@ -0,0 +1,49 @@ +{ + "qipao": [ + { + "type": "icon_state", + "icon_state": "qipao_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "qipao_trim_recolorable", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "yukata": [ + { + "type": "icon_state", + "icon_state": "yukata_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "yukata_sash", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "cheongsam": [ + { + "type": "icon_state", + "icon_state": "cheongsam_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cheongsam_trim", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "cheongsam_pants", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tg.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tg.json new file mode 100644 index 0000000000000..20d368a76260f --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tg.json @@ -0,0 +1,42 @@ +{ + "yukata1": [ + { + "type": "icon_state", + "icon_state": "yukata_alt_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "yukata_alt_neck", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "yukata_alt_sash", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "kimono1": [ + { + "type": "icon_state", + "icon_state": "kimono_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "kimono_neck", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "kimono_sash", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tg_decorated.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tg_decorated.json new file mode 100644 index 0000000000000..fea1693f5c4bc --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tg_decorated.json @@ -0,0 +1,54 @@ +{ + "yukata2": [ + { + "type": "icon_state", + "icon_state": "yukata_alt_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "yukata_alt_neck", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "yukata_alt_sash", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "yukata_alt_petals", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } + ], + "yukata3": [ + { + "type": "icon_state", + "icon_state": "yukata_alt_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "yukata_alt_neck", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "yukata_alt_sash", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "yukata_alt_flakes", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tricol.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tricol.json new file mode 100644 index 0000000000000..450a1a7c2339f --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/lunar_japanese_tricol.json @@ -0,0 +1,22 @@ +{ + "cheongsam": [ + { + "type": "icon_state", + "icon_state": "cheongsam_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "cheongsam_trim_recolorable", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "cheongsam_pants", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/skimpypants.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/skimpypants.json new file mode 100644 index 0000000000000..0bcf29cb42978 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/skimpypants.json @@ -0,0 +1,102 @@ +{ + "skirt": [ + { + "type": "icon_state", + "icon_state": "buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "skirt", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "shortshorts": [ + { + "type": "icon_state", + "icon_state": "buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "shortshorts", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "jeanshortshorts": [ + { + "type": "icon_state", + "icon_state": "buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "jeanshortshorts", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "shortestshorts": [ + { + "type": "icon_state", + "icon_state": "buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "shortestshorts", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ], + "jeanshortestshorts": [ + { + "type": "icon_state", + "icon_state": "buckle", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "belt", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "jeanshortestshorts", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/GAGS/json_configs/under/track_pants.json b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/track_pants.json new file mode 100644 index 0000000000000..b0f3d13008c97 --- /dev/null +++ b/modular_doppler/modular_cosmetics/GAGS/json_configs/under/track_pants.json @@ -0,0 +1,21 @@ +{ + "trackpants": [ + { + "type": "icon_state", + "icon_state": "trackpants", + "blend_mode": "overlay" + }, + { + "type": "icon_state", + "icon_state": "trackpants_body", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "trackpants_stripe", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_doppler/modular_cosmetics/code/shoes/gags_shoes.dm b/modular_doppler/modular_cosmetics/code/shoes/gags_shoes.dm new file mode 100644 index 0000000000000..d43258c194da8 --- /dev/null +++ b/modular_doppler/modular_cosmetics/code/shoes/gags_shoes.dm @@ -0,0 +1,91 @@ +/obj/item/clothing/shoes/colorable_laceups + name = "laceup shoes" + desc = "These don't seem to come pre-polished, how saddening." + icon = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi' + icon_state = "laceups" + greyscale_colors = "#2b2b2b" + greyscale_config = /datum/greyscale_config/casualshoes + greyscale_config_worn = /datum/greyscale_config/casualshoes/worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/shoes/colorable_laceups/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/casualshoes/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/casualshoes/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/shoes/colorable_sandals + name = "sandals" + desc = "Rumor has it that wearing these with socks puts you on a no entry list in several sectors." + icon = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi' + icon_state = "sandals" + greyscale_colors = "#AA0000" + greyscale_config = /datum/greyscale_config/casualshoes + greyscale_config_worn = /datum/greyscale_config/casualshoes/worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/shoes/colorable_sandals/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/casualshoes/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/casualshoes/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/shoes/jackboots/recolorable + icon = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi' + icon_state = "boots" + greyscale_colors = "#2b2b2b" + greyscale_config = /datum/greyscale_config/boots + greyscale_config_worn = /datum/greyscale_config/boots/worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/shoes/jackboots/recolorable/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/boots/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/boots/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/shoes/wraps + name = "cloth foot wraps" + desc = "Simple cloth footwraps, suitable for padding the heels." + icon = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi' + icon_state = "wrap" + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi' + greyscale_config = /datum/greyscale_config/legwraps + greyscale_config_worn = /datum/greyscale_config/legwraps/worn + greyscale_colors = "#FFFFFF" + body_parts_covered = FALSE + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/shoes/wraps/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/legwraps/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/legwraps/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/shoes/wraps/leggy + name = "cloth leg wraps" + desc = "Simple cloth legwraps, for when socks aren't good enough." + icon_state = "legwrap" + +/obj/item/clothing/shoes/jackboots/colonial/greyscale + icon = 'modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi' + icon_state = "boots_colonial" + greyscale_colors = "#2b2b2b" + greyscale_config = /datum/greyscale_config/boots + greyscale_config_worn = /datum/greyscale_config/boots/worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/shoes/jackboots/colonial/greyscale/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/boots/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/boots/worn/digi + set_greyscale(colors = greyscale_colors) diff --git a/modular_doppler/modular_cosmetics/code/under/dresses.dm b/modular_doppler/modular_cosmetics/code/under/dresses.dm index 4f8ec6bea7cbd..8dcad9997279a 100644 --- a/modular_doppler/modular_cosmetics/code/under/dresses.dm +++ b/modular_doppler/modular_cosmetics/code/under/dresses.dm @@ -36,3 +36,155 @@ name = "pink tutu" desc = "A fluffy pink tutu." icon_state = "pinktutu" + + + +/* +* LUNAR AND JAPANESE CLOTHES +*/ + +/obj/item/clothing/under/dress/doppler/qipao + name = "qipao" + desc = "A qipao, traditionally worn in ancient Earth China by women during social events and lunar new years." + icon_state = "qipao" + body_parts_covered = CHEST|GROIN|LEGS + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + greyscale_colors = "#2b2b2b" + greyscale_config = /datum/greyscale_config/lunar_japanese + greyscale_config_worn = /datum/greyscale_config/lunar_japanese/worn + flags_1 = IS_PLAYER_COLORABLE_1 + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/dress/doppler/qipao/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/lunar_japanese/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/lunar_japanese/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/dress/doppler/qipao/customtrim + greyscale_colors = "#2b2b2b#ffce5b" + greyscale_config = /datum/greyscale_config/lunar_japanese/bicol + greyscale_config_worn = /datum/greyscale_config/lunar_japanese/bicol/worn + +/obj/item/clothing/under/dress/doppler/qipao/customtrim/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/lunar_japanese/bicol/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/lunar_japanese/bicol/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/dress/doppler/cheongsam + name = "cheongsam" + desc = "A cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years." + icon_state = "cheongsam" + body_parts_covered = CHEST|GROIN|LEGS + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + greyscale_colors = "#2b2b2b#353535" + greyscale_config = /datum/greyscale_config/lunar_japanese/bicol + greyscale_config_worn = /datum/greyscale_config/lunar_japanese/bicol/worn + flags_1 = IS_PLAYER_COLORABLE_1 + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/dress/doppler/cheongsam/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/lunar_japanese/bicol/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/lunar_japanese/bicol/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/dress/doppler/cheongsam/customtrim + greyscale_colors = "#2b2b2b#ffce5b#353535" + greyscale_config = /datum/greyscale_config/lunar_japanese/tricol + greyscale_config_worn = /datum/greyscale_config/lunar_japanese/tricol/worn + +/obj/item/clothing/under/dress/doppler/cheongsam/customtrim/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/lunar_japanese/tricol/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/lunar_japanese/tricol/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/dress/doppler/yukata + name = "yukata" + desc = "A traditional ancient Earth Japanese yukata, typically worn in casual settings." + icon_state = "yukata" + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + greyscale_colors = "#2b2b2b#666666" + greyscale_config = /datum/greyscale_config/lunar_japanese/bicol + greyscale_config_worn = /datum/greyscale_config/lunar_japanese/bicol/worn + flags_1 = IS_PLAYER_COLORABLE_1 + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/dress/doppler/yukata/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/lunar_japanese/bicol/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/lunar_japanese/bicol/worn/digi + set_greyscale(colors = greyscale_colors) + +/// GAGS-IFIED TG LUNAR/JAPANESE CLOTHES + +/obj/item/clothing/under/costume/yukata + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE) + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'icons/mob/clothing/under/costume.dmi', + BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi') + +/obj/item/clothing/under/costume/yukata/greyscale + flags_1 = IS_PLAYER_COLORABLE_1 + greyscale_colors = "#333333#AAAAAA#AA0000" + greyscale_config = /datum/greyscale_config/lunar_japanese/tg + greyscale_config_worn = /datum/greyscale_config/lunar_japanese/tg/worn + +/obj/item/clothing/under/costume/yukata/greyscale/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/lunar_japanese/tg/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/lunar_japanese/tg/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/costume/yukata/green/greyscale + flags_1 = IS_PLAYER_COLORABLE_1 + greyscale_colors = "#333333#AAAAAA#AA0000#AA0000" + greyscale_config = /datum/greyscale_config/lunar_japanese/tg/decorated + greyscale_config_worn = /datum/greyscale_config/lunar_japanese/tg/decorated/worn + +/obj/item/clothing/under/costume/yukata/green/greyscale/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/lunar_japanese/tg/decorated/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/lunar_japanese/tg/decorated/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/costume/yukata/white/greyscale + flags_1 = IS_PLAYER_COLORABLE_1 + greyscale_colors = "#AAAAAA#0066AA#0066AA#00AAFF" + greyscale_config = /datum/greyscale_config/lunar_japanese/tg/decorated + greyscale_config_worn = /datum/greyscale_config/lunar_japanese/tg/decorated/worn + +/obj/item/clothing/under/costume/yukata/white/greyscale/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/lunar_japanese/tg/decorated/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/lunar_japanese/tg/decorated/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/costume/kimono + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE) + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'icons/mob/clothing/under/costume.dmi', + BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi') + +/obj/item/clothing/under/costume/kimono/greyscale + flags_1 = IS_PLAYER_COLORABLE_1 + greyscale_colors = "#333333#AAAAAA#AA0000" + greyscale_config = /datum/greyscale_config/lunar_japanese/tg + greyscale_config_worn = /datum/greyscale_config/lunar_japanese/tg/worn + +/obj/item/clothing/under/costume/kimono/greyscale/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/lunar_japanese/tg/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/lunar_japanese/tg/worn/digi + set_greyscale(colors = greyscale_colors) diff --git a/modular_doppler/modular_cosmetics/code/under/pants.dm b/modular_doppler/modular_cosmetics/code/under/pants.dm new file mode 100644 index 0000000000000..b2f41d2878af5 --- /dev/null +++ b/modular_doppler/modular_cosmetics/code/under/pants.dm @@ -0,0 +1,110 @@ +/obj/item/clothing/under/pants + icon = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi' + digitigrade_greyscale_config_worn = null + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE) + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi', + BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi') + +/obj/item/clothing/under/pants/slacks/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/slacks/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/slacks/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/pants/jeans/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/jeans/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/jeans/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/pants/track + greyscale_colors = "#2b2b2b#FFFFFF" + greyscale_config = /datum/greyscale_config/track_pants + greyscale_config_worn = /datum/greyscale_config/track_pants/worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/under/pants/track/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/track_pants/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/track_pants/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/pants/camo + greyscale_colors = "#69704C#6E5B4C#343741" + greyscale_config = /datum/greyscale_config/camo_pants + greyscale_config_worn = /datum/greyscale_config/camo_pants/worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/under/pants/camo/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/camo_pants/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/camo_pants/worn/digi + set_greyscale(colors = greyscale_colors) + + + +/// SHORTS UPDATES + +/obj/item/clothing/under/shorts + icon = 'modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi' + worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi' + digitigrade_greyscale_config_worn = null + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE) + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi', + BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi') + +/obj/item/clothing/under/shorts/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/shorts/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/shorts/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/shorts/jeanshorts/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/jeanshorts/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/jeanshorts/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/shorts/shorter + name = "short shorts" + desc = "A pair of comfy shorts, cut down slim." + icon_state = "shortshorts" + greyscale_config = /datum/greyscale_config/skimpypants + greyscale_config_worn = /datum/greyscale_config/skimpypants/worn + +/obj/item/clothing/under/shorts/shorter/Initialize(mapload) + . = ..() + greyscale_config_worn_bodyshapes = list() + greyscale_config_worn_bodyshapes["[BODYSHAPE_HUMANOID]"] = /datum/greyscale_config/skimpypants/worn + greyscale_config_worn_bodyshapes["[BODYSHAPE_DIGITIGRADE]"] = /datum/greyscale_config/skimpypants/worn/digi + set_greyscale(colors = greyscale_colors) + +/obj/item/clothing/under/shorts/shorter/shortest + name = "shortest shorts" + desc = "A pair of comfy shorts, cut down to near nonexistence by some barbarian." + icon_state = "shortestshorts" + +/obj/item/clothing/under/shorts/shorter/jeans + name = "short jean shorts" + desc = "A nondescript pair of tough jean shorts, cut down slim." + icon_state = "jeanshortshorts" + greyscale_colors = "#787878#723E0E#4D7EAC" + +/obj/item/clothing/under/shorts/shorter/jeans/shortest + name = "shortest jean shorts" + desc = "A nondescript pair of tough jean shorts, cut down to near nonexistence by some barbarian." + icon_state = "jeanshortestshorts" + +/obj/item/clothing/under/shorts/shorter/skirt + name = "simple skirt" + desc = "A lone skirt, suitable to combo with your favorite getup." + icon_state = "skirt" diff --git a/modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi b/modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi new file mode 100644 index 0000000000000..6e8e908828add Binary files /dev/null and b/modular_doppler/modular_cosmetics/icons/mob/shoes/casual.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/shoes/casual_digi.dmi b/modular_doppler/modular_cosmetics/icons/mob/shoes/casual_digi.dmi new file mode 100644 index 0000000000000..20d37355da2b5 Binary files /dev/null and b/modular_doppler/modular_cosmetics/icons/mob/shoes/casual_digi.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi b/modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi index 40733fd98b75d..e627dcda36db8 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi and b/modular_doppler/modular_cosmetics/icons/mob/under/dresses.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi b/modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi new file mode 100644 index 0000000000000..802fb3832c521 Binary files /dev/null and b/modular_doppler/modular_cosmetics/icons/mob/under/dresses_digi.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi b/modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi new file mode 100644 index 0000000000000..c702f0285b51b Binary files /dev/null and b/modular_doppler/modular_cosmetics/icons/mob/under/pants.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi b/modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi new file mode 100644 index 0000000000000..c595a326f4128 Binary files /dev/null and b/modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi b/modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi new file mode 100644 index 0000000000000..3f1c995f511f7 Binary files /dev/null and b/modular_doppler/modular_cosmetics/icons/obj/shoes/casual.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/under/dresses.dmi b/modular_doppler/modular_cosmetics/icons/obj/under/dresses.dmi index 691b03879a8ac..4fbae7b8ed978 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/under/dresses.dmi and b/modular_doppler/modular_cosmetics/icons/obj/under/dresses.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi b/modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi new file mode 100644 index 0000000000000..4cc36ada5d900 Binary files /dev/null and b/modular_doppler/modular_cosmetics/icons/obj/under/pants.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 1181e94b2ed04..3bfb182427166 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6689,6 +6689,7 @@ #include "modular_doppler\modular_cosmetics\code\neck\neck.dm" #include "modular_doppler\modular_cosmetics\code\plushies\plushes.dm" #include "modular_doppler\modular_cosmetics\code\shoes\baseshoes.dm" +#include "modular_doppler\modular_cosmetics\code\shoes\gags_shoes.dm" #include "modular_doppler\modular_cosmetics\code\storage\backpacks.dm" #include "modular_doppler\modular_cosmetics\code\storage\belts.dm" #include "modular_doppler\modular_cosmetics\code\storage\rings.dm" @@ -6702,10 +6703,12 @@ #include "modular_doppler\modular_cosmetics\code\under\dresses.dm" #include "modular_doppler\modular_cosmetics\code\under\medical_extra.dm" #include "modular_doppler\modular_cosmetics\code\under\miscellania.dm" +#include "modular_doppler\modular_cosmetics\code\under\pants.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_face.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_head.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_neck.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_sets.dm" +#include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_shoes.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_storage.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_suit.dm" #include "modular_doppler\modular_cosmetics\GAGS\greyscale_configs_under.dm"