Vysoka Loadout Love (#16312)

* part 1

* that was decently fast

* thanks shermie I love you

* bruh

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -368,9 +368,43 @@
 	origin_restriction = list(/singleton/origin_item/origin/himeo, /singleton/origin_item/origin/ipc_himeo, /singleton/origin_item/origin/free_council)
 
 /datum/gear/head/vysoka
-	display_name = "vysokan fur cap"
-	path = /obj/item/clothing/head/softcap/vysoka
+	display_name = "vysokan fur cap selection"
+	description = "A fur hat from Vysoka made of authentic ohdker fur."
+	path = /obj/item/clothing/head/vysoka
 	flags = GEAR_HAS_DESC_SELECTION
+	origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka)
+
+/datum/gear/head/vysoka/New()
+	..()
+	var/list/vysoka = list()
+	vysoka["fur cap"] = /obj/item/clothing/head/vysoka
+	vysoka["fur cap, purple"] = /obj/item/clothing/head/vysoka/purple
+	vysoka["fur cap, blue"] = /obj/item/clothing/head/vysoka/blue
+	vysoka["fur cap, red"] = /obj/item/clothing/head/vysoka/red
+	gear_tweaks += new /datum/gear_tweak/path(vysoka)
+
+/datum/gear/head/joku
+	display_name = "vysokan joku cap"
+	description = "A warm-looking expensive cap made from fine, dyed dalakyhr fur."
+	path = /obj/item/clothing/head/vysoka/joku
+	flags = GEAR_HAS_DESC_SELECTION
+	origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka)
+
+/datum/gear/head/joku/New()
+	..()
+	var/list/joku = list()
+	joku["fancy cap"] = /obj/item/clothing/head/vysoka/joku
+	joku["fancy cap, purple"] = /obj/item/clothing/head/vysoka/joku/purple
+	joku["fancy cap, blue"] = /obj/item/clothing/head/vysoka/joku/blue
+	joku["fancy cap, red"] = /obj/item/clothing/head/vysoka/joku/red
+	gear_tweaks += new /datum/gear_tweak/path(joku)
+
+/datum/gear/head/dainshu
+	display_name = "vysokan dainshu feather"
+	description = "The feather of a Vysokan dainshu, a domesticated flying beast."
+	path = /obj/item/clothing/head/pin/dainshu
+	flags = GEAR_HAS_DESC_SELECTION
+	origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka)
 
 /datum/gear/head/buckethat
 	display_name = "bucket hat"

code/modules/client/preference_setup/loadout/loadout_shoes.dm

@@ -117,6 +117,12 @@
 	path = /obj/item/clothing/shoes/konyang
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
+/datum/gear/shoes/vysoka
+	display_name = "gurmori hide boots"
+	description = "A pair of hide boots produced from the mantle of a Vysokan Gurmori."
+	path = /obj/item/clothing/shoes/gurmori
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+
 /datum/gear/shoes/circuitry
 	display_name = "boots, circuitry (empty)"
 	path = /obj/item/clothing/shoes/circuitry

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -404,14 +404,28 @@
 	display_name = "chokha selection"
 	description = "A selection of Vysokan chokhas."
 	path = /obj/item/clothing/suit/storage/vysoka
-	flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+	flags = GEAR_HAS_DESC_SELECTION
 	origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka)
 
 /datum/gear/suit/vysoka/New()
 	..()
 	var/list/coat = list()
 	coat["feminine chokha"] = /obj/item/clothing/suit/storage/vysoka/f
+	coat["feminine chokha, purple"] = /obj/item/clothing/suit/storage/vysoka/f/purple
+	coat["feminine chokha, blue"] = /obj/item/clothing/suit/storage/vysoka/f/blue
+	coat["feminine chokha, red"] = /obj/item/clothing/suit/storage/vysoka/f/red
 	coat["masculine chokha"] = /obj/item/clothing/suit/storage/vysoka
