New Hai Phong fashion - Adds an ao dai, resprites the non la (#15496)

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"

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
+	has_color = TRUE
+
+/datum/category_item/underwear/top/fishnet_simple
+	name = "Ao Yem"
+	icon_state = "ao_yem"
+	has_color = TRUE

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)

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

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
+

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."

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."