From e182e812cc4b9d843a13d0cef037fdc81cef0601 Mon Sep 17 00:00:00 2001 From: listerla <57296132+listerla@users.noreply.github.com> Date: Tue, 2 Aug 2022 06:40:31 -0400 Subject: [PATCH] Fixed religious items not showing up in character setup (#14537) --- .../loadout/loadout_religion.dm | 24 +++++++++++++++---- html/changelogs/religionpreview.yml | 6 +++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/religionpreview.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm index cc0715e84b8..afc52b12894 100644 --- a/code/modules/client/preference_setup/loadout/loadout_religion.dm +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -1,17 +1,20 @@ /datum/gear/religion display_name = "trinary perfection robes" path = /obj/item/clothing/suit/trinary_robes + slot = slot_w_uniform sort_category = "Religion" flags = GEAR_HAS_DESC_SELECTION /datum/gear/religion/trinary/mask display_name = "trinary perfection mask" path = /obj/item/clothing/mask/trinary_mask + slot = slot_wear_mask /datum/gear/religion/trinary/cape display_name = "trinary perfection cape selection" description = "A selection of capes worn by adherents to the Trinary Perfection." path = /obj/item/clothing/accessory/poncho/trinary + slot = slot_wear_suit /datum/gear/religion/trinary/cape/New() ..() @@ -24,6 +27,7 @@ /datum/gear/religion/trinary/badge display_name = "trinary perfection brooch" path = /obj/item/clothing/accessory/badge/trinary + slot = slot_tie /datum/gear/religion/trinary/book display_name = "The Order" @@ -33,14 +37,12 @@ /datum/gear/religion/rosary display_name = "rosary" path = /obj/item/clothing/accessory/rosary - -/datum/gear/religion/rosary - display_name = "rosary" - path = /obj/item/clothing/accessory/rosary + slot = slot_tie /datum/gear/religion/shintorobe display_name = "shrine maiden robe" path = /obj/item/clothing/under/konyangdresstraditional/red + slot = slot_w_uniform /datum/gear/religion/kippah display_name = "kippah" @@ -53,6 +55,7 @@ display_name = "dominian robe selection" description = "A selection of robes belonging to Dominia's Moroz Holy Tribunal." path = /obj/item/clothing/under/dominia/priest + slot = slot_w_uniform culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia) /datum/gear/religion/dominia/robe/New() @@ -66,6 +69,7 @@ display_name = "dominian beret selection" description = "A selection of modified berets belonging to Dominia's Moroz Holy Tribunal." path = /obj/item/clothing/under/dominia/priest + slot= slot_head culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia) /datum/gear/religion/dominia/beret/New() @@ -79,6 +83,7 @@ display_name = "dominian outerwear selection" description = "A selection of capes and outerwear worn by the Moroz Holy Tribunal." path = /obj/item/clothing/under/dominia/priest + slot = slot_wear_suit culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia) /datum/gear/religion/dominia/cape/New() @@ -93,6 +98,7 @@ display_name = "assunzione robe selection" description = "A selection of robes worn by adherents to Luceism." path = /obj/item/clothing/accessory/poncho/assunzione + slot = slot_wear_suit origin_restriction = list(/decl/origin_item/origin/assunzione, /decl/origin_item/origin/ipc_assunzione) /datum/gear/religion/assunzione/robe/New() @@ -106,28 +112,34 @@ /datum/gear/religion/dominia/accessory display_name = "tribunal necklace" path = /obj/item/clothing/accessory/dominia + slot = slot_tie + culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia) /datum/gear/religion/dominia/medical display_name = "tribunalist medical beret" path = /obj/item/clothing/head/beret/dominia/medical + slot = slot_head allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern") culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia) /datum/gear/religion/shaman_staff display_name = "shaman staff" path = /obj/item/cane/shaman + slot = slot_l_hand /datum/gear/religion/dominia/robe_consular display_name = "tribunalist consular uniform" description = "The traditional red-black-gold uniform of a priestly member of His Majesty's Diplomatic Service." path = /obj/item/clothing/under/dominia/priest/consular + slot = slot_w_uniform allowed_roles = list("Consular Officer") culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia) /datum/gear/religion/dominia/beret_consular display_name = "tribunalist consular beret" - description = "A n elegant and well-tailored gold-and-red beret worn by priestly members of His Majesty's Diplomatic Service." + description = "An elegant and well-tailored gold-and-red beret worn by priestly members of His Majesty's Diplomatic Service." path = /obj/item/clothing/head/beret/dominia/consular + slot = slot_head allowed_roles = list("Consular Officer") culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia) @@ -135,12 +147,14 @@ display_name = "tribunalist cousular cape" description = "A truly majestic gold and red cape worn by members of the clergy affiliated with His Majesty's Diplomatic Service." path = /obj/item/clothing/accessory/poncho/dominia/consular + slot = slot_wear_suit allowed_roles = list("Consular Officer") culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia) /datum/gear/religion/assunzione/accessory display_name = "luceian amulet" path = /obj/item/clothing/accessory/assunzione + slot = slot_tie origin_restriction = list(/decl/origin_item/origin/assunzione, /decl/origin_item/origin/ipc_assunzione) /datum/gear/religion/assunzioneorb diff --git a/html/changelogs/religionpreview.yml b/html/changelogs/religionpreview.yml new file mode 100644 index 00000000000..1c37dc733ce --- /dev/null +++ b/html/changelogs/religionpreview.yml @@ -0,0 +1,6 @@ +author: listerla + +delete-after: True + +changes: + - bugfix: "Fixed religious items not showing up in character setup." \ No newline at end of file