Skip to content

Commit

Permalink
adds ballgown
Browse files Browse the repository at this point in the history
  • Loading branch information
PotatoTomahto committed Sep 3, 2024
1 parent bc21048 commit 7915477
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 0 deletions.
10 changes: 10 additions & 0 deletions code/datums/greyscale/config_types/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
24 changes: 24 additions & 0 deletions code/datums/greyscale/json_configs/ballgown.json
Original file line number Diff line number Diff line change
@@ -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 ]
}

]

}
24 changes: 24 additions & 0 deletions code/datums/greyscale/json_configs/ballgown_worn.json
Original file line number Diff line number Diff line change
@@ -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 ]
}

]

}
13 changes: 13 additions & 0 deletions code/modules/clothing/under/skirt_dress.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions code/modules/vending/autodrobe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions code/modules/vending/clothesmate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Binary file modified icons/mob/clothing/under/dress.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/dress.dmi
Binary file not shown.

0 comments on commit 7915477

Please sign in to comment.