STAGING-SIERRA: Loadout additions

code/modules/client/preference_setup/loadout/lists/suits.dm

@@ -187,26 +187,30 @@
 	whitelisted = list(SPECIES_UNATHI, SPECIES_YEOSA)
 
 /datum/gear/suit/unathi/mantle
-	display_name = "hide mantle (Unathi)"
+	display_name = "(Unathi) hide mantle"
 	path = /obj/item/clothing/suit/unathi/mantle
 
 /datum/gear/suit/unathi/robe
-	display_name = "roughspun robe (Unathi)"
+	display_name = "(Unathi) roughspun robe"
 	path = /obj/item/clothing/suit/unathi/robe
 
 /datum/gear/suit/unathi/knifeharness
-	display_name = "decorated harness"
+	category = GEAR_CATEGORY_ACCESSORIES
+	display_name = "(Unathi) decorated harness"
 	path = /obj/item/clothing/accessory/storage/knifeharness
+	slot = slot_tie
 	cost = 5
 
 /datum/gear/suit/unathi/savage_hunter
-	display_name = "savage hunter hides (Male, Unathi)"
+	category = GEAR_CATEGORY_UNIFORMS_AND_CASUAL_DRESS
+	display_name = "(Unathi) savage hunter hides, male"
 	path = /obj/item/clothing/under/savage_hunter
 	slot = slot_w_uniform
 	cost = 2
 
 /datum/gear/suit/unathi/savage_hunter/female
-	display_name = "savage hunter hides (Female, Unathi)"
+	category = GEAR_CATEGORY_UNIFORMS_AND_CASUAL_DRESS
+	display_name = "(Unathi) savage hunter hides, female"
 	path = /obj/item/clothing/under/savage_hunter/female
 	slot = slot_w_uniform
 	cost = 2

maps/sierra/loadout/loadout_tactical.dm

@@ -18,6 +18,7 @@
 /datum/gear/tactical/holster/New()
 	allowed_roles = ARMED_ROLES
 	allowed_roles += /datum/job/iaa
+	allowed_roles += /datum/job/adjutant
 	..()
 
 /datum/gear/tactical/holster/New()
@@ -116,7 +117,7 @@
 	atags["PCRC tag"] = /obj/item/clothing/accessory/armor_tag/pcrc
 	atags["SAARE tag"] = /obj/item/clothing/accessory/armor_tag/saare
 //	atags["SCP tag"] = /obj/item/clothing/accessory/armor_tag/scp
-//	atags["ZPCI tag"] = /obj/item/clothing/accessory/armor_tag/zpci
+	atags["ZPCI tag"] = /obj/item/clothing/accessory/armor_tag/zpci
 	gear_tweaks += new/datum/gear_tweak/path(atags)
 
 /datum/gear/tactical/press_tag

mods/loadout_items/README.md

@@ -7,6 +7,7 @@
 - https://github.com/SierraBay/SierraBay12/pull/1761
 - https://github.com/SierraBay/SierraBay12/pull/1991
 - https://github.com/SierraBay/SierraBay12/pull/2015
+- https://github.com/SierraBay/SierraBay12/pull/2033
 <!--
   Ссылки на PRы, связанные с модом:
   - Создание

mods/loadout_items/_loadout_items.dme

@@ -13,8 +13,10 @@
 #include "code/uniforms.dm"
 #include "code/lists/accessories.dm"
 #include "code/lists/cloaks.dm"
+#include "code/lists/head.dm"
 #include "code/lists/general.dm"
 #include "code/lists/uniforms.dm"
+#include "code/lists/shoes.dm"
 #include "code/lists/suits.dm"
 
 #endif

mods/loadout_items/code/accessory.dm

@@ -55,6 +55,8 @@ ranks - ec
 	desc = "Insignia denoting the rank of Lieutenant."
 	icon_state = "ecrank_o3"
 
+//Misc accessories
+
 /obj/item/clothing/accessory/scarf/fancy
 	name = "red striped scarf"
 	icon_state = "stripedredscarf"
@@ -78,6 +80,16 @@ ranks - ec
 	name = "christmas scarf"
 	icon_state = "christmasscarf"
 
+/obj/item/clothing/accessory/armor_tag/zpci
+	name = "\improper ZPCI tag"
+	icon = 'mods/loadout_items/icons/obj_accessory.dmi'
+	accessory_icons = list(slot_tie_str = 'mods/loadout_items/icons/onmob_accessory.dmi', slot_wear_suit_str = 'mods/loadout_items/icons/onmob_accessory.dmi')
+	desc = "An armor tag with the words ZONE PROTECTION CONTROL INCORPORATED printed in blue lettering on it."
+	icon_state = "zpci_tag"
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_accessory_unathi.dmi'
+		)
+
 // Press
 
 /obj/item/clothing/accessory/badge/press/independent

