From e6b762e803f4b7d8c2eb60eb5cf7b3733bf9260a Mon Sep 17 00:00:00 2001 From: feartheblackout <59633984+feartheblackout@users.noreply.github.com> Date: Mon, 1 Jul 2024 08:09:51 -0500 Subject: [PATCH] Diona/Unathi loadout fixes (#19571) see changelog --- .../loadout/items/xeno/diona.dm | 3 +- .../loadout/items/xeno/unathi.dm | 1 + code/modules/clothing/under/xenos/unathi.dm | 2 + .../SimpleMaroon-dionaloadoutfixes.yml | 60 +++++++++++++++++++ 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/SimpleMaroon-dionaloadoutfixes.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 2290842288c..629347e1fd0 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm @@ -311,7 +311,7 @@ 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 + 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 @@ -341,4 +341,5 @@ path = /obj/item/clothing/under/unathi/zozo whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) 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) 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 a56f7f1a3aa..b4b05143896 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -300,6 +300,7 @@ path = /obj/item/clothing/under/unathi/zozo whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Unathi" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/suit/unathi/wrapping_head display_name = "Thakhist head wrappings" diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm index afcb1274f04..c18291159a6 100644 --- a/code/modules/clothing/under/xenos/unathi.dm +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -79,6 +79,8 @@ desc = "A modern blend of Ouerean and Moghean style for anyone on the go. Great for sunbathing!" icon_state = "zozo" item_state = "zozo" + build_from_parts = FALSE + has_accents = FALSE /obj/item/clothing/under/unathi/himation name = "himation cloak" diff --git a/html/changelogs/SimpleMaroon-dionaloadoutfixes.yml b/html/changelogs/SimpleMaroon-dionaloadoutfixes.yml new file mode 100644 index 00000000000..0e8dbf103bb --- /dev/null +++ b/html/changelogs/SimpleMaroon-dionaloadoutfixes.yml @@ -0,0 +1,60 @@ +################################ +# 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: + - bugfix: "Fixed the Diona Sinta tunic in the loadout lacking colorable accents." + - bugfix: "Fixed the Diona zo'zo top in the loadout lacking renameability and colorability flags." + - bugfix: "Fixed both the Unathi and Diona zo'zo top in the loadout having secondary colorability, despite not having accents."