diff --git a/.gitignore b/.gitignore index a233a2a2a2b..20e6a5b53aa 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,4 @@ __pycache__/ *$py.class /.atom-build.json .vscode/ -.vs/ +.vs/ \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 633658be241..4d46de882ec 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -293,6 +293,22 @@ gadpathur["medical cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur/med gear_tweaks += new/datum/gear_tweak/path(gadpathur) +/datum/gear/accessory/dominia/sash + display_name = "dominian house sash selection" + description = "A selection of sashes representing the Great Houses of Dominia." + path = /obj/item/clothing/accessory/dominia/sash + +/datum/gear/accessory/dominia/sash/New() + ..() + var/dominia = list() + dominia["dominian sash"] = /obj/item/clothing/accessory/dominia/sash + dominia["strelitz sash"] = /obj/item/clothing/accessory/dominia/sash/strelitz + dominia["volvalaad sash"] = /obj/item/clothing/accessory/dominia/sash/volvalaad + dominia["kazhkz sash"] = /obj/item/clothing/accessory/dominia/sash/kazhkz + dominia["caladius sash"] = /obj/item/clothing/accessory/dominia/sash/caladius + dominia["zhao sash"] =/obj/item/clothing/accessory/dominia/sash/zhao + gear_tweaks += new/datum/gear_tweak/path(dominia) + /datum/gear/accessory/passcard display_name = "human passcard selection" path = /obj/item/clothing/accessory/badge/passcard diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index ddfaec3e7fa..3b14802e748 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -327,3 +327,8 @@ display_name = "fisanduhian ushanka" path = /obj/item/clothing/head/ushanka/dominia flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/head/dominia_consular + display_name = "dominian consular cap" + path = /obj/item/clothing/head/dominia + allowed_roles = list("Consular Officer") diff --git a/code/modules/client/preference_setup/loadout/loadout_religion.dm b/code/modules/client/preference_setup/loadout/loadout_religion.dm index 256630da567..d8cf691d9fc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_religion.dm +++ b/code/modules/client/preference_setup/loadout/loadout_religion.dm @@ -65,6 +65,28 @@ display_name = "tribunal necklace" path = "/obj/item/clothing/accessory/dominia" +/datum/gear/religion/shaman_staff + display_name = "shaman staff" + path = /obj/item/cane/shaman + +/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 + allowed_roles = list("Consular Officer") + +/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." + path = /obj/item/clothing/head/beret/dominia/consular + allowed_roles = list("Consular Officer") + +/datum/gear/religion/dominia/cape_consular + 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 + allowed_roles = list("Consular Officer") + /datum/gear/religion/assunzione/accessory display_name = "luceian amulet" path = "/obj/item/clothing/accessory/assunzione" @@ -77,4 +99,4 @@ /datum/gear/religion/assunzionesheath display_name = "assunzione warding sphere sheath" description = "A small metal shell designed to hold a warding sphere." - path = "/obj/item/storage/assunzionesheath" \ No newline at end of file + path = "/obj/item/storage/assunzionesheath" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 20f1f8473c2..7048007c572 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -299,6 +299,12 @@ coat["dominian bomber jacket"] = /obj/item/clothing/suit/storage/toggle/dominia/bomber gear_tweaks += new/datum/gear_tweak/path(coat) +/datum/gear/suit/dominia/consular + display_name = "dominian consular officer greatcoat" + description = "A Dominian great coat belonging to the Diplomatic Service." + path = /obj/item/clothing/suit/storage/dominia/consular + allowed_roles = list("Consular Officer") + /datum/gear/suit/tcfl display_name = "Tau Ceti Foreign Legion jacket selection" description = "A selection of fine, surplus jackets of the Foreign Legion." @@ -410,4 +416,4 @@ /datum/gear/suit/gadpathur display_name = "gadpathurian overcoat" path = /obj/item/clothing/suit/storage/gadpathur - flags = GEAR_HAS_DESC_SELECTION + flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index b9e73c44c6a..d8bde7020e2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -240,6 +240,19 @@ suit["[D.name]"] = D.type gear_tweaks += new/datum/gear_tweak/path(suit) +/datum/gear/uniform/dominia_consular + display_name = "dominian consular clothing selection" + description = "A selection of Dominian clothing belonging to the Diplomatic Service." + path = /obj/item/clothing/under/dominia/consular + allowed_roles = list("Consular Officer") + +/datum/gear/uniform/dominia_consular/New() + ..() + var/list/consular = list() + consular["dominian consular officer's uniform, masculine"] = /obj/item/clothing/under/dominia/consular + consular["dominian consular officer's uniform, feminine"] = /obj/item/clothing/under/dominia/consular/dress + gear_tweaks += new/datum/gear_tweak/path(consular) + /datum/gear/uniform/elyra_holo display_name = "elyran holographic suit selection" description = "A marvel of Elyran technology, uses hardlight fabric and masks to transform a skin-tight, cozy suit into cultural apparel of your choosing. Has a dial for Midenean, Aemaqii and Persepolis clothes respectively." diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 46f078dc677..ef9ce82e515 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -79,6 +79,15 @@ icon_state = "zhao_cape" item_state = "zhao_cape" +/obj/item/clothing/suit/storage/dominia/consular + name = "Dominian consular officer's greatcoat" + desc = "A Dominian greatcoat issued to members of His Majesty's Diplomatic Service, designed in the typical Dominian fashion." + desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though \ + the Service also employs many commoners - as long as they can pass the rigorous examinations required to become a full member." + icon = 'icons/clothing/suits/coats/dominia_consular_coat.dmi' + icon_state = "dominia_consular_coat" + item_state = "dominia_consular_coat" + /obj/item/clothing/suit/storage/toggle/dominia name = "dominia great coat" desc = "This is a great coat in the style of Dominia nobility. It's the latest fashion across Dominian space." @@ -304,6 +313,35 @@ update_icon() update_clothing_icon() +/obj/item/clothing/accessory/poncho/dominia/consular + name = "tribunalist consular's cape" + desc = "A truly majestic gold and red cape worn by members of the clergy affiliated with His Majesty's Diplomatic Service." + desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also \ + employs may commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service." + icon = 'icons/clothing/suits/capes/dominia_consular_cape.dmi' + icon_state = "dominia_cape_consular" + item_state = "dominia_cape_consular" + overlay_state = "dominia_cape_consular" + contained_sprite = TRUE + icon_override = null + var/rolled = FALSE + +/obj/item/clothing/under/dominia/consular + name = "dominian consular officer's uniform" + desc = "The traditional red-black-gold uniform of a member of His Majesty's Diplomatic Service." + desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many \ + commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service." + icon = 'icons/clothing/under/uniforms/dominia_consular.dmi' + icon_state = "dominia_consular" + item_state = "dominia_consular" + +/obj/item/clothing/under/dominia/consular/dress + name = "dominian consular officer's uniform" + desc = "The traditional red-black-gold uniform of a member of His Majesty's Diplomatic Service. This variant has a skirt, for the female diplomat on the go." + icon = 'icons/clothing/under/uniforms/dominia_consular.dmi' + icon_state = "dominia_consular_fem" + item_state = "dominia_consular_fem" + /obj/item/clothing/under/dominia/initiate name = "tribunal initiate's robe" desc = "A simple white robe with red trim and a red sash to fasten it. It's commonly worn by initiates of the Moroz Holy Tribunal." @@ -327,6 +365,26 @@ item_state = "dominia_priest" slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING +/obj/item/clothing/under/dominia/priest/consular + name = "tribunalist consular's uniform" + desc = "The traditional red-black-gold uniform of a priestly member of His Majesty's Diplomatic Service." + desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many commoners \ + - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service." + icon = 'icons/clothing/under/uniforms/dominia_consular_priest.dmi' + icon_state = "dominia_consular_priest" + item_state = "dominia_consular_priest" + slot_flags = SLOT_OCLOTHING | SLOT_ICLOTHING + +/obj/item/clothing/head/dominia + name = "dominian consular officer's dress cap" + desc = "A quite fashionable cap issued to the members of His Majesty's Diplomatic Service." + desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs many \ + commoners - as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service." + icon = 'icons/clothing/head/dominia_consular_cap.dmi' + icon_state = "dominia_consular_cap" + item_state = "dominia_consular_cap" + contained_sprite = TRUE + /obj/item/clothing/head/beret/dominia name = "tribunal initiate's beret" desc = "A simple red beret with a golden badge marking its wearer as an initiate of the Moroz Holy Tribunal." @@ -345,6 +403,15 @@ icon_state = "dominia_beret_priest" item_state = "dominia_beret_priest" +/obj/item/clothing/head/beret/dominia/consular + name = "tribunalist’s beret" + desc = "A beret in gold and red worn by members of the clergy affiliated with His Majesty's Diplomatic Service." + desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs may commoners - \ + as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service." + icon = 'icons/clothing/head/dominia_beret_consular.dmi' + icon_state = "dominia_beret_consular_priest" + item_state = "dominia_beret_consular_priest" + /obj/item/clothing/accessory/dominia name = "tribunal necklace" desc = "An amulet depicting 'The Eye', a prominent symbol of the Moroz Holy Tribunal worn by its clergy and layfolk alike." @@ -366,8 +433,8 @@ name = "Morozi dress" desc = "Feminine commoner's fashion from the Empire of Dominia. This particular variant has sleeves." desc_fluff = "Dresses such as this one are a common sight in the more developed colonies of the Empire of Dominia, and their origins can be traced back to \ - the fashion houses of Nova Luxembourg. While both sleeved and sleeveless variants exist, the sleeved one is far more common \ - due to the often frigid temperatures of Moroz." + the fashion houses of Nova Luxembourg. While both sleeved and sleeveless variants exist, the sleeved one is far more common \ + due to the often frigid temperatures of Moroz." icon = 'icons/clothing/under/uniforms/dominia_dresses.dmi' icon_state = "morozi_dress" item_state = "morozi_dress" @@ -441,4 +508,42 @@ name = "sleeveless house kazhkz Morozi dress" house = "kazhkz" +/obj/item/clothing/accessory/dominia/sash + name = "dominian sash" + desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one seems to represent Dominia as a whole, however." + desc_fluff = "Sashes such as this one are a common sight throughout the Empire of Dominia, though they are hardly as fashionable as the typical cape. While they are \ + often used in formal uniforms - such as for attendants and domestic staff - these sashes can also be found used in positions where wearing a cape is impractical, such as the medical field." + icon = 'icons/clothing/accessories/dominia_sash.dmi' + item_state = "dominia_sash" + icon_state = "dominia_sash" + contained_sprite = TRUE +/obj/item/clothing/accessory/dominia/sash/strelitz + name = "strelitz sash" + desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Strelitz." + item_state = "strelitz_sash" + icon_state = "strelitz_sash" + +/obj/item/clothing/accessory/dominia/sash/volvalaad + name = "volvalaad sash" + desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Volvalaad." + item_state = "volvalaad_sash" + icon_state = "volvalaad_sash" + +/obj/item/clothing/accessory/dominia/sash/kazhkz + name = "kazhkz sash" + desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Kazhkz." + item_state = "kazhkz_sash" + icon_state = "kazhkz_sash" + +/obj/item/clothing/accessory/dominia/sash/caladius + name = "caladius sash" + desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Caladius." + item_state = "caladius_sash" + icon_state = "caladius_sash" + +/obj/item/clothing/accessory/dominia/sash/zhao + name = "zhao sash" + desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Zhao." + item_state = "zhao_sash" + icon_state = "zhao_sash" \ No newline at end of file diff --git a/html/changelogs/stryker-dominia.yml b/html/changelogs/stryker-dominia.yml new file mode 100644 index 00000000000..1d31b87637c --- /dev/null +++ b/html/changelogs/stryker-dominia.yml @@ -0,0 +1,8 @@ +author: NewOriginalSchwann, DasFox + +delete-after: True + +changes: + - rscadd: "Adds a consular-restricted Tribunalist priest outfit, beret, and cape in the loadout religion tab." + - rscadd: "Adds Dominian House sashes to the loadout accessories tab." + - rscadd: "Adds a Dominian consular greatcoat, hat, and uniform to the loadout suits, hats, and uniforms tab respectively." \ No newline at end of file diff --git a/icons/clothing/accessories/dominia_sash.dmi b/icons/clothing/accessories/dominia_sash.dmi new file mode 100644 index 00000000000..b97559942e2 Binary files /dev/null and b/icons/clothing/accessories/dominia_sash.dmi differ diff --git a/icons/clothing/head/dominia_beret_consular.dmi b/icons/clothing/head/dominia_beret_consular.dmi new file mode 100644 index 00000000000..bd416805e5e Binary files /dev/null and b/icons/clothing/head/dominia_beret_consular.dmi differ diff --git a/icons/clothing/head/dominia_consular_cap.dmi b/icons/clothing/head/dominia_consular_cap.dmi new file mode 100644 index 00000000000..12ec274f908 Binary files /dev/null and b/icons/clothing/head/dominia_consular_cap.dmi differ diff --git a/icons/clothing/suits/capes/dominia_consular_cape.dmi b/icons/clothing/suits/capes/dominia_consular_cape.dmi new file mode 100644 index 00000000000..83477edea11 Binary files /dev/null and b/icons/clothing/suits/capes/dominia_consular_cape.dmi differ diff --git a/icons/clothing/suits/coats/dominia_consular_coat.dmi b/icons/clothing/suits/coats/dominia_consular_coat.dmi new file mode 100644 index 00000000000..69b11967cdc Binary files /dev/null and b/icons/clothing/suits/coats/dominia_consular_coat.dmi differ diff --git a/icons/clothing/under/uniforms/dominia_consular.dmi b/icons/clothing/under/uniforms/dominia_consular.dmi new file mode 100644 index 00000000000..2feb6481325 Binary files /dev/null and b/icons/clothing/under/uniforms/dominia_consular.dmi differ diff --git a/icons/clothing/under/uniforms/dominia_consular_priest.dmi b/icons/clothing/under/uniforms/dominia_consular_priest.dmi new file mode 100644 index 00000000000..cda40b29c77 Binary files /dev/null and b/icons/clothing/under/uniforms/dominia_consular_priest.dmi differ