mods/loadout_items/code/armor.dm

@@ -31,8 +31,3 @@ Armor Patches, covers, ect
 	icon = 'mods/loadout_items/icons/obj_accessory.dmi'
 	icon_state = "scp_tag"
 	accessory_icons = list(slot_tie_str = 'mods/loadout_items/icons/onmob_accessory.dmi', slot_wear_suit_str = 'mods/loadout_items/icons/onmob_accessory.dmi')
-
-/obj/item/clothing/accessory/armor/tag/zpci
-	name = "\improper ZPCI tag"
-	desc = "An armor tag with the words ZONE PROTECTION CONTROL INCORPORATED printed in cyan lettering on it."
-	icon_state = "pcrctag"

mods/loadout_items/code/cloak.dm

@@ -109,6 +109,15 @@
 	desc = "This cape is so much aged that you can almost think it's a relic."
 	icon_state = "antiquated_cape"
 
+/obj/item/clothing/accessory/cloak/zpci
+	name = "ZPCI cloak"
+	desc = "A formal cape of a ZPCI operative, used as part of the Order's parade uniform. Usually worn on one shoulder."
+	icon_state = "zpci_cloak"
+	slot = ACCESSORY_SLOT_INSIGNIA
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'mods/loadout_items/icons/unathi/onmob_accessory_unathi.dmi'
+	)
+
 /obj/item/clothing/accessory/cloak/hooded
 	var/obj/item/clothing/head/hood
 	var/hoodtype = null
@@ -189,3 +198,50 @@
 	icon_state = "crimson_cloak_hood"
 	flags_inv = BLOCKHEADHAIR
 	body_parts_covered = HEAD
+
+//Aurora stuff
+
+/obj/item/clothing/accessory/cloak/dominia/red
+	name = "Avalon grand mantle"
+	desc = "A heavy cape, found usually upon shoulders of the richest - and most conceited - among the Avalonian nobles."
+	icon = 'mods/loadout_items/icons/obj_accessory.dmi'
+	accessory_icons = list(
+		slot_w_uniform_str = 'mods/loadout_items/icons/onmob_accessory.dmi', \
+		slot_tie_str = 'mods/loadout_items/icons/onmob_accessory.dmi', \
+		slot_wear_suit_str = 'mods/loadout_items/icons/onmob_accessory.dmi')
+	item_icons = list(
+		slot_wear_suit_str = 'mods/loadout_items/icons/onmob_accessory.dmi')
+	icon_state = "dominian_cape_red"
+	item_state = "dominian_cape_red"
+	overlay_state = "dominian_cape_red"
+	slot = ACCESSORY_SLOT_INSIGNIA
+	icon_override = null
+	var/rolled = FALSE
+
+/obj/item/clothing/accessory/cloak/dominia/red/update_clothing_icon()
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_wear_suit()
+	get_mob_overlay(TRUE)
+	get_inv_overlay(TRUE)
+
+/obj/item/clothing/accessory/cloak/dominia/red/verb/roll_up_mantle()
+	set name = "Roll Up Cape Mantle"
+	set desc = "Roll up your cape's mantle."
+	set category = "Object"
+	set src in usr
+
+	var/list/icon_states = icon_states(icon)
+	var/initial_state = initial(icon_state)
+	var/new_state = "[initial_state]_h"
+	if(!(new_state in icon_states))
+		to_chat(usr, SPAN_WARNING("Your cape doesn't allow this!"))
+		return
+
+	rolled = !rolled
+	to_chat(usr, SPAN_NOTICE("You roll your cape's mantle [rolled ? "up" : "down"]."))
+	icon_state = rolled ? new_state : initial_state
+	item_state = rolled ? new_state : initial_state
+	overlay_state = rolled ? new_state : initial_state
+	update_icon()
+	update_clothing_icon()

mods/loadout_items/code/lists/cloaks.dm

@@ -81,3 +81,18 @@
 /datum/gear/clothing/cloak_hooded
 	display_name = "cloak, hooded"
 	path = /obj/item/clothing/accessory/cloak/hooded
+
+//Faction cloaks
+
+/datum/gear/clothing/cloak_zpci
+	display_name = "cloak, ZPCI"
+	path = /obj/item/clothing/accessory/cloak/zpci
+	allowed_branches = list(/datum/mil_branch/contractor)
+	required_factions = list(FACTION_ZPCI)
+
+//Aurora stuff
+/datum/gear/clothing/cloak_avalon
+	display_name = "mantle, Avalon"
+	path = /obj/item/clothing/accessory/cloak/dominia/red
+
+//Misc cloaks

mods/loadout_items/code/lists/head.dm

