diff --git a/modular_splurt/code/modules/client/loadout/uniform.dm b/modular_splurt/code/modules/client/loadout/uniform.dm index f4216b0ef1..01466abd17 100644 --- a/modular_splurt/code/modules/client/loadout/uniform.dm +++ b/modular_splurt/code/modules/client/loadout/uniform.dm @@ -312,3 +312,45 @@ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC loadout_initial_colors = list("#211919", "#232323") + +/datum/gear/uniform/swoop + name = "swooped dress" + path = /obj/item/clothing/under/misc/swoop + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#f2ce66", "#272525") + +/datum/gear/uniform/asym + name = "asymmetrical slit skirt" + path = /obj/item/clothing/under/misc/asym + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#8abe67", "#8abe67") + +/datum/gear/uniform/sheer + name = "sheer dress" + path = /obj/item/clothing/under/misc/sheer + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#3e769cc5") + +/datum/gear/uniform/corsetdress + name = "corset dress" + path = /obj/item/clothing/under/misc/corsetdress + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#1e1b1e", "#f6efdb", "#4b6c5a", "#d4ccb3") + +/datum/gear/uniform/miniskirt_sheer + name = "fashionable sheer miniskirt" + path = /obj/item/clothing/under/misc/miniskirt_sheer + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#0e0e0e") + +/datum/gear/uniform/miniskirt + name = "fashionable miniskirt" + path = /obj/item/clothing/under/misc/miniskirt + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC + loadout_initial_colors = list("#0e0e0e") diff --git a/modular_splurt/code/modules/clothing/under/miscellaneous.dm b/modular_splurt/code/modules/clothing/under/miscellaneous.dm index f4b9babfd7..76f7afcb30 100644 --- a/modular_splurt/code/modules/clothing/under/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/under/miscellaneous.dm @@ -517,3 +517,87 @@ /obj/item/clothing/under/misc/pentagram/ComponentInitialize() . = ..() AddElement(/datum/element/polychromic, list("#211919", "#232323"), 2) + +/obj/item/clothing/under/misc/swoop + name = "swooped dress" + desc = "A polychromatic dress that swoops to the side." + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "swoop" + item_state = "swoop" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + body_parts_covered = CHEST|GROIN|LEGS + +/obj/item/clothing/under/misc/swoop/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#f2ce66", "#272525"), 2) + +/obj/item/clothing/under/misc/asym + name = "asymmetrical slit skirt" + desc = "A futuristic uniform with asymmetrical slit skirt. Trendy!" + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "asym" + item_state = "asym" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + body_parts_covered = CHEST|GROIN|LEGS + +/obj/item/clothing/under/misc/asym/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#8abe67", "#8abe67"), 2) + +/obj/item/clothing/under/misc/sheer + name = "sheer dress" + desc = "An entirely sheer dress. Best worn with nothing underneath!" + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "sheer" + item_state = "sheer" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + body_parts_covered = CHEST|GROIN|LEGS + +/obj/item/clothing/under/misc/sheer/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#3e769cc5"), 1) + +/obj/item/clothing/under/misc/corsetdress + name = "corset dress" + desc = "A polychromatic dress with a corset, really makes the gals pop." + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "corsetdress" + item_state = "corsetdress" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + body_parts_covered = CHEST|GROIN|LEGS + +/obj/item/clothing/under/misc/corsetdress/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#1e1b1e", "#f6efdb", "#4b6c5a", "#d4ccb3"), 4) + +/obj/item/clothing/under/misc/miniskirt + name = "fashionable miniskirt" + desc = "An impractically short miniskirt allegedly making waves through the local fashion scene." + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "miniskirt" + item_state = "miniskirt" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + body_parts_covered = GROIN + +/obj/item/clothing/under/misc/miniskirt/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#0e0e0e"), 1) + +/obj/item/clothing/under/misc/miniskirt_sheer + name = "fashionable sheer miniskirt" + desc = "An impractically short miniskirt, can it even be called clothing though?" + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "miniskirt_sheer" + item_state = "miniskirt_sheer" + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON + body_parts_covered = GROIN + +/obj/item/clothing/under/misc/miniskirt_sheer/ComponentInitialize() + . = ..() + AddElement(/datum/element/polychromic, list("#0e0e0e"), 1) diff --git a/modular_splurt/code/modules/vending/clothesmate.dm b/modular_splurt/code/modules/vending/clothesmate.dm index 5e8b9ad0f6..275f7d53ca 100644 --- a/modular_splurt/code/modules/vending/clothesmate.dm +++ b/modular_splurt/code/modules/vending/clothesmate.dm @@ -40,8 +40,14 @@ /obj/item/clothing/under/misc/vneck = 3, /obj/item/clothing/under/misc/tian_dress = 3, /obj/item/clothing/under/misc/wench = 3, - /obj/item/clothing/under/misc/gothic =3, - /obj/item/clothing/under/misc/rippedpunk =3, + /obj/item/clothing/under/misc/gothic = 3, + /obj/item/clothing/under/misc/rippedpunk = 3, + /obj/item/clothing/under/misc/corsetdress = 3, + /obj/item/clothing/under/misc/sheer = 3, + /obj/item/clothing/under/misc/asym = 3, + /obj/item/clothing/under/misc/swoop = 3, + /obj/item/clothing/under/misc/miniskirt_sheer = 3, + /obj/item/clothing/under/misc/miniskirt = 3, /obj/item/clothing/wrists/armwarmer = 3, /obj/item/clothing/wrists/armwarmer/long = 3, /obj/item/clothing/wrists/armwarmer_striped = 3, diff --git a/modular_splurt/icons/mob/clothing/uniform.dmi b/modular_splurt/icons/mob/clothing/uniform.dmi index 84d8c7c288..d26fc84093 100644 Binary files a/modular_splurt/icons/mob/clothing/uniform.dmi and b/modular_splurt/icons/mob/clothing/uniform.dmi differ diff --git a/modular_splurt/icons/obj/clothing/uniforms.dmi b/modular_splurt/icons/obj/clothing/uniforms.dmi index 5a79efc09b..700183b41d 100644 Binary files a/modular_splurt/icons/obj/clothing/uniforms.dmi and b/modular_splurt/icons/obj/clothing/uniforms.dmi differ