From 7539d217115115221dac60bfdeab160914b758fb Mon Sep 17 00:00:00 2001 From: FearTheGabby Date: Tue, 28 Jan 2025 11:47:40 -0600 Subject: [PATCH] Adds several more Unathi loadout options for Dionae (#20357) Title. This partially goes in hand with the recent lore development of the Viridis and Diona nobles. Co-authored-by: Gabby <59633984+feartheblackout@users.noreply.github.com> --- .../loadout/items/xeno/diona.dm | 68 ++++++++++++++++--- .../loadout/items/xeno/unathi.dm | 2 +- html/changelogs/SimpleMaroon-dionanobles.yml | 59 ++++++++++++++++ 3 files changed, 120 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/SimpleMaroon-dionanobles.yml diff --git a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm index 1d4ed4193fb..2f58ca501fd 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm @@ -439,14 +439,6 @@ ABSTRACT_TYPE(/datum/gear/accessory/diona) sort_category = "Xenowear - Diona" origin_restriction = list(/singleton/origin_item/origin/dionae_wasteland, /singleton/origin_item/origin/rokz, /singleton/origin_item/origin/serz) -/datum/gear/uniform/unathi/diona - display_name = "dionae sinta tunic" - path = /obj/item/clothing/under/unathi - whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) - sort_category = "Xenowear - Diona" - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION - culture_restriction = list(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer) - /datum/gear/head/sinta_ronin/diona display_name = "dionae straw hat" path = /obj/item/clothing/head/unathi @@ -476,3 +468,63 @@ ABSTRACT_TYPE(/datum/gear/accessory/diona) sort_category = "Xenowear - Diona" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION culture_restriction = list(/singleton/origin_item/culture/dionae_moghes, /singleton/origin_item/culture/diona_voidtamer) + +/datum/gear/uniform/diona/rockstone + display_name = "dionae rockstone cape" + path = /obj/item/clothing/accessory/poncho/rockstone + cost = 1 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + origin_restriction = list(/singleton/origin_item/origin/viridis_noble) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + +/datum/gear/suit/diona/noble_vest + display_name = "dionae jokfar vest" + path = /obj/item/clothing/suit/unathi/jokfar + cost = 1 + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + origin_restriction = list(/singleton/origin_item/origin/viridis_noble) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/head/diona/maxtlatl + display_name = "diona Thakhist headgear" + path = /obj/item/clothing/head/unathi/maxtlatl + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + allowed_roles = list("Chaplain") + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/uniform/diona/mogazali + display_name = "diona mogazali attire" + path = /obj/item/clothing/under/unathi/mogazali + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + origin_restriction = list(/singleton/origin_item/origin/viridis_noble) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/uniform/diona/mogazali/New() + ..() + var/list/mogazali = list() + mogazali["mogazali attire, red"] = /obj/item/clothing/under/unathi/mogazali + mogazali["mogazali attire, blue"] = /obj/item/clothing/under/unathi/mogazali/blue + mogazali["mogazali attire, green"] = /obj/item/clothing/under/unathi/mogazali/green + mogazali["mogazali attire, orange"] = /obj/item/clothing/under/unathi/mogazali/orange + gear_tweaks += new /datum/gear_tweak/path(mogazali) + +/datum/gear/uniform/diona/jizixi + display_name = "dionae jizixi dress" + path = /obj/item/clothing/under/unathi/jizixi + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + origin_restriction = list(/singleton/origin_item/origin/viridis_noble) + sort_category = "Xenowear - Diona" + +/datum/gear/uniform/diona/jizixi/New() + ..() + var/list/jizixi = list() + jizixi["jizixi dress, red"] = /obj/item/clothing/under/unathi/jizixi + jizixi["jizixi dress, green"] = /obj/item/clothing/under/unathi/jizixi/green + jizixi["jizixi dress, blue"] = /obj/item/clothing/under/unathi/jizixi/blue + jizixi["jizixi dress, white"] = /obj/item/clothing/under/unathi/jizixi/white + jizixi["jizixi dress, orange"] = /obj/item/clothing/under/unathi/jizixi/orange + gear_tweaks += new /datum/gear_tweak/path(jizixi) diff --git a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm index 20634460517..ec2dbec341a 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -155,7 +155,7 @@ /datum/gear/uniform/unathi display_name = "sinta tunic" path = /obj/item/clothing/under/unathi - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION diff --git a/html/changelogs/SimpleMaroon-dionanobles.yml b/html/changelogs/SimpleMaroon-dionanobles.yml new file mode 100644 index 00000000000..f7a72cb090a --- /dev/null +++ b/html/changelogs/SimpleMaroon-dionanobles.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Added several Unathi loadout items to the Xenowear - Diona tab that were not previously available to Moghesian Dionae." + - rscdel: "Removed the Dionae sinta tunic from the Xenowear - Diona tab. The tunic can now be selected for Dionae under the standard option in Xenowear - Unathi instead."