@@ -0,0 +1,13 @@
+//Unathi stuff
+
+/datum/gear/suit/unathi/security_cap
+	category = GEAR_CATEGORY_HATS_AND_HEADWEAR
+	display_name = "(Unathi) big security cap"
+	path = /obj/item/clothing/head/cap/sec
+	slot = slot_head
+
+/datum/gear/suit/unathi/desert_cap
+	category = GEAR_CATEGORY_HATS_AND_HEADWEAR
+	display_name = "(Unathi) suncap"
+	path = /obj/item/clothing/head/cap/desert
+	slot = slot_head

mods/loadout_items/code/lists/shoes.dm

@@ -0,0 +1,14 @@
+//Unathi stuff
+/datum/gear/suit/unathi/footwraps
+	category = GEAR_CATEGORY_SHOES_AND_FOOTWEAR
+	display_name = "(Unathi) big footwraps"
+	path = /obj/item/clothing/shoes/loadout_unathi
+	slot = slot_shoes
+	flags = GEAR_HAS_COLOR_SELECTION
+
+/datum/gear/suit/unathi/sandals
+	category = GEAR_CATEGORY_SHOES_AND_FOOTWEAR
+	display_name = "(Unathi) unathi sandals"
+	path = /obj/item/clothing/shoes/loadout_unathi/sandals
+	slot = slot_shoes
+	flags = GEAR_HAS_COLOR_SELECTION

mods/loadout_items/code/lists/suits.dm

