Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified icons/map_icons/clothing/accessory.dmi
Binary file not shown.
Binary file added modular_iris/icons/mob/clothing/accessories.dmi
Binary file not shown.
Binary file modified modular_iris/icons/mob/clothing/under/dress.dmi
Binary file not shown.
Binary file modified modular_iris/icons/obj/clothing/under/dress.dmi
Binary file not shown.
Binary file modified modular_iris/master_files/icons/mob/sprite_accessory/tails.dmi
Binary file not shown.
23 changes: 23 additions & 0 deletions modular_iris/modules/GAGS/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,19 @@
icon_file = 'modular_iris/modules/GAGS/icons/chokers/spiked_choker_worn.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/neck/spike_worn.json'

/*
* ACCESSORIES
*/
/datum/greyscale_config/hanbok_goreum
name = "Hanbok Goreum"
icon_file = 'modular_iris/modules/GAGS/icons/accessories/hanbok_goreum.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/accessories/hanbok_goreum.json'

/datum/greyscale_config/hanbok_goreum/worn
name = "Hanbok Goreum (Worn)"
icon_file = 'modular_iris/modules/GAGS/icons/accessories/hanbok_goreum_worn.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/accessories/hanbok_goreum_worn.json'

/*
* SUITS
*/
Expand Down Expand Up @@ -196,6 +209,16 @@
name = "Princess Dress (Worn)"
icon_file = 'modular_iris/icons/mob/clothing/under/dress.dmi'

/datum/greyscale_config/hanbok_chima
name = "Hanbok Chima"
icon_file = 'modular_iris/icons/obj/clothing/under/dress.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/under/dresses/hanbok_chima.json'

/datum/greyscale_config/hanbok_chima/worn
name = "Hanbok Chima (Worn)"
icon_file = 'modular_iris/icons/mob/clothing/under/dress.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/under/dresses/hanbok_chima_worn.json'

/*
* SHOES
*/
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hanbok_goreum": [
{
"type": "icon_state",
"icon_state": "hanbok_goreum_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_goreum_flower",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hanbok_goreum": [
{
"type": "icon_state",
"icon_state": "hanbok_goreum_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_goreum_flower",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"hanbok_goreum": [
{
"type": "icon_state",
"icon_state": "hanbok_chima_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_chima_trim",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_chima_norigae",
"blend_mode": "overlay",
"color_ids": [ 3 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"hanbok_goreum": [
{
"type": "icon_state",
"icon_state": "hanbok_chima_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_chima_trim",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_chima_norigae",
"blend_mode": "overlay",
"color_ids": [ 3 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/obj/item/clothing/accessory/iris/goreum
icon = 'icons/map_icons/clothing/accessory.dmi'
worn_icon = 'modular_iris/icons/mob/clothing/accessories.dmi'

/obj/item/clothing/accessory/iris/goreum
name = "Hanbok Goreum"
desc = "An elegant ribbon tied to the hem of upper garments. It pairs well with the hanbok."
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/iris/goreum"
post_init_icon_state = "hanbok_goreum"
greyscale_config = /datum/greyscale_config/hanbok_goreum
greyscale_config_worn = /datum/greyscale_config/hanbok_goreum/worn
greyscale_colors = "#F5FC9C#B49EE2"
attachment_slot = NONE
flags_1 = IS_PLAYER_COLORABLE_1

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/item/clothing/under/dress/iris
icon = 'modular_iris/icons/obj/clothing/under/dress.dmi'
icon = 'icons/map_icons/clothing/under/dress.dmi'
worn_icon = 'modular_iris/icons/mob/clothing/under/dress.dmi'

/obj/item/clothing/under/dress/iris/princess
Expand All @@ -14,3 +14,25 @@
greyscale_colors = "#FFFFFF"
can_adjust = FALSE
alternate_worn_layer = UNDER_SUIT_LAYER

/obj/item/clothing/under/dress/iris/magic
name = "magical dress"
desc = "A magical dress, contrary to the name its not actually magic - It simply makes you feel magical with its beguiling style."
icon = 'icons/map_icons/clothing/under/dress.dmi'
icon_state = "/obj/item/clothing/under/dress/iris/magic"
post_init_icon_state = "magical_dress"
can_adjust = FALSE
alternate_worn_layer = UNDER_SUIT_LAYER

/obj/item/clothing/under/dress/iris/chima
name = "hanbok chima"
desc = "An elegant skirt, usually pulled high on the torso. It pairs well with the hanbok."
icon = 'icons/map_icons/clothing/under/dress.dmi'
icon_state = "/obj/item/clothing/under/dress/iris/chima"
greyscale_config = /datum/greyscale_config/hanbok_chima
greyscale_config_worn = /datum/greyscale_config/hanbok_chima/worn
post_init_icon_state = "hanbok_chima"
flags_1 = IS_PLAYER_COLORABLE_1
greyscale_colors = "#4F4287#756C9B#F5FC9C"
can_adjust = FALSE
alternate_worn_layer = UNDER_SUIT_LAYER
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,16 @@
/datum/loadout_item/under/miscellaneous/princess
name = "Recolorable Princess Dress"
item_path = /obj/item/clothing/under/dress/iris/princess

/datum/loadout_item/under/miscellaneous/magic
name = "Magical Dress"
item_path = /obj/item/clothing/under/dress/iris/magic

/datum/loadout_item/under/miscellaneous/chima
name = "Hanbok Chima"
item_path = /obj/item/clothing/under/dress/iris/chima

// ACCESSORIES
/datum/loadout_item/accessory/accessories/hanbok_goreum
name = "Hanbok Goreum"
item_path = /obj/item/clothing/accessory/iris/goreum
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7079,6 +7079,7 @@
#include "modular_iris\modules\customization\game\objects\items\plushes.dm"
#include "modular_iris\modules\customization\jobs\_job.dm"
#include "modular_iris\modules\customization\modules\client\augment\organs.dm"
#include "modular_iris\modules\customization\modules\clothing\accessories\accessory.dm"
#include "modular_iris\modules\customization\modules\clothing\head\costume.dm"
#include "modular_iris\modules\customization\modules\clothing\head\head.dm"
#include "modular_iris\modules\customization\modules\clothing\neck\chokers.dm"
Expand Down
Loading