Merge pull request #1222 from SaraSayomi/Dresses

Dresses and panties for pretty girls, also apparently cloaks

modular_splurt/code/modules/client/loadout/boxers.dm

@@ -1,3 +1,62 @@
 /datum/gear/underwear/boxers/panties/panties_cow
 	name = "Cow-kini Panties"
 	path = /obj/item/clothing/underwear/briefs/panties/panties_cow
+
+/datum/gear/underwear/boxers/panties/maebari
+	name = "Maebari"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_heart
+	name = "Heart-shaped Maebari"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_heart
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_sheer
+	name = "Sheer Maebari"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_sheer
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_mini
+	name = "Mini Maebari"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_mini
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_sheer_mini
+	name = "Mini Sheer Maebari"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_sheer_mini
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_sheer_mini
+	name = "Vaginal Sheer Maebari"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_sheer_mini
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_vag_mini
+	name = "Vaginal Mini Maebari"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_vag_mini
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_vag
+	name = "Vaginal Maebari"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_vag
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_anal
+	name = "Anal Maebari"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_anal
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_vag_x
+	name = "X shaped bandaids"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_vag_x
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_vag_bandaid
+	name = "vaginal bandaid"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_vag_bandaid
+
+
+/datum/gear/underwear/boxers/panties/maebari/maebari_anal_bandaid
+	name = "anal bandaid"
+	path = /obj/item/clothing/underwear/briefs/panties/maebari/maebari_anal_bandaid

modular_splurt/code/modules/client/loadout/uniform.dm

@@ -261,3 +261,96 @@
 	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
 	restricted_roles = list("Clown")
 	restricted_desc = "Clown"
+
+// Vore station import/improvement
+
+/datum/gear/uniform/wench
+	name = "Wench's Dress"
+	path = /obj/item/clothing/under/misc/wench
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+	loadout_initial_colors = list("#ffffff", "#242424", "96710f")
+
+/datum/gear/uniform/tian_dress
+	name = "Tian Dress"
+	path = /obj/item/clothing/under/misc/tian_dress
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+	loadout_initial_colors = list("#7c1649", "#006cec")
+
+/datum/gear/uniform/vneck
+	name = "V-neck Dress"
+	path = /obj/item/clothing/under/misc/vneck
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+	loadout_initial_colors = list("#1c1c1c")
+
+/datum/gear/uniform/revealingdress
+	name = "Revealing Dress"
+	path = /obj/item/clothing/under/misc/revealingdress
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+	loadout_initial_colors = list("#211919", "#4ce2ff")
+
+/datum/gear/uniform/rippedpunk
+	name = "Ripped Punk"
+	path = /obj/item/clothing/under/misc/rippedpunk
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_GENERAL
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+	loadout_initial_colors = list("#211919", "#4ce2ff")
+
+/datum/gear/uniform/gothic
+	name = "gothic dress"
+	path = /obj/item/clothing/under/misc/gothic
+	subcategory = LOADOUT_SUBCATEGORY_UNIFORM_DRESSES
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+	loadout_initial_colors = list("#232323", "#232323", "#232323", "#232323")
+
+/datum/gear/uniform/pentagram
+	name = "pentagram dress"
+	path = /obj/item/clothing/under/misc/pentagram
+	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")

modular_splurt/code/modules/clothing/under/miscellaneous.dm

@@ -280,7 +280,7 @@
 	desc = "For those goth girls with lots of chest to show."
 	icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
 	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
-	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC|STYLE_NO_ANTHRO_ICON
 	icon_state = "pentatop"
 	item_state = "pentatop"
 	body_parts_covered = CHEST
@@ -412,3 +412,192 @@
 /obj/item/clothing/under/rank/prisoner/skirt/reskin_obj(mob/M)
 	. = ..()
 	name = "prison [current_skin] jumpskirt"
+
+// Vore station import/improvement
+
+/obj/item/clothing/under/misc/wench
+	name = "Wench's Dress"
+	desc = "A white dress styled like a Ye Old Barmaid. Saucy!"
+	icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+	icon_state = "wench"
+	item_state = "wench"
+	can_adjust = TRUE
+	alt_covers_chest = FALSE
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+	body_parts_covered = CHEST|GROIN|LEGS
+
+/obj/item/clothing/under/misc/wench/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/polychromic, list("#ffffff", "#242424", "96710f"), 3)
+	if(adjusted)
+		AddElement(/datum/element/polychromic)
+
+/obj/item/clothing/under/misc/tian_dress
+	name = "Tian Dress"
+	desc= "A simple, tight fitting purple dress."
+	icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+	icon_state = "tian_dress"
+	item_state = "tian_dress"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+	body_parts_covered = CHEST|GROIN|LEGS
+
+/obj/item/clothing/under/misc/tian_dress/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/polychromic, list("#7c1649", "#006cec"), 2)
+
+/obj/item/clothing/under/misc/vneck
+	name = "V-neck Dress"
+	desc = "A black V-neck Dress with an exaggerated neckline covered in a sheer mesh."
+	icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+	icon_state = "vneckdress"
+	item_state = "vneckdress"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+	body_parts_covered = CHEST|GROIN|LEGS
+
+/obj/item/clothing/under/misc/vneck/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/polychromic, list("#1c1c1c"), 1)
+
+/obj/item/clothing/under/misc/revealingdress
+	name = "Revealing Dress"
+	desc = "A very revealing polychromatic dress. Is this work appropriate?"
+	icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+	icon_state = "revealingdress"
+	item_state = "revealingdress"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+	body_parts_covered = CHEST|GROIN|LEGS
+
+/obj/item/clothing/under/misc/revealingdress/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/polychromic, list("#211919", "#4ce2ff"), 2)
+
+/obj/item/clothing/under/misc/rippedpunk
+	name = "ripped punk jeans"
+	desc = "Black ripped jeans and a fishnet top. How punk."
+	icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+	anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/uniform_digi.dmi'
+	icon_state = "rippedpunk"
+	item_state = "rippedpunk"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_ALL_TAURIC
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+
+/obj/item/clothing/under/misc/rippedpunk/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/polychromic, list("#211919", "#4ce2ff"), 2)
+
+/obj/item/clothing/under/misc/gothic
+	name = "gothic dress"
+	desc = "A polychromatic dress with a sheer mesh over it, tastefully old school goth."
+	icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+	icon_state = "gothic"
+	item_state = "gothic"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+	body_parts_covered = CHEST|GROIN|LEGS
+
+/obj/item/clothing/under/misc/gothic/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/polychromic, list("#232323", "#232323", "#232323", "#232323"), 4)
+
+/obj/item/clothing/under/misc/pentagram
+	name = "pentagram dress"
+	desc = "A polychromatic dress with straps over the chest in the shape of a pentagram."
+	icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi'
+	icon_state = "pentagram"
+	item_state = "pentagram"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+	body_parts_covered = CHEST|GROIN|LEGS
+
+/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)