@@ -61,44 +61,27 @@
 	medicoats["medical jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/emrs
 	gear_tweaks += new/datum/gear_tweak/path(medicoats)
 
-/datum/gear/suit/unathi/officer_uniform
-	display_name = "(Unathi) large security uniform"
-	path = /obj/item/clothing/under/security/officer
-	slot = slot_w_uniform
-
-/datum/gear/suit/unathi/desert_uniform
-	display_name = "(Unathi) desert uniform"
-	path = /obj/item/clothing/under/security/desert
-	slot = slot_w_uniform
-
-/datum/gear/suit/unathi/paramedic_uniform
-	display_name = "(Unathi) first responder uniform"
-	path = /obj/item/clothing/under/medic/paramedic
-	slot = slot_w_uniform
-
-/datum/gear/suit/unathi/security_cap
-	display_name = "(Unathi) big security cap"
-	path = /obj/item/clothing/head/cap/sec
-	slot = slot_head
-
-/datum/gear/suit/unathi/desert_cap
-	display_name = "(Unathi) suncap"
-	path = /obj/item/clothing/head/cap/desert
-	slot = slot_head
-
 /datum/gear/suit/unathi/security_jacket
 	display_name = "(Unathi) security jacket"
 	path = /obj/item/clothing/suit/storage/security
 	slot = slot_wear_suit
 
-/datum/gear/suit/unathi/footwraps
-	display_name = "(Unathi) big footwraps"
-	path = /obj/item/clothing/shoes/loadout_unathi
-	slot = slot_shoes
-	flags = GEAR_HAS_COLOR_SELECTION
+//Aurora stuff
+/datum/gear/suit/avalon_coats
+	display_name = "avalon coats selection"
+	path = /obj/item/clothing/suit/storage/dominia
 
-/datum/gear/suit/unathi/sandals
-	display_name = "(Unathi) unathi sandals"
-	path = /obj/item/clothing/shoes/loadout_unathi/sandals
-	slot = slot_shoes
-	flags = GEAR_HAS_COLOR_SELECTION
+/datum/gear/suit/avalon_coats/New()
+	..()
+	var/avalon_coats = list()
+	avalon_coats["Avalon greatcoat"] = /obj/item/clothing/suit/storage/dominia
+	avalon_coats["Avalon greatcoat (golden trim)"] = /obj/item/clothing/suit/storage/dominia/gold
+	avalon_coats["Avalon greatcoat (black trim)"] = /obj/item/clothing/suit/storage/dominia/black
+	avalon_coats["Avalon coat"] = /obj/item/clothing/suit/storage/dominia/coat
+	avalon_coats["Avalon coat (golden trim)"] = /obj/item/clothing/suit/storage/dominia/coat/gold
+	avalon_coats["Avalon coat (black trim)"] = /obj/item/clothing/suit/storage/dominia/coat/black
+	avalon_coats["Avalon consular's greatcoat (black trim)"] = /obj/item/clothing/suit/storage/dominia/consular
+	avalon_coats["Avalon consular's coat (black trim)"] = /obj/item/clothing/suit/storage/dominia/consular/coat
+	avalon_coats["Avalon consular's greatcoat (red trim)"] = /obj/item/clothing/suit/storage/dominia/consular/red
+	avalon_coats["Avalon consular's coat (red trim)"] = /obj/item/clothing/suit/storage/dominia/consular/coat/red
+	gear_tweaks += new/datum/gear_tweak/path(avalon_coats)

mods/loadout_items/code/lists/uniforms.dm

@@ -173,3 +173,71 @@
 	informal["denim vest"] = /obj/item/clothing/under/informal/denimvest
 	informal["rhumba outfit"] = /obj/item/clothing/under/informal/cuban_suit
 	gear_tweaks += new/datum/gear_tweak/path(informal)
+
+//Aurora stuff
+/datum/gear/uniform/black_skirtsuit
+	display_name = "black skirtsuit"
+	path = /obj/item/clothing/under/suit_jacket/nt_skirtsuit
+
+/datum/gear/uniform/red_swept_dress
+	display_name = "red swept dress"
+	path = /obj/item/clothing/under/dress/red_swept_dress
+
+/datum/gear/uniform/colorable_dress
+	display_name = "colorable dress selection"
+	path = /obj/item/clothing/under/dress/colorable
+	flags = GEAR_HAS_COLOR_SELECTION
+
+/datum/gear/uniform/colorable_dress/New()
+	..()
+	var/dresses = list()
+	dresses["strapless midi dress"] = /obj/item/clothing/under/dress/colorable
+	dresses["sleeveless A-line dress"] = /obj/item/clothing/under/dress/colorable/sleeveless
+	dresses["longsleeve A-line dress"] = /obj/item/clothing/under/dress/colorable/longsleeve
+	dresses["evening gown"] = /obj/item/clothing/under/dress/colorable/evening_gown
+	dresses["tea-length dress"] = /obj/item/clothing/under/dress/colorable/tea_dress
+	dresses["open-shoulder dress"] = /obj/item/clothing/under/dress/colorable/open_shoulder
+	dresses["asymmetric dress"] = /obj/item/clothing/under/dress/colorable/asymmetric
+	gear_tweaks += new/datum/gear_tweak/path(dresses)
+
+/datum/gear/uniform/avalon_dress
+	display_name = "avalon noble dress selection"
+	path = /obj/item/clothing/under/dominia/dress
+
+/datum/gear/uniform/avalon_dress/New()
+	..()
+	var/dresses = list()
+	dresses["Avalon noble greatdress"] = /obj/item/clothing/under/dominia/dress
+	dresses["Avalon noble dress"] = /obj/item/clothing/under/dominia/dress/noble
+	dresses["Portenas noble dress"] = /obj/item/clothing/under/dominia/dress/noble/strelitz
+	dresses["West Vujaran noble dress"] = /obj/item/clothing/under/dominia/dress/noble/volvalaad
+	dresses["East Vujaran noble dress"] = /obj/item/clothing/under/dominia/dress/noble/kazhkz
+	dresses["Kvoblau noble dress"] = /obj/item/clothing/under/dominia/dress/noble/caladius
+	dresses["Nova-Yorvik noble dress"] = /obj/item/clothing/under/dominia/dress/noble/zhao
+	dresses["black Avalon noble dress"] = /obj/item/clothing/under/dominia/dress/noble/black
+	dresses["black Portenas noble dress"] = /obj/item/clothing/under/dominia/dress/noble/black/strelitz
+	dresses["black West Vujaran noble dress"] = /obj/item/clothing/under/dominia/dress/noble/black/volvalaad
+	dresses["black East Vujaran noble dress"] = /obj/item/clothing/under/dominia/dress/noble/black/kazhkz
+	dresses["black Kvoblau noble dress"] = /obj/item/clothing/under/dominia/dress/noble/black/caladius
+	dresses["black Nova-Yorvik noble dress"] = /obj/item/clothing/under/dominia/dress/noble/black/zhao
+	gear_tweaks += new/datum/gear_tweak/path(dresses)
+
+//Unathi stuff
+
+/datum/gear/suit/unathi/officer_uniform
+	category = GEAR_CATEGORY_UNIFORMS_AND_CASUAL_DRESS
+	display_name = "(Unathi) large security uniform"
+	slot = slot_w_uniform
+	path = /obj/item/clothing/under/security/officer
+
+/datum/gear/suit/unathi/desert_uniform
+	category = GEAR_CATEGORY_UNIFORMS_AND_CASUAL_DRESS
+	display_name = "(Unathi) desert uniform"
+	slot = slot_w_uniform
+	path = /obj/item/clothing/under/security/desert
+
+/datum/gear/suit/unathi/paramedic_uniform
+	category = GEAR_CATEGORY_UNIFORMS_AND_CASUAL_DRESS
+	display_name = "(Unathi) first responder uniform"
+	slot = slot_w_uniform
+	path = /obj/item/clothing/under/medic/paramedic