From 6c1f9561cb45d535ab0bd869df0935c2786d71e5 Mon Sep 17 00:00:00 2001 From: feartheblackout <59633984+feartheblackout@users.noreply.github.com> Date: Sat, 24 Jun 2023 16:10:49 -0500 Subject: [PATCH] Fixes the Diona wasteland kilt in loadout (#16480) --- .../loadout/loadout_xeno/diona.dm | 44 ++++++++++--------- html/changelogs/SimpleMaroon-dionakiltfix.yml | 41 +++++++++++++++++ 2 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 html/changelogs/SimpleMaroon-dionakiltfix.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/diona.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/diona.dm index 1d6a85a3b4a..9daade8532d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/diona.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/diona.dm @@ -25,7 +25,7 @@ whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" flags = GEAR_NO_SELECTION - + /datum/gear/suit/diona/eternal/blood display_name = "red mesh weave robes" description = "A set of red mesh weave robes worn almost exclusively by priests of the Blood Eternal faith." @@ -43,7 +43,7 @@ whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" culture_restriction = list(/singleton/origin_item/culture/narrows) - + /datum/gear/uniform/diona/dionatunic display_name = "floral tunic" description = "A tunic made up of several colorful fabrics and adorned with seemingly still-living vines and flowers, typically worn by those hailing from the Mada on EUM." @@ -51,7 +51,7 @@ cost = 1 whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" - + /datum/gear/suit/eumponcho display_name = "dionae poncho" description = "A poncho made of some sort of mesh weave material adorned by a piece of colored fabric wrapped around it, sometimes worn by citizens of the CT-EUM, with the fabric around the poncho indicating which nation they belong to." @@ -76,7 +76,7 @@ path = /obj/item/clothing/accessory/poncho/shouldercape whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) /datum/gear/accessory/capes/diona/New() ..() @@ -92,14 +92,14 @@ path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) /datum/gear/accessory/weishii/diona display_name = "dionae weishii robe" path = /obj/item/clothing/accessory/poncho/shouldercape/weishiirobe whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) /datum/gear/skrell_projector/diona display_name = "dionae nralakk projector" @@ -114,15 +114,15 @@ whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" flags = GEAR_NO_SELECTION - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) /datum/gear/colonist_deck/diona // Intentionally separate from homeworld_deck, so that both can be chosen. -Lly display_name = "dionae qweipaqui colonist deck" path = /obj/item/deck/tarot/nonnralakk whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) - + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + /datum/gear/accessory/skrell_passport/diona display_name = "dionae nralakk federation passport" path = /obj/item/clothing/accessory/badge/passport/nralakk @@ -131,8 +131,8 @@ sort_category = "Xenowear - Diona" cost = 0 flags = GEAR_NO_SELECTION - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) - + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + /datum/gear/accessory/diona/skrell_passport/check_species_whitelist(mob/living/carbon/human/H) var/static/list/species_list = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) if(H.species.name in species_list) @@ -152,8 +152,8 @@ path = /obj/item/clothing/under/skrell/nralakk whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) flags = GEAR_HAS_DESC_SELECTION - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) - + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + /datum/gear/uniform/work/diona/New() ..() var/list/outfit = list() @@ -185,7 +185,7 @@ whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" flags = GEAR_HAS_DESC_SELECTION - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) /datum/gear/suit/jacket/diona/New() ..() @@ -218,7 +218,7 @@ whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" flags = GEAR_HAS_DESC_SELECTION - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) /datum/gear/accessory/diona/poncho/New() ..() @@ -235,7 +235,7 @@ whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" flags = GEAR_HAS_DESC_SELECTION - culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) + culture_restriction = list(/singleton/origin_item/culture/dionae_nralakk, /singleton/origin_item/culture/eum, /singleton/origin_item/culture/xrim) /datum/gear/accessory/diona/workcloak/New() ..() @@ -256,7 +256,7 @@ 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) - + /datum/gear/suit/sash/diona display_name = "dionae gyazo belt" path = /obj/item/clothing/accessory/unathi @@ -292,10 +292,12 @@ 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) - + /datum/gear/suit/unathi_robe/kilt/diona display_name = "dionae wasteland kilt" path = /obj/item/clothing/suit/unathi/robe/kilt + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" origin_restriction = list(/singleton/origin_item/origin/dionae_wasteland) /datum/gear/uniform/unathi/diona @@ -305,14 +307,14 @@ 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) - + /datum/gear/head/sinta_ronin/diona display_name = "dionae straw hat" path = /obj/item/clothing/head/unathi whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" culture_restriction = list(/singleton/origin_item/culture/dionae_moghes) - + /datum/gear/suit/robe_coat/diona display_name = "dionae tzirzi robe" path = /obj/item/clothing/suit/unathi/robe/robe_coat @@ -320,7 +322,7 @@ whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Diona" culture_restriction = list(/singleton/origin_item/culture/dionae_moghes) - + /datum/gear/eyes/wasteland_goggles/diona display_name = "dionae wasteland goggles" path = /obj/item/clothing/glasses/safety/goggles/wasteland diff --git a/html/changelogs/SimpleMaroon-dionakiltfix.yml b/html/changelogs/SimpleMaroon-dionakiltfix.yml new file mode 100644 index 00000000000..9afe8753263 --- /dev/null +++ b/html/changelogs/SimpleMaroon-dionakiltfix.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Allows Wasteland Dionae to properly spawn with the wasteland kilt and moves it under Xenowear - Diona."