diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index d882ffbac75..3ea1edb6512 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -310,6 +310,19 @@ hanbok["male hanbok"] = /obj/item/clothing/under/konyang/male gear_tweaks += new /datum/gear_tweak/path(hanbok) +/datum/gear/uniform/miscellaneous/hanbokcolorable + display_name = "colorable hanbok selection" + description = "A selection of Konyanger formalwear." + path = /obj/item/clothing/under/konyang/male/shortsleeve + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/uniform/miscellaneous/hanbokcolorable/New() + ..() + var/list/hanbokcolorable = list() + hanbokcolorable["short sleeve hanbok"] = /obj/item/clothing/under/konyang/male/shortsleeve + hanbokcolorable["sleeveless hanbok"] = /obj/item/clothing/under/konyang/male/sleeveless + gear_tweaks += new /datum/gear_tweak/path(hanbokcolorable) + /datum/gear/uniform/konyang display_name = "konyanger dress" path = /obj/item/clothing/under/konyangdress diff --git a/code/modules/clothing/factions/konyang.dm b/code/modules/clothing/factions/konyang.dm index 56dcadd7937..352493a82fc 100644 --- a/code/modules/clothing/factions/konyang.dm +++ b/code/modules/clothing/factions/konyang.dm @@ -74,6 +74,22 @@ slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING contained_sprite = TRUE +/obj/item/clothing/under/konyang/male/sleeveless + name = "sleeveless hanbok" + icon = 'icons/clothing/under/uniforms/konyang_malehanbok_colorable.dmi' + icon_state = "hanbok_male_sleeveless_colorable" + worn_state = "hanbok_male_sleeveless_colorable" + item_state = "hanbok_male_sleeveless_colorable" + contained_sprite = TRUE + +/obj/item/clothing/under/konyang/male/shortsleeve + name = "short sleeve hanbok" + icon = 'icons/clothing/under/uniforms/konyang_malehanbok_colorable.dmi' + icon_state = "hanbok_male_shortsleeve_colorable" + worn_state = "hanbok_male_shortsleeve_colorable" + item_state = "hanbok_male_shortsleeve_colorable" + contained_sprite = TRUE + /obj/item/clothing/under/konyangdresstraditional name = "konyanger traditional dress" desc = "A traditional hakama and kosode pairing worn on Konyang, usually at formal functions or by shrine maidens. This one features a pink hakama and white kosode." diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 303242b5c8d..78158d5845e 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -509,6 +509,16 @@ Follow by example and make good judgement based on length which list to include length = 3 chatname = "long fringe" + fade_clean + name = "Fade, Clean" + icon_state = "hair_fade_clean" + chatname = "short hair" + + fade_cleanlow + name = "Fade, Clean Low" + icon_state = "hair_fade_cleanlow" + chatname = "short hair" + fade_high name = "Fade, High" icon_state = "hair_fade_high" @@ -519,6 +529,11 @@ Follow by example and make good judgement based on length which list to include icon_state = "hair_fade_low" chatname = "short hair" + fade_manbun + name = "Fade, Manbun" + icon_state = "hair_fade_manbun" + chatname = "short hair" + fade_medium name = "Fade, Medium" icon_state = "hair_fade_medium" @@ -1121,6 +1136,11 @@ Follow by example and make good judgement based on length which list to include icon_state = "hair_punk_chelseafringe" chatname = "fringe" + punk_chelseafringealt + name = "Punk Shave, Chelsea Fringe Alt" + icon_state = "hair_punk_chelseafringe_alt" + chatname = "fringe" + punk_chelseafringe_bighawk name = "Punk Shave, Chelsea Big Hawk" icon_state = "hair_punk_chelseafringe_bighawk" @@ -1307,6 +1327,12 @@ Follow by example and make good judgement based on length which list to include length = 2 chatname = "curls" + tresshoulderdouble + name = "Tress Shoulder Double" + icon_state = "hair_tressshoulder_double" + length = 2 + chatname = "curls" + trimmed name = "Trimmed" icon_state = "hair_trimmed" diff --git a/html/changelogs/niennab-hanbok.yml b/html/changelogs/niennab-hanbok.yml new file mode 100644 index 00000000000..1ef57e885d0 --- /dev/null +++ b/html/changelogs/niennab-hanbok.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Niennab + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added chelsea punk alternative, fade manbun, fade clean, clean low, and tress shoulder double hair styles." + - rscadd: "Added short sleeve and sleeveless colourable male hanboks." + - tweak: "Changes the female Hanbok as well as straight long hair and sleeze hair." diff --git a/icons/clothing/under/uniforms/konyang_malehanbok_colorable.dmi b/icons/clothing/under/uniforms/konyang_malehanbok_colorable.dmi new file mode 100644 index 00000000000..134a077b749 Binary files /dev/null and b/icons/clothing/under/uniforms/konyang_malehanbok_colorable.dmi differ diff --git a/icons/mob/human_face/hair.dmi b/icons/mob/human_face/hair.dmi index a9d8b012125..a3e695a018e 100644 Binary files a/icons/mob/human_face/hair.dmi and b/icons/mob/human_face/hair.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 0b82bf0688d..4b5b77bbe1a 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