+	coat["masculine chokha, purple"] = /obj/item/clothing/suit/storage/vysoka/purple
+	coat["masculine chokha, blue"] = /obj/item/clothing/suit/storage/vysoka/blue
+	coat["masculine chokha, red"] = /obj/item/clothing/suit/storage/vysoka/red
+	coat["heavy feminine chokha"] = /obj/item/clothing/suit/storage/vysoka/f/winter
+	coat["heavy feminine chokha, purple"] = /obj/item/clothing/suit/storage/vysoka/f/winter/purple
+	coat["heavy feminine chokha, blue"] = /obj/item/clothing/suit/storage/vysoka/f/winter/blue
+	coat["heavy feminine chokha, red"] = /obj/item/clothing/suit/storage/vysoka/f/winter/red
+	coat["heavy masculine chokha"] = /obj/item/clothing/suit/storage/vysoka/winter
+	coat["heavy masculine chokha, purple"] = /obj/item/clothing/suit/storage/vysoka/winter/purple
+	coat["heavy masculine chokha, blue"] = /obj/item/clothing/suit/storage/vysoka/winter/blue
+	coat["heavy masculine chokha, red"] = /obj/item/clothing/suit/storage/vysoka/winter/red
 	gear_tweaks += new /datum/gear_tweak/path(coat)
 
 /datum/gear/suit/submariner

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -296,6 +296,13 @@
 	flags = GEAR_HAS_DESC_SELECTION
 	culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi)
 
+/datum/gear/uniform/turtleneck
+	display_name = "vysokan temperwear"
+	description = "A loose outfit of thinned and shredded ohdker fur."
+	path = /obj/item/clothing/under/vysoka
+	flags = GEAR_HAS_DESC_SELECTION
+	origin_restriction = list(/singleton/origin_item/origin/vysoka, /singleton/origin_item/origin/ipc_vysoka)
+
 /datum/gear/uniform/elyra_holo
 	display_name = "elyran holographic suit selection"
 	description = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Persepolis clothes respectively."

code/modules/clothing/factions/vysoka.dm

@@ -2,24 +2,131 @@
 	name = "chokha"
 	desc = "A woolen coat with a high neck commonly worn on Vysoka."
 	desc_extended = "Chokhas are a common choice of outerwear for men and women on Vysoka, and are often colored differently based on their city - or host - of origin. The chokha has become something of a cultural symbol of Vysoka, and is often worn off-world by its citizens."
-	icon = 'icons/clothing/suits/coats/vysoka_chokha_male.dmi'
-	icon_state = "chokha_vysoka_m"
-	item_state = "chokha_vysoka_m"
+	icon = 'icons/obj/item/clothing/suit/storage/vysoka_chokha_male.dmi'
+	icon_state = "chokha"
+	item_state = "chokha"
 	contained_sprite = TRUE
-	build_from_parts = TRUE
-	worn_overlay = "accessories"
+
+/obj/item/clothing/suit/storage/vysoka/purple
+	icon_state = "chokha_purple"
+	item_state = "chokha_purple"
+
+/obj/item/clothing/suit/storage/vysoka/blue
+	icon_state = "chokha_blue"
+	item_state = "chokha_blue"
+
+/obj/item/clothing/suit/storage/vysoka/red
+	icon_state = "chokha_red"
+	item_state = "chokha_red"
+
+/obj/item/clothing/suit/storage/vysoka/winter
+	icon_state = "winterchokha"
+	item_state = "winterchokha"
+
+/obj/item/clothing/suit/storage/vysoka/winter/purple
+	icon_state = "winterchokha_purple"
+	item_state = "winterchokha_purple"
+
+/obj/item/clothing/suit/storage/vysoka/winter/blue
+	icon_state = "winterchokha_blue"
+	item_state = "winterchokha_blue"
+
+/obj/item/clothing/suit/storage/vysoka/winter/red
+	icon_state = "winterchokha_red"
+	item_state = "winterchokha_red"
 
 /obj/item/clothing/suit/storage/vysoka/f
-	icon = 'icons/clothing/suits/coats/vysoka_chokha_female.dmi'
-	icon_state = "chokha_vysoka_f"
-	item_state = "chokha_vysoka_f"
+	icon = 'icons/obj/item/clothing/suit/storage/vysoka_chokha_female.dmi'
 	contained_sprite = TRUE
 
-/obj/item/clothing/head/softcap/vysoka
+/obj/item/clothing/suit/storage/vysoka/f/purple
+	icon_state = "chokha_purple"
+	item_state = "chokha_purple"
+
+/obj/item/clothing/suit/storage/vysoka/f/blue
+	icon_state = "chokha_blue"
+	item_state = "chokha_blue"
+
+/obj/item/clothing/suit/storage/vysoka/f/red
+	icon_state = "chokha_red"
+	item_state = "chokha_red"
+
+/obj/item/clothing/suit/storage/vysoka/f/winter
+	icon_state = "winterchokha"
+	item_state = "winterchokha"
+
+/obj/item/clothing/suit/storage/vysoka/f/winter/purple
+	icon_state = "winterchokha_purple"
+	item_state = "winterchokha_purple"
+
+/obj/item/clothing/suit/storage/vysoka/f/winter/blue
+	icon_state = "winterchokha_blue"
+	item_state = "winterchokha_blue"
+
+/obj/item/clothing/suit/storage/vysoka/f/winter/red
+	icon_state = "winterchokha_red"
+	item_state = "winterchokha_red"
+
+/obj/item/clothing/head/vysoka
 	name = "vysokan fur cap"
 	desc = "A fur hat from Vysoka made of authentic ohdker fur."
 	desc_extended = "The ohdker is a common animal on Vysoka that serves as a livestock and beast of burden, depending on the needs at the time. Its fur is highly prized on Vysoka, and major cities often export it off-world to location such as Xanu Prime."
