Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
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 modified icons/map_icons/clothing/head/_head.dmi
Binary file not shown.
Binary file modified icons/map_icons/clothing/suit/_suit.dmi
Binary file not shown.
Binary file modified icons/map_icons/clothing/under/dress.dmi
Binary file not shown.
Binary file added modular_iris/icons/mob/clothing/accessories.dmi
Binary file not shown.
Binary file added modular_iris/icons/mob/clothing/head/head.dmi
Binary file not shown.
Binary file added modular_iris/icons/mob/clothing/suits/jacket.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/head/head.dmi
Binary file not shown.
Binary file added modular_iris/icons/obj/clothing/suits/jacket.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.
54 changes: 54 additions & 0 deletions modular_iris/modules/GAGS/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,26 @@
icon_file = 'modular_iris/modules/GAGS/icons/head/head_worn.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/head/headband_thin_worn.json'

/datum/greyscale_config/hijab
name = "Hijab"
icon_file = 'modular_iris/icons/obj/clothing/suits/jacket.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/head/hijab.json'

/datum/greyscale_config/hijab/worn
name = "Hijab (Worn)"
icon_file = 'modular_iris/modules/GAGS/icons/head/head_worn.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/head/hijab_worn.json'

/datum/greyscale_config/tudong
name = "Tudong"
icon_file = 'modular_iris/modules/GAGS/icons/head/head.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/head/tudong.json'

/datum/greyscale_config/tudong/worn
name = "Tudong (Worn)"
icon_file = 'modular_iris/modules/GAGS/icons/head/head_worn.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/head/tudong_worn.json'

/*
* EYES
*/
Expand Down Expand Up @@ -151,6 +171,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 @@ -184,6 +217,17 @@
name = "Worn Bartender's Tailcoat - Digitigrade"
icon_file = 'modular_iris/monke_ports/icons/mob/clothing/suits/jacket_digi.dmi'

//Jeogori, sprite from SweetToothArt
/datum/greyscale_config/hanbok_jeogori
name = "Hanbok Jeogori"
icon_file = 'modular_iris/icons/obj/clothing/suits/jacket.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/suits/hanbok_jeogori.json'

/datum/greyscale_config/hanbok_jeogori/worn
name = "Hanbok Jeogori (Worn)"
icon_file = 'modular_iris/icons/mob/clothing/suits/jacket.dmi'
json_config = 'modular_iris/modules/GAGS/json_configs/suits/hanbok_jeogori_worn.json'

/*
* UNDER
*/
Expand All @@ -196,6 +240,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 modified modular_iris/modules/GAGS/icons/head/head.dmi
Binary file not shown.
Binary file modified modular_iris/modules/GAGS/icons/head/head_worn.dmi
Binary file not shown.
Binary file added modular_iris/modules/GAGS/icons/suits/jacket.dmi
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 ]
}
]
}
16 changes: 16 additions & 0 deletions modular_iris/modules/GAGS/json_configs/head/hijab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hijab": [
{
"type": "icon_state",
"icon_state": "hijab_base",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "hijab_trim",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
16 changes: 16 additions & 0 deletions modular_iris/modules/GAGS/json_configs/head/hijab_worn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"hijab": [
{
"type": "icon_state",
"icon_state": "hijab_base",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "hijab_trim",
"blend_mode": "overlay",
"color_ids": [2]
}
]
}
22 changes: 22 additions & 0 deletions modular_iris/modules/GAGS/json_configs/head/tudong.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"tudong": [
{
"type": "icon_state",
"icon_state": "tudong_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "tudong_trim",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "tudong_buttons",
"blend_mode": "overlay",
"color_ids": [ 3 ]
}
]
}
22 changes: 22 additions & 0 deletions modular_iris/modules/GAGS/json_configs/head/tudong_worn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"tudong": [
{
"type": "icon_state",
"icon_state": "tudong_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "tudong_trim",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "tudong_buttons",
"blend_mode": "overlay",
"color_ids": [ 3 ]
}
]
}
22 changes: 22 additions & 0 deletions modular_iris/modules/GAGS/json_configs/suits/hanbok_jeogori.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"hanbok_jeogori": [
{
"type": "icon_state",
"icon_state": "hanbok_jeogori_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_jeogori_neck",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_jeogori_sleeve",
"blend_mode": "overlay",
"color_ids": [ 3 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"hanbok_jeogori": [
{
"type": "icon_state",
"icon_state": "hanbok_jeogori_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_jeogori_neck",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "hanbok_jeogori_sleeve",
"blend_mode": "overlay",
"color_ids": [ 3 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"hanbok_chima": [
{
"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_chima": [
{
"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

27 changes: 27 additions & 0 deletions modular_iris/modules/customization/modules/clothing/head/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,30 @@
greyscale_colors = "#FFFFFF"
greyscale_config = /datum/greyscale_config/headband_thin
greyscale_config_worn = /datum/greyscale_config/headband_thin/worn

/obj/item/clothing/head/iris/hijab
name = "Hijab"
desc = "A small, colored headband tied thin."
icon = 'icons/map_icons/clothing/head/_head.dmi'
icon_state = "/obj/item/clothing/head/iris/hijab"
post_init_icon_state = "hijab"
flags_1 = IS_PLAYER_COLORABLE_1
flags_inv = HIDEHAIR | HIDEEARS
clothing_flags = SNUG_FIT // can't be knocked off by throwing a paper hat.
greyscale_colors = "#FFFFFF#FFFFFF"
greyscale_config = /datum/greyscale_config/hijab
greyscale_config_worn = /datum/greyscale_config/hijab/worn

/obj/item/clothing/head/iris/tudong
name = "Tudong"
desc = "A small, colored headband tied thin."
icon = 'icons/map_icons/clothing/head/_head.dmi'
icon_state = "/obj/item/clothing/head/iris/tudong"
post_init_icon_state = "tudong"
flags_1 = IS_PLAYER_COLORABLE_1
flags_inv = HIDEHAIR | HIDEEARS
clothing_flags = SNUG_FIT // can't be knocked off by throwing a paper hat.
greyscale_colors = "#FFFFFF#FFFFFF#FFFFFF"
greyscale_config = /datum/greyscale_config/tudong
greyscale_config_worn = /datum/greyscale_config/tudong/worn

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/obj/item/clothing/suits/jacket/iris
icon = 'icons/map_icons/clothing/suit/_suit.dmi'
worn_icon = 'modular_iris/icons/mob/clothing/suits/jacket.dmi'
abstract_type = /obj/item/clothing/suit/jacket
allowed = list(
/obj/item/flashlight,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/toy,
/obj/item/storage/fancy/cigarettes,
/obj/item/lighter,
/obj/item/radio,
)
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
species_exception = list(/datum/species/golem)

/obj/item/clothing/suit/jacket/Initialize(mapload)
. = ..()
allowed += GLOB.personal_carry_allowed


/obj/item/clothing/suit/iris/jeogori
name = "Hanbok Jeogori"
desc = "A blazer jacket."
icon = 'icons/map_icons/clothing/suit/_suit.dmi'
icon_state = "/obj/item/clothing/suits/jacket/iris/jeogori"
post_init_icon_state = "hanbok_jeogori"
greyscale_config = /datum/greyscale_config/hanbok_jeogori
greyscale_config_worn = /datum/greyscale_config/hanbok_jeogori/worn
greyscale_colors = "#4f4287#8d84b5#9989df"
flags_1 = IS_PLAYER_COLORABLE_1
flags_inv = HIDEBELT
blood_overlay_type = "coat"
clothing_flags = parent_type::clothing_flags | CARP_STYLE_FACTOR
Loading
Loading