diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index 29c5d1eb0ff7..0f3d7631b818 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -698,6 +698,16 @@ icon_file = 'icons/mob/clothing/under/dress.dmi' json_config = 'code/datums/greyscale/json_configs/sundress_worn.json' +/datum/greyscale_config/ballgown + name = "Ballgown" + icon_file = 'icons/obj/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/ballgown.json' + +/datum/greyscale_config/ballgown_worn + name = "Worn Ballgown" + icon_file = 'icons/mob/clothing/under/dress.dmi' + json_config = 'code/datums/greyscale/json_configs/ballgown_worn.json' + /datum/greyscale_config/beanie name = "Beanie" icon_file = 'icons/obj/clothing/head/beanie.dmi' diff --git a/code/datums/greyscale/json_configs/ballgown.json b/code/datums/greyscale/json_configs/ballgown.json new file mode 100644 index 000000000000..975e138473b2 --- /dev/null +++ b/code/datums/greyscale/json_configs/ballgown.json @@ -0,0 +1,24 @@ +{ + "ballgown": [ + { + "type": "icon_state", + "icon_state": "ballgown_skirt1", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "ballgown_skirt2", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "ballgown_skirt3", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + + ] + +} diff --git a/code/datums/greyscale/json_configs/ballgown_worn.json b/code/datums/greyscale/json_configs/ballgown_worn.json new file mode 100644 index 000000000000..975e138473b2 --- /dev/null +++ b/code/datums/greyscale/json_configs/ballgown_worn.json @@ -0,0 +1,24 @@ +{ + "ballgown": [ + { + "type": "icon_state", + "icon_state": "ballgown_skirt1", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "ballgown_skirt2", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "ballgown_skirt3", + "blend_mode": "overlay", + "color_ids": [ 3 ] + } + + ] + +} diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm index 76558b3e00c4..e883b1e44b18 100644 --- a/code/modules/clothing/under/skirt_dress.dm +++ b/code/modules/clothing/under/skirt_dress.dm @@ -80,3 +80,16 @@ greyscale_config = /datum/greyscale_config/sundress greyscale_config_worn = /datum/greyscale_config/sundress_worn flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/under/dress/ballgown + name = "ballgown" + desc = "A luxurious ballgown best worn before midnight. A signature of the letters 'VA` is stitched on the hem." + icon_state = "ballgown" + custom_price = PAYCHECK_COMMAND + inhand_icon_state = null + body_parts_covered = CHEST|GROIN|LEGS + greyscale_config = /datum/greyscale_config/ballgown + greyscale_config_worn = /datum/greyscale_config/ballgown_worn + greyscale_colors = "#FFFFFF#CCECFF#FFFFFF" + flags_1 = IS_PLAYER_COLORABLE_1 + flags_inv = HIDESHOES diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 33c0f00f7eac..ff4615ae875e 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -276,6 +276,7 @@ /obj/item/clothing/under/dress/wedding_dress = 1, /obj/item/clothing/under/suit/tuxedo = 1, /obj/item/clothing/head/costume/weddingveil = 1, + /obj/item/clothing/under/dress/ballgown = 1, //MONKESTATION EDIT ADDITION /obj/item/storage/belt/fannypack/cummerbund = 1, /obj/item/clothing/suit/costume/drfreeze_coat = 1, /obj/item/clothing/under/costume/drfreeze = 1, diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 6a6bcc39f8ce..3de82c5e6ceb 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -66,6 +66,7 @@ /obj/item/clothing/under/costume/buttondown/shorts = 4, /obj/item/clothing/under/dress/sundress = 2, /obj/item/clothing/under/dress/tango = 2, + /obj/item/clothing/under/dress/ballgown = 2, //MONKESTATION EDIT ADDITION /obj/item/clothing/under/dress/skirt/plaid = 4, /obj/item/clothing/under/dress/skirt/turtleskirt = 4, /obj/item/clothing/under/misc/overalls = 2, diff --git a/icons/mob/clothing/under/dress.dmi b/icons/mob/clothing/under/dress.dmi index be6e7715c486..16d9ecbeda86 100644 Binary files a/icons/mob/clothing/under/dress.dmi and b/icons/mob/clothing/under/dress.dmi differ diff --git a/icons/obj/clothing/under/dress.dmi b/icons/obj/clothing/under/dress.dmi index d38b53746be7..a004577859f0 100644 Binary files a/icons/obj/clothing/under/dress.dmi and b/icons/obj/clothing/under/dress.dmi differ