diff --git a/aurorastation.dme b/aurorastation.dme index db584ebee6a..128ecd8dc77 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1566,6 +1566,7 @@ #include "code\modules\clothing\factions\himeo.dm" #include "code\modules\clothing\factions\idris.dm" #include "code\modules\clothing\factions\konyang.dm" +#include "code\modules\clothing\factions\newhaiphong.dm" #include "code\modules\clothing\factions\nralakk.dm" #include "code\modules\clothing\factions\pmcg.dm" #include "code\modules\clothing\factions\portantillia.dm" diff --git a/code/datums/underwear/top.dm b/code/datums/underwear/top.dm index 3fe6aa233a0..b8afac4ad33 100644 --- a/code/datums/underwear/top.dm +++ b/code/datums/underwear/top.dm @@ -117,4 +117,9 @@ /datum/category_item/underwear/top/fishnet_simple name = "Fishnet Top, Simple" icon_state = "fishnet_simple" - has_color = TRUE \ No newline at end of file + has_color = TRUE + +/datum/category_item/underwear/top/fishnet_simple + name = "Ao Yem" + icon_state = "ao_yem" + has_color = TRUE diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index ba0a70bcf14..cdbf0371188 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -559,3 +559,18 @@ flagpatch_national["flagpatch, nralakk"] = /obj/item/clothing/accessory/flagpatch/nralakk flagpatch_national["flagpatch, hegemony"] = /obj/item/clothing/accessory/flagpatch/hegemony gear_tweaks += new /datum/gear_tweak/path(flagpatch_national) + +/datum/gear/accessory/aodai + display_name = "ao dai" + description = "A long, split tunic worn over trousers. Traditional on New Hai Phong." + path = /obj/item/clothing/accessory/aodai + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + origin_restriction = list(/decl/origin_item/origin/earth, /decl/origin_item/origin/new_hai_phong) + +/datum/gear/accessory/aodai/New() + ..() + var/list/aodai = list() + aodai["ao dai"] = /obj/item/clothing/accessory/aodai + aodai["ao dai, new hai phong cut"] = /obj/item/clothing/accessory/aodai/nhp + aodai["ao dai, masculine formalwear"] = /obj/item/clothing/accessory/aodai/masc + gear_tweaks += new /datum/gear_tweak/path(aodai) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 1ecd692290e..faede4bd6cd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -310,7 +310,7 @@ /datum/gear/head/nonla display_name = "non la hat" path = /obj/item/clothing/head/nonla - + origin_restriction = list(/decl/origin_item/origin/earth, /decl/origin_item/origin/new_hai_phong) /datum/gear/head/konyang display_name = "gat" path = /obj/item/clothing/head/konyang diff --git a/code/modules/clothing/factions/newhaiphong.dm b/code/modules/clothing/factions/newhaiphong.dm new file mode 100644 index 00000000000..e7ae3490c6b --- /dev/null +++ b/code/modules/clothing/factions/newhaiphong.dm @@ -0,0 +1,33 @@ +/obj/item/clothing/accessory/aodai + name = "ao dai" + desc = "A long, split tunic worn over trousers." + icon = 'icons/clothing/under/uniforms/newhaiphong.dmi' + icon_state = "aodai" + item_state = "aodai" + contained_sprite = TRUE + +/obj/item/clothing/accessory/aodai/masc + desc = "A split tunic worn over trousers. This one is in a men's sizing. A common choice for festivals or formal occasions." + icon_state = "aodaimasc" + item_state = "aodaimasc" + +/obj/item/clothing/accessory/aodai/nhp + desc = "A split tunic worn over trousers. This one is cropped and sleeveless, in the athletic style of New Hai Phong." + icon_state = "aodaicrop" + item_state = "aodaicrop" + +/obj/item/clothing/head/nonla + name = "non la" + desc = "A conical straw hat enjoyed particularly by residents of New Hai Phong, to protect the head from sweltering suns and heavy rains." + icon = 'icons/clothing/under/uniforms/newhaiphong.dmi' + icon_state = "nonla" + item_state = "nonla" + contained_sprite = TRUE + +/obj/item/clothing/head/nonla/get_mob_overlay(var/mob/living/carbon/human/human, var/mob_icon, var/mob_state, var/slot) //Exists so that the main sprite doesn't cover up hair that should be in front, thanks Geeves + var/image/I = ..() + if(slot == slot_head_str) + var/image/hat_backing = image(mob_icon, null, "nonla_backing", human ? human.layer - 0.01 : MOB_LAYER - 0.01) + I.add_overlay(hat_backing) + return I + diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 870b6c7b691..42235df442b 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -598,12 +598,6 @@ ) contained_sprite = TRUE -/obj/item/clothing/head/nonla - name = "non la" - desc = "A conical straw hat enjoyed particularly by residents of New Hai Phong, to protect the head from sweltering suns and heavy rains." - icon_state = "nonla" - item_state = "nonla" - /obj/item/clothing/head/padded name = "padded cap" desc = "A padded skullcap for those prone to bumping their heads against hard surfaces." diff --git a/html/changelogs/atteria-NHP-fashion.yml b/html/changelogs/atteria-NHP-fashion.yml new file mode 100644 index 00000000000..153c717b6d5 --- /dev/null +++ b/html/changelogs/atteria-NHP-fashion.yml @@ -0,0 +1,7 @@ +author: atteria + +delete-after: True + +changes: + - rscadd: "Added a Vietnamese ao dai tunic and ao yem." + - imageadd: "Resprited the non la hat." diff --git a/icons/clothing/under/uniforms/newhaiphong.dmi b/icons/clothing/under/uniforms/newhaiphong.dmi new file mode 100644 index 00000000000..fd027ee2a57 Binary files /dev/null and b/icons/clothing/under/uniforms/newhaiphong.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 8163d428e53..000142dbc58 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi index aaf074246de..9ff93390ca6 100644 Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index b6dfb094a4d..fea6f418fa1 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