diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index be31233d33e..64cb00674f6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -503,4 +503,34 @@ accessory["DPRA medal for the liberation of gakal'zaal"] = /obj/item/clothing/accessory/medal/gakalzaal_liberation accessory["NKA medal for the defense of the kingdom"] = /obj/item/clothing/accessory/medal/kingdom_defense accessory["NKA medal for the harr'masir offensive"] = /obj/item/clothing/accessory/medal/harrmasir_offensive - gear_tweaks += new /datum/gear_tweak/path(accessory) \ No newline at end of file + gear_tweaks += new /datum/gear_tweak/path(accessory) + +/datum/gear/uniform/tajara_consular + display_name = "tajaran alternative consular uniform selection" + description = "A selection of tajaran alternative consular uniforms." + path = /obj/item/clothing/under/tajaran/consular/female + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + allowed_roles = list("Consular Officer") + sort_category = "Xenowear - Tajara" + +/datum/gear/uniform/tajara_consular/New() + ..() + 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 + 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) \ No newline at end of file diff --git a/code/modules/clothing/head/xenos/tajara.dm b/code/modules/clothing/head/xenos/tajara.dm index cefecfaa287..46d6a6cb689 100644 --- a/code/modules/clothing/head/xenos/tajara.dm +++ b/code/modules/clothing/head/xenos/tajara.dm @@ -131,11 +131,21 @@ 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" + /obj/item/clothing/head/tajaran/consular/dpra desc = "A service cap 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" + /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." diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm index 18b05900c6d..55df9a524e7 100644 --- a/code/modules/clothing/under/xenos/tajara.dm +++ b/code/modules/clothing/under/xenos/tajara.dm @@ -251,12 +251,20 @@ icon_state = "pra_consular" item_state = "pra_consular" +/obj/item/clothing/under/tajaran/consular/female + icon_state = "pra_con_f" + item_state = "pra_con_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" +/obj/item/clothing/under/tajaran/consular/dpra/female + icon_state = "dpra_con_f" + item_state = "dpra_con_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." diff --git a/html/changelogs/alberyk-consularuniform.yml b/html/changelogs/alberyk-consularuniform.yml new file mode 100644 index 00000000000..396277ebbb0 --- /dev/null +++ b/html/changelogs/alberyk-consularuniform.yml @@ -0,0 +1,6 @@ +author: Alberyk, Suethecake + +delete-after: True + +changes: + - rscadd: "Added some alternative uniforms and hats for the PRA and DPRA consular officers." \ No newline at end of file diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 6b01e7ce96b..a6eb923dc8e 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