diff --git a/code/modules/background/citizenship/tajara.dm b/code/modules/background/citizenship/tajara.dm index a79494d444f..a4fc5412cad 100644 --- a/code/modules/background/citizenship/tajara.dm +++ b/code/modules/background/citizenship/tajara.dm @@ -92,6 +92,7 @@ glasses = null uniform = /obj/item/clothing/under/tajaran/consular + suit = /obj/item/clothing/suit/storage/toggle/tajaran/consular head = /obj/item/clothing/head/tajaran/consular backpack_contents = list( /obj/item/storage/box/hadii_card = 1, @@ -217,6 +218,7 @@ glasses = null uniform = /obj/item/clothing/under/tajaran/consular/dpra + suit = /obj/item/clothing/suit/storage/toggle/tajaran/consular/dpra head = /obj/item/clothing/head/tajaran/consular/dpra backpack_contents = list( /obj/item/gun/projectile/silenced = 1, @@ -340,6 +342,7 @@ glasses = null uniform = /obj/item/clothing/under/tajaran/consular/nka + suit = /obj/item/clothing/suit/storage/toggle/tajaran/consular/nka head = /obj/item/clothing/head/tajaran/consular/nka backpack_contents = list( /obj/item/folder/blue/nka = 1, diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm index 0916a358844..c35a13bc57a 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -240,23 +240,9 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) var/list/uniform = list() uniform["PRA consular uniform, female"] = /obj/item/clothing/under/tajaran/consular/female uniform["DPRA consular uniform, female"] = /obj/item/clothing/under/tajaran/consular/dpra/female + uniform["NKA consular uniform, female"] = /obj/item/clothing/under/tajaran/consular/nka/female gear_tweaks += new /datum/gear_tweak/path(uniform) -/datum/gear/head/tajara_consular - display_name = "tajaran alternative consular hat selection" - description = "A selection of tajaran alternative consular hats." - path = /obj/item/clothing/head/tajaran/consular/side_cap - whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) - sort_category = "Xenowear - Tajara" - allowed_roles = list("Consular Officer") - -/datum/gear/head/tajara_consular/New() - ..() - var/list/hats = list() - hats["PRA consular service side cap"] = /obj/item/clothing/head/tajaran/consular/side_cap - hats["DPRA consular service side cap"] = /obj/item/clothing/head/tajaran/consular/dpra/side_cap - gear_tweaks += new /datum/gear_tweak/path(hats) - // Archeology set /datum/gear/uniform/archeologist_uniform diff --git a/code/modules/clothing/head/xenos/tajara.dm b/code/modules/clothing/head/xenos/tajara.dm index 646285f7063..ca5ab77e392 100644 --- a/code/modules/clothing/head/xenos/tajara.dm +++ b/code/modules/clothing/head/xenos/tajara.dm @@ -129,31 +129,32 @@ item_state = "nka_sailor_hat" /obj/item/clothing/head/tajaran/consular - name = "consular service cap" - desc = "A service cap worn by the diplomatic service of the People's Republic of Adhomai." + name = "people's republic consular peaked cap" + desc = "A peaked cap worn by the diplomatic service of the People's Republic of Adhomai." icon_state = "pra_consularhat" item_state = "pra_consularhat" - -/obj/item/clothing/head/tajaran/consular/side_cap - name = "consular service side cap" - icon_state = "pra_pilotka" - item_state = "pra_pilotka" + desc_extended = "The People's Republic of Adhomai has enjoyed recognition across the Spur for longer than any other nation on Adhomai. \ + Given the ambitions of the Republic, its Diplomatic Service remains an important part of Hadiist foreign affairs, being seen everywhere \ + from Tau Ceti to the Coalition. The Service's mission is twofold. While ensuring cooperation and cordial affairs with potential trade \ + partners, Consulars are typically expected to assist in intelligence gathering." /obj/item/clothing/head/tajaran/consular/dpra - desc = "A service cap worn by the diplomatic service of the Democratic People's Republic of Adhomai." + name = "democratic people's republic consular beret" + desc = "A beret worn by the diplomatic service of the Democratic People's Republic of Adhomai." icon_state = "dpra_consularhat" item_state = "dpra_consularhat" - -/obj/item/clothing/head/tajaran/consular/dpra/side_cap - name = "consular service side cap" - icon_state = "dpra_pilotka" - item_state = "dpra_pilotka" + desc_extended = "The Democratic People's Republic of Adhomai continues a stance of restrained diplomatic relations. Few nations enjoy a communicative \ + let alone cordial relationship with the rebel nation. However, to achieve its mission in freeing the Tajaran people, off-world or otherwise, the Democratic \ + Republic maintains a small diplomatic service focused entirely on Tajaran communities and little else." /obj/item/clothing/head/tajaran/consular/nka - name = "royal consular hat" - desc = "A fancy hat worn by the diplomatic service of the New Kingdom of Adhomai." + name = "new kingdom consular peaked cap" + desc = "A peaked cap worn by the diplomatic service of the New Kingdom of Adhomai." icon_state = "nka_consularhat" item_state = "nka_consularhat" + desc_extended = "The New Kingdom of Adhomai has seen a rise in its international relations since it revolted in 2450. Having few working relationships, \ + such as the Empire of Dominia, the New Kingdom's approach remains tied to its continued efforts to bring in Megacorporations. While the focus is improving \ + relations for economic benefit, the Diplomatic Service does have an additional duty of aiding the Royalist communities across the Spur." /obj/item/clothing/head/tajaran/archeologist name = "archeologist hat" diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm index 1bdb171948f..10b31459aa3 100644 --- a/code/modules/clothing/suits/xeno/tajara.dm +++ b/code/modules/clothing/suits/xeno/tajara.dm @@ -48,6 +48,43 @@ to produce Human clothes are. There are a few notable branches, the long-coat and fedora \"gangster style\". Leather jacket wearing \"Greaser\" or the popular amongst females, short \ and colorful dress wearing \"Flapper\" variety of clothing." +/obj/item/clothing/suit/storage/toggle/tajaran/consular + name = "people's republic consular coat" + desc = "An olive drab canvas coat used by the Diplomatic Service of the People's Republic of Adhomai. Based upon the same pattern of \ + coats utilized by the Officer Corps, the Diplomatic Service coat simplifies the button pattern as the Service requires less security \ + against the winds and cold of Adhomai." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "pra_consularcoat" + item_state = "pra_consularcoat" + contained_sprite = TRUE + desc_extended = "The People's Republic of Adhomai has enjoyed recognition across the Spur for longer than any other nation on Adhomai. \ + Given the ambitions of the Republic, its Diplomatic Service remains an important part of Hadiist foreign affairs, being seen everywhere \ + from Tau Ceti to the Coalition. The Service's mission is twofold. While ensuring cooperation and cordial affairs with potential trade \ + partners, Consulars are typically expected to assist in intelligence gathering." + +/obj/item/clothing/suit/storage/toggle/tajaran/consular/dpra + name = "democratic people's republic consular coat" + desc = "A black and white canvas coat used by the Diplomatic Service of the Democratic People's Republic of Adhomai. These coats are \ + commonly repurposed Hadiist coats left over by the Second Revolution. Due to the DPRA's stance on foreign affairs, little thought is \ + placed into producing domestic models." + icon_state = "dpra_consularcoat" + item_state = "dpra_consularcoat" + desc_extended = "The Democratic People's Republic of Adhomai continues a stance of restrained diplomatic relations. Few nations enjoy a \ + communicative let alone cordial relationship with the rebel nation. However, to achieve its mission in freeing the Tajaran people, off-world \ + or otherwise, the Democratic Republic maintains a small diplomatic service focused entirely on Tajaran communities and little else." + +/obj/item/clothing/suit/storage/toggle/tajaran/consular/nka + name = "new kingdom consular coat" + desc = "A blue and gold coat used by the Diplomatic Service of the New Kingdom of Adhomai. These coats have only been issued in the \ + past decade as the New Kingdom's economy begins to recover. With the focus on the image of the Kingdom's diplomatic staff, commoners \ + and nobles alike share the same coat when representing the Kingdom abroad." + icon_state = "nka_consularcoat" + item_state = "nka_consularcoat" + desc_extended = "The New Kingdom of Adhomai has seen a rise in its international relations since it revolted in 2450. Having few working \ + relationships, such as the Empire of Dominia, the New Kingdom's approach remains tied to its continued efforts to bring in Megacorporations. \ + While the focus is improving relations for economic benefit, the Diplomatic Service does have an additional duty of aiding the Royalist \ + communities across the Spur." + /obj/item/clothing/suit/storage/tajaran/messa name = "sun sister robe" desc = "A robe worn by the female priests of the S'rand'Marr religion." diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm index 5002d7f0973..87c26ced118 100644 --- a/code/modules/clothing/under/xenos/tajara.dm +++ b/code/modules/clothing/under/xenos/tajara.dm @@ -250,26 +250,40 @@ desc = "An olive uniform used by the diplomatic service of the People's Republic of Adhomai." icon_state = "pra_consular" item_state = "pra_consular" + desc_extended = "The People's Republic of Adhomai has enjoyed recognition across the Spur for longer than any other nation on Adhomai. \ + Given the ambitions of the Republic, its Diplomatic Service remains an important part of Hadiist foreign affairs, being seen everywhere \ + from Tau Ceti to the Coalition. The Service's mission is twofold. While ensuring cooperation and cordial affairs with potential trade \ + partners, Consulars are typically expected to assist in intelligence gathering." /obj/item/clothing/under/tajaran/consular/female - icon_state = "pra_con_f" - item_state = "pra_con_f" + icon_state = "pra_consular_f" + item_state = "pra_consular_f" /obj/item/clothing/under/tajaran/consular/dpra name = "democratic people's republic consular uniform" desc = "A grey uniform used by the diplomatic service of the Democratic People's Republic of Adhomai." icon_state = "dpra_consular" item_state = "dpra_consular" + desc_extended = "The Democratic People's Republic of Adhomai continues a stance of restrained diplomatic relations. Few nations enjoy a communicative \ + let alone cordial relationship with the rebel nation. However, to achieve its mission in freeing the Tajaran people, off-world or otherwise, the Democratic \ + Republic maintains a small diplomatic service focused entirely on Tajaran communities and little else." /obj/item/clothing/under/tajaran/consular/dpra/female - icon_state = "dpra_con_f" - item_state = "dpra_con_f" + icon_state = "dpra_consular_f" + item_state = "dpra_consular_f" /obj/item/clothing/under/tajaran/consular/nka name = "new kingdom consular uniform" - desc = "A blue uniform used by the diplomatic service of the New Kingdom of Adhomai." + desc = "A blue and white uniform used by the diplomatic service of the New Kingdom of Adhomai." icon_state = "nka_consular" item_state = "nka_consular" + desc_extended = "The New Kingdom of Adhomai has seen a rise in its international relations since it revolted in 2450. Having few working relationships, \ + such as the Empire of Dominia, the New Kingdom's approach remains tied to its continued efforts to bring in Megacorporations. While the focus is improving \ + relations for economic benefit, the Diplomatic Service does have an additional duty of aiding the Royalist communities across the Spur." + +/obj/item/clothing/under/tajaran/consular/nka/female + icon_state = "nka_consular_f" + item_state = "nka_consular_f" /obj/item/clothing/under/tajaran/dpra name = "al'mariist laborer clothes" diff --git a/html/changelogs/ElorgRHG-tajaran-consular-sprites.yml b/html/changelogs/ElorgRHG-tajaran-consular-sprites.yml new file mode 100644 index 00000000000..6c54850469b --- /dev/null +++ b/html/changelogs/ElorgRHG-tajaran-consular-sprites.yml @@ -0,0 +1,17 @@ +# Your name. +author: ElorgRHG + +# 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: + - imageadd: "Resprited all Tajaran consular clothing." + - rscadd: "Added a female version of the NKA consular uniform." + - rscadd: "Added Tajaran consular coats." + - rscadd: "Added extended descriptions to all Tajaran consular clothing items." + - rscdel: "Removed Tajaran consular side caps." diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 2bc2ebf17aa..c3b7d127a5c 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