cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 08:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some Tajaran loadout items (#12394)

Browse Source
This commit is contained in:
Alberyk
2021-08-27 08:15:44 -03:00
committed by GitHub
parent c0d3130e55
commit b830b51a33
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/weapons/storage/field_ration.dm
View File

@@ -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 \ 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." 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/explorer_ration(src)
new /obj/item/reagent_containers/food/snacks/tajaran_bread(src) new /obj/item/reagent_containers/food/snacks/tajaran_bread(src)
new /obj/item/reagent_containers/food/drinks/cans/adhomai_milk(src) new /obj/item/reagent_containers/food/drinks/cans/adhomai_milk(src)

5
code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
View File

@@ -253,6 +253,7 @@
/datum/gear/accessory/tajaran_card /datum/gear/accessory/tajaran_card
display_name = "tajaran cards, badges and pins selection" 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 path = /obj/item/clothing/accessory/badge/hadii_card
sort_category = "Xenowear - Tajara" sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) 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["honorary party member card"] = /obj/item/clothing/accessory/badge/hadii_card
card["almariist pin"] = /obj/item/clothing/accessory/dpra_badge card["almariist pin"] = /obj/item/clothing/accessory/dpra_badge
card["royalist badge"] = /obj/item/clothing/accessory/nka_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) gear_tweaks += new /datum/gear_tweak/path(card)
/datum/gear/accessory/tajaranbooks /datum/gear/accessory/tajaranbooks
display_name = "tajaran political books" display_name = "tajaran political books"
description = "Tajaran books on the Adhomian ideologies."
path = /obj/item/book/manual/pra_manifesto path = /obj/item/book/manual/pra_manifesto
sort_category = "Xenowear - Tajara" sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
@@ -284,6 +286,7 @@
/datum/gear/tajaran_passports /datum/gear/tajaran_passports
display_name = "adhomian passports selection" display_name = "adhomian passports selection"
description = "A selection of Adhomian passports."
path = /obj/item/clothing/accessory/badge/pra_passport path = /obj/item/clothing/accessory/badge/pra_passport
sort_category = "Xenowear - Tajara" sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)

2
code/modules/clothing/under/accessories/xeno/tajara.dm
View File

@@ -251,7 +251,7 @@
item_state = "rosette" item_state = "rosette"
flippable = FALSE flippable = FALSE
/obj/item/clothing/accessory/tajara/council_badge /obj/item/clothing/accessory/tajaran/council_badge
name = "free tajaran council badge" name = "free tajaran council badge"
desc = "A medal badge used by the members of the Free Tajaran Council." desc = "A medal badge used by the members of the Free Tajaran Council."
icon_state = "council_badge" icon_state = "council_badge"

6
html/changelogs/alberyk-badgefix.yml Normal file
View File

@@ -0,0 +1,6 @@
author: Alberyk
delete-after: True
changes:
- bugfix: "Fixed the free tajaran council badge having no icon."