From b830b51a33364f4e975a37f35b0098ed73d76419 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 27 Aug 2021 08:15:44 -0300 Subject: [PATCH] Fixes some Tajaran loadout items (#12394) --- code/game/objects/items/weapons/storage/field_ration.dm | 2 +- .../client/preference_setup/loadout/loadout_xeno/tajara.dm | 5 ++++- code/modules/clothing/under/accessories/xeno/tajara.dm | 2 +- html/changelogs/alberyk-badgefix.yml | 6 ++++++ 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/alberyk-badgefix.yml diff --git a/code/game/objects/items/weapons/storage/field_ration.dm b/code/game/objects/items/weapons/storage/field_ration.dm index 5efd16acfca..7f0f3d7ab05 100644 --- a/code/game/objects/items/weapons/storage/field_ration.dm +++ b/code/game/objects/items/weapons/storage/field_ration.dm @@ -77,7 +77,7 @@ and hunting. It is a common practice for armies to confiscate villages productions, something that can cause resentment among farmers when their lands are occupied by the liberation \ army, to feed their soldiers." -/obj/item/storage/field_ration/dpraa/create_ration() +/obj/item/storage/field_ration/dpra/create_ration() new /obj/item/reagent_containers/food/snacks/explorer_ration(src) new /obj/item/reagent_containers/food/snacks/tajaran_bread(src) new /obj/item/reagent_containers/food/drinks/cans/adhomai_milk(src) 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 a07f2dbc6fc..1cdb44ab750 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -253,6 +253,7 @@ /datum/gear/accessory/tajaran_card display_name = "tajaran cards, badges and pins selection" + description = "A selection of Tajaran related cards, badges and pins." path = /obj/item/clothing/accessory/badge/hadii_card sort_category = "Xenowear - Tajara" whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) @@ -264,11 +265,12 @@ card["honorary party member card"] = /obj/item/clothing/accessory/badge/hadii_card card["almariist pin"] = /obj/item/clothing/accessory/dpra_badge card["royalist badge"] = /obj/item/clothing/accessory/nka_badge - card["free tajaran council badge"] = /obj/item/clothing/accessory/tajara/council_badge + card["free tajaran council badge"] = /obj/item/clothing/accessory/tajaran/council_badge gear_tweaks += new /datum/gear_tweak/path(card) /datum/gear/accessory/tajaranbooks display_name = "tajaran political books" + description = "Tajaran books on the Adhomian ideologies." path = /obj/item/book/manual/pra_manifesto sort_category = "Xenowear - Tajara" whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) @@ -284,6 +286,7 @@ /datum/gear/tajaran_passports display_name = "adhomian passports selection" + description = "A selection of Adhomian passports." path = /obj/item/clothing/accessory/badge/pra_passport sort_category = "Xenowear - Tajara" whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index fa3094b8d28..a6ba3f0772a 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -251,7 +251,7 @@ item_state = "rosette" flippable = FALSE -/obj/item/clothing/accessory/tajara/council_badge +/obj/item/clothing/accessory/tajaran/council_badge name = "free tajaran council badge" desc = "A medal badge used by the members of the Free Tajaran Council." icon_state = "council_badge" diff --git a/html/changelogs/alberyk-badgefix.yml b/html/changelogs/alberyk-badgefix.yml new file mode 100644 index 00000000000..2d938d634f2 --- /dev/null +++ b/html/changelogs/alberyk-badgefix.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the free tajaran council badge having no icon."