-	icon_state = "cap_vysoka"
-	item_state = "cap_vysoka"
-	icon = 'icons/clothing/head/vysoka_cap.dmi'
+	icon_state = "fur"
+	item_state = "fur"
+	icon = 'icons/obj/item/clothing/head/vysoka_caps.dmi'
+	contained_sprite = TRUE
+
+/obj/item/clothing/head/vysoka/purple
+	icon_state = "fur_purple"
+	item_state = "fur_purple"
+
+/obj/item/clothing/head/vysoka/blue
+	icon_state = "fur_blue"
+	item_state = "fur_blue"
+
+/obj/item/clothing/head/vysoka/red
+	icon_state = "fur_red"
+	item_state = "fur_red"
+
+/obj/item/clothing/head/vysoka/joku
+	name = "vysokan joku cap"
+	desc = "A warm-looking expensive cap made from fine, dyed dalakyhr fur and a few dainshu feathers sticking out of its crown. It has golden thread delicately embroidered into it depicting a stylised natural scene that looks like it took a craftsperson hours upon hours to make. "
+	desc_extended = null
+	icon_state = "joku"
+	item_state = "joku"
+
+/obj/item/clothing/head/vysoka/joku/purple
+	icon_state = "joku_purple"
+	item_state = "joku_purple"
+
+/obj/item/clothing/head/vysoka/joku/blue
+	icon_state = "joku_blue"
+	item_state = "joku_blue"
+
+/obj/item/clothing/head/vysoka/joku/red
+	icon_state = "joku_red"
+	item_state = "joku_red"
+
+/obj/item/clothing/head/pin/dainshu
+	name = "vysokan dainshu feather"
+	desc = "The feather of a Vysokan dainshu, a domesticated flying beast whose companionship is akin to that of an Earth falcon."
+	icon = 'icons/obj/item/clothing/head/vysoka_caps.dmi'
+	icon_state = "dainshu"
+	item_state = "dainshu"
+	contained_sprite = TRUE
+
+/obj/item/clothing/shoes/gurmori
+	name = "gurmori hide boots"
+	desc = "A pair of hide boots with a shining, scaled appearance, this is produced from the mantle of a Vysokan Gurmori - oftentimes to the memory of a rider's past mount and companion."
+	icon = 'icons/obj/item/clothing/shoes/vysoka_shoes.dmi'
+	icon_state = "gurmori"
+	item_state = "gurmori"
+	contained_sprite = TRUE
+
+/obj/item/clothing/under/vysoka
+	name = "thin temperwear"
+	desc = "A loose outfit of thinned and shredded ohdker fur. The particular process of its threading makes these a popular appearance in Vysokan wardrobes, owing to their comfort in varying conditions - mostly the sweltering summer heat or heavy wind of their native plains."
+	icon = 'icons/obj/item/clothing/under/vysoka_under.dmi'
+	icon_state = "temperwear"
+	item_state = "temperwear"
 	contained_sprite = TRUE

html/changelogs/kyres1-vysoka_love.yml

@@ -0,0 +1,10 @@
+author: kyres1
+
+delete-after: True
+
+changes:
+  - rscadd: "Added new Vysokan caps in four color varieties. These include new versions of the old fur cap, and new fancy caps!"
+  - rscadd: "Added a summer and winter version of the chokha, one lighter and one covered in cozy fur. Also in four color varieties!"
+  - rscadd: "Added Vysokan dainshu feathers to the loadout as hairpins."
+  - rscadd: "Added Vysokan gurmori hide boots to the loadout as shoes."
+  - rscadd: "Added native Vysokan uniform apparel that can be rolled up or down, called temperwear."

maps/away/ships/coc_ranger/coc_ship.dmm

@@ -918,7 +918,7 @@
 /area/ship/ranger_corvette/janitor)
 "eJp" = (
 /obj/item/clothing/accessory/flagpatch/vysoka,
-/obj/item/clothing/head/softcap/vysoka,
+/obj/item/clothing/head/vysoka,
 /obj/structure/table/wood,
 /obj/item/clothing/accessory/badge/passcard/coalition,
 /turf/simulated/floor/carpet/red,