diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index 07977a0c05b..e6bd2a7747b 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -243,7 +243,7 @@ /obj/item/clothing/suit/storage/leathercoat, /obj/item/clothing/suit/storage/vest/ft, /obj/item/clothing/suit/storage/toggle/dominia/bomber, - /obj/item/clothing/suit/storage/toggle/dominia/gold, + /obj/item/clothing/suit/storage/dominia/gold, /obj/item/clothing/suit/storage/toggle/flannel, /obj/item/clothing/suit/storage/toggle/flannel/gray, /obj/item/clothing/suit/storage/toggle/flannel/red, diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index c4b7f2e587e..1d9e8a42be6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -273,16 +273,28 @@ datum/gear/suit/colorvest /datum/gear/suit/dominia/New() ..() var/list/coat = list() - coat["dominia great coat, red"] = /obj/item/clothing/suit/storage/toggle/dominia - coat["dominia great coat, gold"] = /obj/item/clothing/suit/storage/toggle/dominia/gold - coat["dominia great coat, black"] = /obj/item/clothing/suit/storage/toggle/dominia/black + coat["dominian coat, red"] = /obj/item/clothing/suit/storage/dominia/coat + coat["dominian coat, gold"] = /obj/item/clothing/suit/storage/dominia/coat/gold + coat["dominian coat, black"] = /obj/item/clothing/suit/storage/dominia/coat/black + coat["dominian great coat, red"] = /obj/item/clothing/suit/storage/dominia + coat["dominian great coat, gold"] = /obj/item/clothing/suit/storage/dominia/gold + coat["dominian great coat, black"] = /obj/item/clothing/suit/storage/dominia/black 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." +/datum/gear/suit/dominia_consular + display_name = "dominian consular officer coat selection" + description = "A selection of coats belonging to the Diplomatic Service." path = /obj/item/clothing/suit/storage/dominia/consular allowed_roles = list("Consular Officer") + flags = GEAR_HAS_DESC_SELECTION + culture_restriction = list(/decl/origin_item/culture/dominia, /decl/origin_item/culture/dominian_unathi, /decl/origin_item/culture/diona_dominia) + +/datum/gear/suit/dominia_consular/New() + ..() + var/list/coat = list() + coat["dominian consular's greatcoat"] = /obj/item/clothing/suit/storage/dominia/consular + coat["dominian consular's coat"] = /obj/item/clothing/suit/storage/dominia/consular/coat + gear_tweaks += new /datum/gear_tweak/path(coat) /datum/gear/suit/fisanduhian_bomber display_name = "fisanduhian bomber jacket selection" diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 8a6e28c3d17..55454787bc9 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -136,33 +136,55 @@ icon_state = "armsman_mantle" item_state = "armsman_mantle" +/obj/item/clothing/suit/storage/dominia + name = "dominian great coat" + desc = "This is a great coat in the style of Dominian nobility. It's the latest fashion across Dominian space." + icon = 'icons/clothing/suits/coats/dominia_noble_coats.dmi' + icon_state = "greatcoat_red" + item_state = "greatcoat_red" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/dominia/gold + icon_state = "greatcoat_gold" + item_state = "greatcoat_gold" + +/obj/item/clothing/suit/storage/dominia/black + icon_state = "greatcoat_black" + item_state = "greatcoat_black" + +/obj/item/clothing/suit/storage/dominia/coat + name = "dominian coat" + desc = "This is a coat in the style of Dominia nobility. It's the latest fashion across Dominian space." + icon_state = "coat_red" + item_state = "coat_red" + +/obj/item/clothing/suit/storage/dominia/coat/gold + icon_state = "coat_gold" + item_state = "coat_gold" + +/obj/item/clothing/suit/storage/dominia/coat/black + icon_state = "coat_black" + item_state = "coat_black" + /obj/item/clothing/suit/storage/dominia/consular - name = "Dominian consular officer's greatcoat" + name = "dominian consular's greatcoat" desc = "A Dominian greatcoat issued to members of His Majesty's Diplomatic Service, designed in the typical Dominian fashion." desc_extended = "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_greatcoat" + item_state = "dominia_consular_greatcoat" + +/obj/item/clothing/suit/storage/dominia/consular/coat + name = "dominian consular's coat" + desc = "A Dominian coat issued to members of His Majesty's Diplomatic Service, designed in the typical Dominian fashion." + desc_extended = "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_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." - icon = 'icons/clothing/suits/coats/dominia_noble_red.dmi' - icon_state = "dominia_noble_red" - item_state = "dominia_noble_red" contained_sprite = TRUE -/obj/item/clothing/suit/storage/toggle/dominia/gold - icon = 'icons/clothing/suits/coats/dominia_noble_gold.dmi' - icon_state = "dominia_noble_gold" - item_state = "dominia_noble_gold" - -/obj/item/clothing/suit/storage/toggle/dominia/black - icon = 'icons/clothing/suits/coats/dominia_noble_black.dmi' - icon_state = "dominia_noble_black" - item_state = "dominia_noble_black" - /obj/item/clothing/suit/storage/toggle/dominia/bomber name = "fisanduhian bomber jacket" desc = "A bomber jacket based off of styles created by Fisanduhian refugees. The double-breasted design works well for insulating \ diff --git a/html/changelogs/mattatlas-coats.yml b/html/changelogs/mattatlas-coats.yml new file mode 100644 index 00000000000..83c66c49a73 --- /dev/null +++ b/html/changelogs/mattatlas-coats.yml @@ -0,0 +1,42 @@ +################################ +# 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: MattAtlas, DasFox, Azlan + +# 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: + - tweak: "Resprited dominian greatcoats, consular greatcoats and consular uniforms." + - rscadd: "Added shorter versions of the dominian greatcoat to the loadout." diff --git a/icons/clothing/suits/coats/dominia_consular_coat.dmi b/icons/clothing/suits/coats/dominia_consular_coat.dmi deleted file mode 100644 index 69b11967cdc..00000000000 Binary files a/icons/clothing/suits/coats/dominia_consular_coat.dmi and /dev/null differ diff --git a/icons/clothing/suits/coats/dominia_noble_black.dmi b/icons/clothing/suits/coats/dominia_noble_black.dmi deleted file mode 100644 index 7addba668ef..00000000000 Binary files a/icons/clothing/suits/coats/dominia_noble_black.dmi and /dev/null differ diff --git a/icons/clothing/suits/coats/dominia_noble_coats.dmi b/icons/clothing/suits/coats/dominia_noble_coats.dmi new file mode 100644 index 00000000000..7ddb33bb7e2 Binary files /dev/null and b/icons/clothing/suits/coats/dominia_noble_coats.dmi differ diff --git a/icons/clothing/suits/coats/dominia_noble_gold.dmi b/icons/clothing/suits/coats/dominia_noble_gold.dmi deleted file mode 100644 index 8a750529fdb..00000000000 Binary files a/icons/clothing/suits/coats/dominia_noble_gold.dmi and /dev/null differ diff --git a/icons/clothing/suits/coats/dominia_noble_red.dmi b/icons/clothing/suits/coats/dominia_noble_red.dmi deleted file mode 100644 index 0d4feac2021..00000000000 Binary files a/icons/clothing/suits/coats/dominia_noble_red.dmi and /dev/null differ diff --git a/icons/clothing/under/uniforms/dominia_consular.dmi b/icons/clothing/under/uniforms/dominia_consular.dmi index 2feb6481325..22b2dd951ce 100644 Binary files a/icons/clothing/under/uniforms/dominia_consular.dmi and b/icons/clothing/under/uniforms/dominia_consular.dmi differ