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 88917aec4c5..3529a604201 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -54,7 +54,7 @@ coat["tajaran naval coat"] = /obj/item/clothing/suit/storage/toggle/tajaran coat["gruff cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran coat["adhomian wool coat"] = /obj/item/clothing/suit/storage/toggle/tajaran/wool - coat["Raakti Shariim coat"] = /obj/item/clothing/suit/storage/toggle/tajaran/raakti_shariim + coat["raakti shariim coat"] = /obj/item/clothing/suit/storage/toggle/tajaran/raakti_shariim gear_tweaks += new /datum/gear_tweak/path(coat) /datum/gear/suit/tajara_cloak @@ -86,7 +86,7 @@ robes["sun priest robe"] = /obj/item/clothing/suit/storage/hooded/tajaran/priest robes["sun sister robe"] = /obj/item/clothing/suit/storage/tajaran/messa robes["matake priest mantle"] = /obj/item/clothing/suit/storage/tajaran/matake - robes["Azubarre priest robes"] = /obj/item/clothing/suit/storage/tajaran/azubarre + robes["azubarre priest robes"] = /obj/item/clothing/suit/storage/tajaran/azubarre gear_tweaks += new /datum/gear_tweak/path(robes) /datum/gear/suit/tajaran_labcoat @@ -115,12 +115,12 @@ var/list/uniform = list() uniform["laborers clothes"] = /obj/item/clothing/under/tajaran uniform["fancy uniform"] = /obj/item/clothing/under/tajaran/fancy - uniform["NanoTrasen overalls"] = /obj/item/clothing/under/tajaran/nt + uniform["nanotrasen overalls"] = /obj/item/clothing/under/tajaran/nt uniform["matake priest garments"] = /obj/item/clothing/under/tajaran/matake uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer uniform["adhomian summer pants"] = /obj/item/clothing/under/pants/tajaran uniform["machinist uniform"] = /obj/item/clothing/under/tajaran/mechanic - uniform["Raakti Shariim uniform"] = /obj/item/clothing/under/tajaran/raakti_shariim + uniform["raakti shariim uniform"] = /obj/item/clothing/under/tajaran/raakti_shariim gear_tweaks += new /datum/gear_tweak/path(uniform) /datum/gear/uniform/tajara_dress @@ -197,6 +197,11 @@ circlet["fur hat"] = /obj/item/clothing/head/tajaran/fur circlet["matake priest hat"] = /obj/item/clothing/head/tajaran/matake circlet["raakti shariim beret"] = /obj/item/clothing/head/beret/tajaran/raakti_shariim + circlet["hadiist army beret"] = /obj/item/clothing/head/beret/tajaran/pra + circlet["liberation army beret"] = /obj/item/clothing/head/beret/tajaran/dpra + circlet["liberation army beret, alternative"] = /obj/item/clothing/head/beret/tajaran/dpra/alt + circlet["new kingdom naval beret"] = /obj/item/clothing/head/beret/tajaran/nka + circlet["new kingdom naval officer beret"] = /obj/item/clothing/head/beret/tajaran/nka/officer gear_tweaks += new /datum/gear_tweak/path(circlet) /datum/gear/accessory/tajara_wrap @@ -252,7 +257,7 @@ sort_category = "Xenowear - Tajara" /datum/gear/accessory/tajaran_card - display_name = "tajaran cards, badges and pins selection" + display_name = "tajaran faction 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" @@ -358,4 +363,36 @@ charm["tajani charm"] = /obj/item/clothing/accessory/tajaran/charm/tajani charm["holy sun rosette"] = /obj/item/clothing/accessory/tajaran/srendarr gear_tweaks += new /datum/gear_tweak/path(charm) - \ No newline at end of file + +/datum/gear/accessory/dpra_party_pin + display_name = "democratic people's republic party pins selection" + description = "A selection of DPRA party pins." + path = /obj/item/clothing/accessory/tajaran/nawparty_pin + sort_category = "Xenowear - Tajara" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/dpra_party_pin/New() + ..() + var/list/card = list() + card["national adhomai workers party pin"] = /obj/item/clothing/accessory/tajaran/nawparty_pin + card["free tajaran people party pin"] = /obj/item/clothing/accessory/tajaran/ftpparty_pin + card["followers of Nated party pin"] = /obj/item/clothing/accessory/tajaran/fonparty_pin + card["adhomian blue party pin"] = /obj/item/clothing/accessory/tajaran/abparty_pin + card["amohdan free lodge party pin"] = /obj/item/clothing/accessory/tajaran/aflparty_pin + gear_tweaks += new /datum/gear_tweak/path(card) + +/datum/gear/accessory/tajaran_gen_accessorry + display_name = "tajaran accessories selection" + description = "A selection of tajaran related accessories." + path = /obj/item/clothing/accessory/tajaran/zbrojny_badge + sort_category = "Xenowear - Tajara" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/tajaran_gen_accessorry/New() + ..() + var/list/card = list() + card["zbrojny badge"] = /obj/item/clothing/accessory/tajaran/zbrojny_badge + card["golden sun pin"] = /obj/item/clothing/accessory/tajaran/tanker_pin + gear_tweaks += new /datum/gear_tweak/path(card) \ 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 d1a825648c1..b3dd3aa4d81 100644 --- a/code/modules/clothing/head/xenos/tajara.dm +++ b/code/modules/clothing/head/xenos/tajara.dm @@ -53,31 +53,41 @@ icon_state = "raskara_mask" item_state = "raskara_mask" -/obj/item/clothing/head/beret/tajaran/pra - name = "republican army beret" - desc = "A green beret issued to republican soldiers." +/obj/item/clothing/head/beret/tajaran icon = 'icons/obj/tajara_items.dmi' + contained_sprite = TRUE + +/obj/item/clothing/head/beret/tajaran/pra + name = "hadiist army beret" + desc = "A green beret issued to hadiist soldiers." icon_state = "praberet" item_state = "praberet" - contained_sprite = TRUE /obj/item/clothing/head/beret/tajaran/dpra name = "liberation army beret" desc = "A beret issued to liberation army soldiers." - icon = 'icons/obj/tajara_items.dmi' icon_state = "alaberet" item_state = "alaberet" - contained_sprite = TRUE /obj/item/clothing/head/beret/tajaran/dpra/alt icon_state = "alaberetalt" item_state = "alaberetalt" +/obj/item/clothing/head/beret/tajaran/nka + name = "new kingdom naval beret" + desc = "A formal black beret with a blue band. This is worn by NKA naval servicemen and crewmen such as the Imperial Marines." + icon_state = "navalberetblue" + item_state = "navalberetblue" + +/obj/item/clothing/head/beret/tajaran/nka/officer + name = "new kingdom naval officer beret" + desc = "A formal black beret with a golden band. This is worn by members of the NKA naval officer corps. These are prized in the New Kingdom thanks to the Navy's popularity." + icon_state = "navalberetofficer" + item_state = "navalberetofficer" + /obj/item/clothing/head/beret/tajaran/raakti_shariim name = "\improper Raakti Shariim beret" desc = "A blue beret with a pale-gold twin-suns insignia, signifying a Constable of the NKA's Raakti Shariim." - icon = 'icons/obj/tajara_items.dmi' - contained_sprite = TRUE icon_state = "raakti_shariim_beret" item_state = "raakti_shariim_beret" desc_fluff = "The Raakti Shariim (Royal Peacekeepers in Ceti Basic) are the New Kingdom of Adhomai's policing and \ diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index 7617a2c1201..89a0058d9c8 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -339,3 +339,104 @@ desc = "A hand carved charm of one of the mythical tajani." desc_fluff = "Tajani, also known as 'short people' in basic, are good-willed tiny elder Tajara who serve as guardians of nature and homes. \ Hand carved charms of them is considered a symbol of luck and as such many superstitious tajara keeps one around." + +/obj/item/clothing/accessory/tajaran/tanker_pin + name = "golden sun pin" + desc = "Given to all members of the Hro'rammad tank corps is this sun pin. It is considered a symbol of how the tanker corps is the wrath of the God S'rendarr. Its rays are sharp not \ + just so it can be easily pinned but also to represent how the tankers are the blades of S'rendarr himself. " + icon_state = "tanker_pin" + item_state = "tanker_pin" + overlay_state = "tanker_pin" + desc_fluff = "Lead by the famously merciful Commander Kahan Hro'rammhad, the Hro'rammhad Tank Corps has the distinction of being the most powerful and accomplished armored unit in the history \ + of Adhomai. These elite Armored Kazarrhaldiye Tajara are used primarily in offensive operations to break through opposing lines and encircle their positions. Their tanks have exceptionally \ + wide tracks which allow them to more easily tread across snowy terrains. Veterans of the Hro'rammhad Tank Corps are known for their golden pins depicting the sun-god S'rendarr which they wear on their uniforms." + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/tajaran/zbrojny_badge + name = "zbrojny badge" + desc = "A small badge given to people who enter the Intelligence Service's Zbrojny program. The siik'mas \"Z\" character has 3 studs underneath it to designate this person as having fully completed the program." + icon_state = "zbrojny_badge" + item_state = "zbrojny_badge" + overlay_state = "zbrojny_badge" + desc_fluff = "Seeking to replicate the success of the Liberation Army guerrillas, the Zbrojny is a partisan force created after the Armistice. The Zbrojny is made up of loyal Hadiist \ + volunteers from the civilian population. Trained by the People's Strategic Intelligence Service in guerilla tactics, they are meant to act behind enemy lines in occupied territory. \ + Unlike all branches of the Grand People's Army, the Partisans are under the direct control of the secret service." + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +//dpra party badges + +/obj/item/clothing/accessory/tajaran/abparty_pin + name = "adhomian blue party pin" + desc = "A pin of the Adhomian Blue Party. This symbol is a white hoe on a blue background representing the party's dedication to environmentalism and ruralism." + icon_state = "abparty_pin" + item_state = "abparty_pin" + overlay_state = "abparty_pin" + desc_fluff = "The Adhomian Blue party is formed by farmers and students. Instead of worrying about the Armistice or the composition of the government, their main goal is to preserve the environment of \ + Adhomai. Industrialization and armed conflict are considered a major threat to the nature and beauty of the planet. Members of this organization are also vehemently opposed to the presence \ + of NanoTrasen. The organization is currently divided between environmentalists and Al'mariist ruralists." + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/tajaran/fonparty_pin + name = "followers of Nated party pin" + desc = "A pin of the Followers of Nated. The pin is split down the middle with the golden yellow reflecting S'rendarr and the pale blue reflecting Messa. A black Spear of Mata'ke is laid overtop." + icon_state = "fonparty_pin" + item_state = "fonparty_pin" + overlay_state = "fonparty_pin" + desc_fluff = "The Followers of Nated is an organization formed by fanatical supporters of Nated who claim he is a divine avatar of the Suns or Mata'ke. They support a dictatorship under the guidance of Halkiikijr \ + Nated'Hakhan, stripping away any semblance of democracy from the Democratic People's Republic. Members of this party oppose any form of peace or negotiation with the other Tajaran factions, \ + or diplomacy with alien powers. They are known for hosting the most radical elements of DPRA's political scenario." + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/tajaran/ftpparty_pin + name = "free tajaran people party pin" + desc = "A pin of the Free Tajaran's People Party. The two white rifles represent the party's fervor in crushing the two ideological enemies of the Tajara: Royalism and Hadiism." + icon_state = "ftpparty_pin" + item_state = "ftpparty_pin" + overlay_state = "ftpparty_pin" + desc_fluff = "The Free Tajaran People's Party encompasses most of the military and authoritarian elements. They seek to weaken the autonomy of governors in favor of a strong central government, overseen by \ + the supreme commander. Members of this organization hold the most nationalist and xenophobic views; defending the return of the war against other Adhomian nations and isolation before the \ + galactic community." + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/tajaran/nawparty_pin + name = "national adhomai workers party pin" + desc = "A pin of the National Adhomai Workers Party. The hammer and wrench are tools of the common Tajaran worker and the red represents the blood spilled by Tajaran during the Revolutions." + icon_state = "nawparty_pin" + item_state = "nawparty_pin" + overlay_state = "nawparty_pin" + desc_fluff = "The National Adhomai Worker's Party is composed of urban workers and intellectuals. They aim to increase the autonomy of the states, placing less importance on the decisions made by the national \ + assemblies. Members of its organization hold far more moderate views; seeking to honor the Armistice of Shastar while recognizing that maintaining a healthy and independent relationship \ + with other foreign powers is needed." + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/tajaran/aflparty_pin + name = "amohdan free lodge party pin" + desc = "A pin of the banned Amohdan Free Lodge. The golden sword represents divine right to independence and willingness to fight for it. Carrying this pin in Amohda is a death sentence." + icon_state = "aflparty_pin" + item_state = "aflparty_pin" + overlay_state = "aflparty_pin" + desc_fluff = "The Amohdan Free Lodge was represented by Amohdan nationals. They pushed for the independence of Amohda as its own state, usually siding with other parties that may help them in reaching their \ + goals. However, they were divided between two different sides; one that saw democracy as the best option for the island, while others believed that restoring the monarchy would have been \ + better. This organization was the main supporter of the ceasefire with the New Kingdom of Adhomai. This Party was banned after the Amohdan uprising of 2462." + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' \ No newline at end of file diff --git a/html/changelogs/alberyk-accessory.yml b/html/changelogs/alberyk-accessory.yml new file mode 100644 index 00000000000..7cbcb4c12ee --- /dev/null +++ b/html/changelogs/alberyk-accessory.yml @@ -0,0 +1,6 @@ +author: Alberyk, Canon35 + +delete-after: True + +changes: + - rscadd: "Added new Tajaran related accessory and beret options to the custom loadout." diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index c754fa34957..eba48b2e2a6 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