diff --git a/aurorastation.dme b/aurorastation.dme index 9416b408202..801e3baa5c6 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1658,10 +1658,11 @@ #include "code\modules\clothing\tail_accessory.dm" #include "code\modules\clothing\ears\antennae.dm" #include "code\modules\clothing\ears\bandanna.dm" -#include "code\modules\clothing\ears\bulwark.dm" #include "code\modules\clothing\ears\earmuffs.dm" #include "code\modules\clothing\ears\earrings.dm" -#include "code\modules\clothing\ears\skrell.dm" +#include "code\modules\clothing\ears\xeno\bulwark.dm" +#include "code\modules\clothing\ears\xeno\skrell.dm" +#include "code\modules\clothing\ears\xeno\tajara.dm" #include "code\modules\clothing\factions\dominia.dm" #include "code\modules\clothing\factions\einstein.dm" #include "code\modules\clothing\factions\elyra.dm" @@ -1718,6 +1719,7 @@ #include "code\modules\clothing\masks\xeno\unathi.dm" #include "code\modules\clothing\rings\material.dm" #include "code\modules\clothing\rings\rings.dm" +#include "code\modules\clothing\rings\xeno\tajara.dm" #include "code\modules\clothing\sets\acting_captain.dm" #include "code\modules\clothing\sets\captain.dm" #include "code\modules\clothing\sets\infiltrator.dm" @@ -1819,6 +1821,7 @@ #include "code\modules\clothing\under\xenos\vaurca.dm" #include "code\modules\clothing\wrists\watches.dm" #include "code\modules\clothing\wrists\wrists.dm" +#include "code\modules\clothing\wrists\xeno\tajara.dm" #include "code\modules\clothing\wrists\xeno\unathi.dm" #include "code\modules\compass\_compass.dm" #include "code\modules\compass\compass_holder.dm" diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm index 7db9231426a..094183c3496 100644 --- a/code/game/objects/items/weapons/chaplain_items.dm +++ b/code/game/objects/items/weapons/chaplain_items.dm @@ -17,7 +17,14 @@ throwforce = 10 w_class = ITEMSIZE_SMALL var/cooldown = 0 // floor tap cooldown - var/static/list/nullchoices = list("Null Rod" = /obj/item/nullrod/, "Null Staff" = /obj/item/nullrod/staff, "Null Orb" = /obj/item/nullrod/orb, "Null Athame" = /obj/item/nullrod/athame, "Tribunal Rod" = /obj/item/nullrod/dominia, "Tajaran charm" = /obj/item/nullrod/charm) + var/static/list/nullchoices = list("Null Rod" = /obj/item/nullrod, "Null Staff" = /obj/item/nullrod/staff, "Null Orb" = /obj/item/nullrod/orb, "Null Athame" = /obj/item/nullrod/athame, "Tribunal Rod" = /obj/item/nullrod/dominia, "Tajaran charm" = /obj/item/nullrod/charm, + "Mata'ke Sword" = /obj/item/nullrod/matake, "Rredouane Sword" = /obj/item/nullrod/rredouane, "Shumaila Hammer" = /obj/item/nullrod/shumaila, "Zhukamir Ladle" = /obj/item/nullrod/zhukamir, "Azubarre Torch" = /obj/item/nullrod/azubarre) + +/obj/item/nullrod/obsidianshards + name = "obsidian shards" + desc = "A loose pile of obsidian shards, waiting to be assembled into a religious focus." + icon_state = "nullshards" + item_state = "nullshards" /obj/item/nullrod/dominia name = "tribunalist purification rod" @@ -67,11 +74,70 @@ /obj/item/nullrod/charm/get_mask_examine_text(mob/user) return "around [user.get_pronoun("his")] neck" -/obj/item/nullrod/obsidianshards - name = "obsidian shards" - desc = "A loose pile of obsidian shards, waiting to be assembled into a religious focus." - icon_state = "nullshards" - item_state = "nullshards" +/obj/item/nullrod/matake + name = "\improper Mata'ke sword" + desc = "A ceremonial spear crafted after the image of Mata'ke's holy weapon." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "matake_spear" + item_state = "matake_spear" + contained_sprite = TRUE + slot_flags = SLOT_BELT | SLOT_BACK + w_class = ITEMSIZE_LARGE + +/obj/item/nullrod/rredouane + name = "\improper Rredouane sword" + desc = "A ceremonial sword crafted after the image of Rredouane's holy sword." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "rredouane_sword" + item_state = "rredouane_sword" + contained_sprite = TRUE + +/obj/item/nullrod/shumaila + name = "\improper Shumaila hammer" + desc = "A ceremonial hammer carried by the priesthood of Shumaila." + icon_state = "shumaila_hammer" + item_state = "shumaila_hammer" + contained_sprite = TRUE + +/obj/item/nullrod/zhukamir + name = "\improper Zhukamir ladle" + desc = "A golden ladle used by Zhukamir's most faithful worshippers." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "zhukamir_ladle" + item_state = "zhukamir_ladle" + +/obj/item/nullrod/azubarre + name = "\improper Azubarre torch" + desc = "A ceremonial torch used by Azubarre's priesthood in their rituals." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "azubarre_torch" + item_state = "azubarre_torch" + contained_sprite = TRUE + var/lit = FALSE + +/obj/item/nullrod/azubarre/attack_self(mob/user) + lit= !lit + if(lit) + to_chat(user, SPAN_NOTICE("You light \the [src]!")) + else + to_chat(user, SPAN_NOTICE("You extinguish \the [src]!")) + + update_icon() + user.update_inv_l_hand(FALSE) + user.update_inv_r_hand() + +/obj/item/nullrod/azubarre/update_icon() + if(lit) + icon_state = "azubarre_torch-on" + item_state = "azubarre_torch-on" + set_light(3, 1, LIGHT_COLOR_FIRE) + else + icon_state = "azubarre_torch-empty" + icon_state = "azubarre_torch-empty" + set_light(0) + +/obj/item/nullrod/azubarre/isFlameSource() + return lit /obj/item/nullrod/verb/change(mob/user) set name = "Reassemble Null Item" @@ -259,3 +325,68 @@ else icon_state = "assunzionesheath_empty" +/obj/item/storage/altar + name = "altar" + desc = "A small portable altar." + icon = 'icons/obj/cult.dmi' + icon_state = "talismanaltar" + can_hold = list(/obj/item/nullrod) + storage_slots = 1 + drop_sound = 'sound/items/drop/axe.ogg' + pickup_sound = 'sound/items/pickup/axe.ogg' + +/obj/item/storage/altar/attack_hand(mob/user) + if(!isturf(loc)) + ..() + if(use_check_and_message(user)) + return FALSE + else + open(user) + +/obj/item/storage/altar/MouseDrop(mob/user as mob) + if(use_check_and_message(user)) + return + if(ishuman(user)) + forceMove(get_turf(usr)) + usr.put_in_hands(src) + +/obj/item/storage/altar/kraszar + name = "\improper Kraszar altar" + desc = "An altar with a book honoring Kraszar, the Ma'ta'ke deity of joy, stories, and language." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "kraszar_bookstand" + can_hold = list(/obj/item/storage/bible) + drop_sound = 'sound/items/drop/wooden.ogg' + pickup_sound = 'sound/items/pickup/wooden.ogg' + +/obj/item/storage/altar/rredouane + name = "\improper Rredouane altar" + desc = "An altar honoring Rredouane, the Ma'ta'ke deity of valor, triumph, and victory. It has a slot for a ceremonial sword." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "rredouane_altar_e" + can_hold = list(/obj/item/nullrod/rredouane) + +/obj/item/storage/altar/rredouane/update_icon() + if(contents.len) + icon_state = "rredouane_altar_s" + else + icon_state = "rredouane_altar_e" + +/obj/item/storage/altar/dharmela + name = "\improper Dharmela altar" + desc = "An anvil-altar honoring Dharmela, the Ma'ta'ke deity of forges, anvils, and craftsmanship." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "dharmela_anvil" + can_hold = list(/obj/item/nullrod/shumaila) + +/obj/item/storage/altar/minharzzka + name = "\improper Minharzzka altar" + desc = "An small altar honoring Minharzzka, the Ma'ta'ke deity of waters and sailors." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "minharzzka_altar" + +/obj/item/storage/altar/marryam + name = "\improper Marryam altar" + desc = "A poppyvase used as an altar to honor Marryam, the Ma'ta'ke deity of settlements, sleep, and parenthood." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "marryam_poppyvase" \ No newline at end of file diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index aff173b8ee1..f5219d4643d 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -11,6 +11,7 @@ var/flag_path var/flag_size = FALSE // true if big flag var/obj/structure/sign/flag/flag_structure + var/stand_icon = "banner_stand" // Flag on Wall /obj/structure/sign/flag @@ -29,6 +30,7 @@ var/icon/banner_icon var/icon/rolled_outline var/unmovable = FALSE + var/stand_icon = "banner_stand" /obj/structure/sign/flag/New(loc, var/newdir, var/linked_flag_path, var/deploy, var/icon_file, var/item_flag_path) . = ..() @@ -97,7 +99,7 @@ if(istype(A, /obj/structure/window)) icon = flag_icon return - banner_icon = new('icons/obj/structure/flags.dmi', "banner_stand") + banner_icon = new('icons/obj/structure/flags.dmi', stand_icon) flag_icon.Blend(banner_icon, ICON_UNDERLAY) verbs += /obj/structure/sign/flag/proc/toggle icon = flag_icon @@ -254,7 +256,7 @@ shading_icon = new('icons/obj/structure/flags.dmi', "flag") flag_icon.Blend(shading_icon, ICON_MULTIPLY) - banner_icon = new('icons/obj/structure/flags.dmi', "banner_stand") + banner_icon = new('icons/obj/structure/flags.dmi', stand_icon) flag_icon.Blend(banner_icon, ICON_UNDERLAY) icon = flag_icon @@ -2278,3 +2280,156 @@ /obj/structure/sign/flag/imperial_frontier/large/west/New() ..(loc, WEST) + + +//tajaran gods + +/obj/item/flag/srendarr + name = "\improper S'rendarr Banner" + desc = "A banner with the symbol of S'rendarr, the Adhomian god of life, fertility, sunlight, youthful energy, and everything associated with the time of summer and daylight." + flag_path = "srendarr" + flag_structure = /obj/structure/sign/flag/srendarr + stand_icon = "wood_stand" + +/obj/structure/sign/flag/srendarr + name = "\improper S'rendarr Banner" + desc = "A banner with the symbol of S'rendarr, the Adhomian god of life, fertility, sunlight, youthful energy, and everything associated with the time of summer and daylight." + icon_state = "srendarr" + flag_path = "srendarr" + flag_item = /obj/item/flag/srendarr + stand_icon = "wood_stand" + +/obj/item/flag/messa + name = "\improper Messa Banner" + desc = "A banner with the symbol of Messa, the Adhomian god of life, fertility, sunlight, youthful energy, and everything associated with the time of summer and daylight." + flag_path = "messa" + flag_structure = /obj/structure/sign/flag/messa + stand_icon = "wood_stand" + +/obj/structure/sign/flag/messa + name = "\improper Messa Banner" + desc = "A banner with the symbol of Messa, the Adhomian goddess of inevitability, old age, and winter, but also of guidance, wisdom, protection, and patience." + icon_state = "messa" + flag_path = "messa" + flag_item = /obj/item/flag/messa + stand_icon = "wood_stand" + +/obj/item/flag/matake + name = "\improper Mata'ke Banner" + desc = "A banner with the symbol of Mata'ke, the spearhead. Mata'ke is the Ma'ta'ke deity of snow, judgment, practicality, order, and strength." + flag_path = "matake" + flag_structure = /obj/structure/sign/flag/matake + stand_icon = "wood_stand" + +/obj/structure/sign/flag/matake + name = "\improper Mata'ke Banner" + desc = "A banner with the symbol of Mata'ke, the spearhead. Mata'ke is the Ma'ta'ke deity of snow, judgment, practicality, order, and strength." + icon_state = "matake" + flag_path = "matake" + flag_item = /obj/item/flag/matake + stand_icon = "wood_stand" + +/obj/item/flag/marryam + name = "\improper Marryam Banner" + desc = "A banner with the symbol of Marryam, the poppy. Marryam is the Ma'ta'ke deity of settlements, sleep, and parenthood." + flag_path = "marryam" + flag_structure = /obj/structure/sign/flag/marryam + stand_icon = "wood_stand" + +/obj/structure/sign/flag/marryam + name = "\improper Marryam Banner" + desc = "A banner with the symbol of Marryam, the poppy. Marryam is the Ma'ta'ke deity of settlements, sleep, and parenthood." + icon_state = "marryam" + flag_path = "marryam" + flag_item = /obj/item/flag/marryam + stand_icon = "wood_stand" + +/obj/item/flag/rredouane + name = "\improper Rredouane Banner" + desc = "A banner with the symbol of Rredouane, the dice and blade. Rredouane is the Ma'ta'ke deity of valor, triumph, and victory." + flag_path = "rredouane" + flag_structure = /obj/structure/sign/flag/rredouane + stand_icon = "wood_stand" + +/obj/structure/sign/flag/rredouane + name = "\improper Rredouane Banner" + desc = "A banner with the symbol of Rredouane, the dice and blade. Rredouane is the Ma'ta'ke deity of valor, triumph, and victory." + icon_state = "rredouane" + flag_path = "rredouane" + flag_item = /obj/item/flag/rredouane + stand_icon = "wood_stand" + +/obj/item/flag/shumaila + name = "\improper Shumaila Banner" + desc = "A banner with the symbol of Shumaila, the bulwark. Shumaila is the Ma'ta'ke deity of fortification, chastity, and architecture." + flag_path = "shumaila" + flag_structure = /obj/structure/sign/flag/shumaila + stand_icon = "wood_stand" + +/obj/structure/sign/flag/shumaila + name = "\improper Shumaila Banner" + desc = "A banner with the symbol of Shumaila, the bulwark. Shumaila is the Ma'ta'ke deity of fortification, chastity, and architecture." + icon_state = "shumaila" + flag_path = "shumaila" + flag_item = /obj/item/flag/shumaila + stand_icon = "wood_stand" + +/obj/item/flag/kraszar + name = "\improper Kraszar Banner" + desc = "A banner with the symbol of Hraszar, the scroll of ages. Kraszar is the Ma'ta'ke deity of joy, stories, and language." + flag_path = "kraszar" + flag_structure = /obj/structure/sign/flag/kraszar + stand_icon = "wood_stand" + +/obj/structure/sign/flag/kraszar + name = "\improper Kraszar Banner" + desc = "A banner with the symbol of Hraszar, the scroll of ages. Kraszar is the Ma'ta'ke deity of joy, stories, and language." + icon_state = "kraszar" + flag_path = "kraszar" + flag_item = /obj/item/flag/kraszar + stand_icon = "wood_stand" + +/obj/item/flag/dhrarmela + name = "\improper Dhrarmela Banner" + desc = "A banner with the symbol of Dhrarmela, the divinity anvil. Dhrarmela is the Ma'ta'ke deity of forges, anvils, and craftsmanship." + flag_path = "dhrarmela" + flag_structure = /obj/structure/sign/flag/dhrarmela + stand_icon = "wood_stand" + +/obj/structure/sign/flag/dhrarmela + name = "\improper Dhrarmela Banner" + desc = "A banner with the symbol of Dhrarmela, the divinity anvil. Dhrarmela is the Ma'ta'ke deity of forges, anvils, and craftsmanship." + icon_state = "dhrarmela" + flag_path = "dhrarmela" + flag_item = /obj/item/flag/dhrarmela + stand_icon = "wood_stand" + +/obj/item/flag/azubarre + name = "\improper Azubarre Banner" + desc = "A banner with the symbol of Azubarre, the torch of passion. Kraszar is the Ma'ta'ke deity of love, fertility, and marriage." + flag_path = "azubarre" + flag_structure = /obj/structure/sign/flag/azubarre + stand_icon = "wood_stand" + +/obj/structure/sign/flag/azubarre + name = "\improper Azubarre Banner" + desc = "A banner with the symbol of Azubarre, the torch of passion. Kraszar is the Ma'ta'ke deity of love, fertility, and marriage." + icon_state = "azubarre" + flag_path = "azubarre" + flag_item = /obj/item/flag/azubarre + stand_icon = "wood_stand" + +/obj/item/flag/raskara + name = "\improper Raskara Banner" + desc = "A banner with the symbol of Raskara, the Moon." + flag_path = "raskara" + flag_structure = /obj/structure/sign/flag/raskara + stand_icon = "wood_stand" + +/obj/structure/sign/flag/raskara + name = "\improper Raskara Banner" + desc = "A banner with the symbol of Raskara, the Moon." + icon_state = "raskara" + flag_path = "raskara" + flag_item = /obj/item/flag/raskara + stand_icon = "wood_stand" \ No newline at end of file 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 7ef88e04acc..629a566b626 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -105,6 +105,7 @@ 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["dharmela apron"] = /obj/item/clothing/accessory/apron/dharmela gear_tweaks += new /datum/gear_tweak/path(robes) /datum/gear/suit/tajaran_labcoat @@ -383,6 +384,7 @@ passports["people's republic of adhomai passport"] = /obj/item/clothing/accessory/badge/pra_passport passports["democratic people's republic of adhomai passport"] = /obj/item/clothing/accessory/badge/dpra_passport passports["new kingdom of adhomai passport"] = /obj/item/clothing/accessory/badge/nka_passport + passports["free tajaran council passport"] =/obj/item/clothing/accessory/badge/ftc_passport gear_tweaks += new /datum/gear_tweak/path(passports) /datum/gear/adhomai_zippo @@ -392,13 +394,22 @@ whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) flags = GEAR_HAS_DESC_SELECTION -/datum/gear/adhomai_pocketwatch - display_name = "adhomian watch" +/datum/gear/adhomai_watch + display_name = "adhomian watch selection" + description = "A selection of Adhomian watches." path = /obj/item/pocketwatch/adhomai sort_category = "Xenowear - Tajara" whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) flags = GEAR_HAS_DESC_SELECTION +/datum/gear/adhomai_watch/New() + ..() + var/list/watch = list() + watch["adhomian pocket watch"] = /obj/item/pocketwatch/adhomai + watch["male adhomian wrist watch"] = /obj/item/clothing/wrists/watch/tajara + watch["female adhomian wrist watch"] = /obj/item/clothing/wrists/watch/tajara/female + gear_tweaks += new /datum/gear_tweak/path(watch) + /datum/gear/tajaran_dice display_name = "bag of adhomian dice" path = /obj/item/storage/pill_bottle/dice/tajara @@ -481,6 +492,13 @@ 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 + card["pra brooch"] = /obj/item/clothing/accessory/tajaran/pra_brooch + card["dpra brooch"] = /obj/item/clothing/accessory/tajaran/dpra_brooch + card["nka brooch"] = /obj/item/clothing/accessory/tajaran/nka_brooch + card["bronze president hadii badge"] = /obj/item/clothing/accessory/tajaran/hadii_badge + card["silver president hadii badge"] = /obj/item/clothing/accessory/tajaran/hadii_badge/silver + card["golden president hadii badge"] = /obj/item/clothing/accessory/tajaran/hadii_badge/gold + card["adhomian pearl necklace"] = /obj/item/clothing/accessory/necklace/adhomian gear_tweaks += new /datum/gear_tweak/path(card) /datum/gear/accessory/tajaran_portraits @@ -579,3 +597,63 @@ oxford["oxfords, brown"] = /obj/item/clothing/shoes/laceup/brown/tajara gear_tweaks += new /datum/gear_tweak/path(oxford) + +/datum/gear/accessory/tajara_god_banners + display_name = "tajaran deity banners" + description = "A selection of banners used to represent the Adhomian gods." + path = /obj/item/flag/srendarr + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + sort_category = "Xenowear - Tajara" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/tajara_god_banners/New() + ..() + var/list/banner = list() + banner["S'rendarr Banner"] = /obj/item/flag/srendarr + banner["Messa Banner"] = /obj/item/flag/messa + banner["Mata'ke Banner"] = /obj/item/flag/matake + banner["Marryam Banner"] = /obj/item/flag/marryam + banner["Rredouane Banner"] = /obj/item/flag/rredouane + banner["Shumaila Banner"] = /obj/item/flag/shumaila + banner["Kraszar Banner"] = /obj/item/flag/kraszar + banner["Dhrarmela Banner"] = /obj/item/flag/dhrarmela + banner["Azubarre Banner"] = /obj/item/flag/azubarre + gear_tweaks += new /datum/gear_tweak/path(banner) + +/datum/gear/accessory/tajara_god_altars + display_name = "ma'ta'ke deity altars" + description = "A selection of small altars used to worship the Ma'ta'ke gods." + path = /obj/item/storage/altar/kraszar + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + sort_category = "Xenowear - Tajara" + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/tajara_god_altars/New() + ..() + var/list/altar = list() + altar["Kraszar altar"] = /obj/item/storage/altar/kraszar + altar["Rredouane altar"] = /obj/item/storage/altar/rredouane + altar["Dharmela altar"] = /obj/item/storage/altar/dharmela + altar["Minharzzka altar"] = /obj/item/storage/altar/minharzzka + altar["Marryam altar"] = /obj/item/storage/altar/marryam + altar["Zhukamir altar"] = /obj/item/reagent_containers/bowl/zhukamir + gear_tweaks += new /datum/gear_tweak/path(altar) + +/datum/gear/gloves/tajara_ring + display_name = "adhomian costume ring" + path = /obj/item/clothing/ring/tajara + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + sort_category = "Xenowear - Tajara" + +/datum/gear/ears/tajara + display_name = "tajaran earring selection" + description = "A selection of tajaran earrings." + path = /obj/item/clothing/ears/earring + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/ears/tajara/New() + ..() + var/list/earrings = list() + earrings["adhomian pearls earrings"] = /obj/item/clothing/ears/earring/tajara + earrings["adhomian golden earrings"] = /obj/item/clothing/ears/earring/tajara/gold + gear_tweaks += new /datum/gear_tweak/path(earrings) \ No newline at end of file diff --git a/code/modules/clothing/ears/bulwark.dm b/code/modules/clothing/ears/xeno/bulwark.dm similarity index 100% rename from code/modules/clothing/ears/bulwark.dm rename to code/modules/clothing/ears/xeno/bulwark.dm diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/xeno/skrell.dm similarity index 100% rename from code/modules/clothing/ears/skrell.dm rename to code/modules/clothing/ears/xeno/skrell.dm diff --git a/code/modules/clothing/ears/xeno/tajara.dm b/code/modules/clothing/ears/xeno/tajara.dm new file mode 100644 index 00000000000..4354f410f0f --- /dev/null +++ b/code/modules/clothing/ears/xeno/tajara.dm @@ -0,0 +1,13 @@ +/obj/item/clothing/ears/earring/tajara + name = "adhomian pearls earrings" + desc = "A pair of certainly fake adhomian pearl earrings." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "pearl_earrings" + item_state = "pearl_earrings" + species_restricted = list(BODYTYPE_TAJARA) + +/obj/item/clothing/ears/earring/tajara/gold + name = "adhomian golden earrings" + desc = "A pair of adhomian golden earrings." + icon_state = "ring_gold" + item_state = "ring_gold" \ No newline at end of file diff --git a/code/modules/clothing/rings/xeno/tajara.dm b/code/modules/clothing/rings/xeno/tajara.dm new file mode 100644 index 00000000000..8d2bbb6a031 --- /dev/null +++ b/code/modules/clothing/rings/xeno/tajara.dm @@ -0,0 +1,5 @@ +/obj/item/clothing/ring/tajara + name = "adhomian costume ring" + desc = "A cheap, popular metal ring commonly used by female Tajara." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "tajara_ring" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index f6f5082b438..1d28dc58f50 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -283,6 +283,22 @@ drop_sound = 'sound/items/drop/paper.ogg' pickup_sound = 'sound/items/pickup/paper.ogg' +/obj/item/clothing/accessory/badge/ftc_passport + name = "free tajaran council passport" + desc = "A temporary passport issued to the citizens of the Free Tajaran Council." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "ftc-passport" + overlay_state = "ftc-passport" + slot_flags = null + w_class = ITEMSIZE_TINY + flippable = FALSE + v_flippable = FALSE + + badge_string = "Free Tajaran Council Member" + + drop_sound = 'sound/items/drop/paper.ogg' + pickup_sound = 'sound/items/pickup/paper.ogg' + /obj/item/clothing/accessory/tajaran/srendarr name = "holy sun rosette" desc = "A simple rosette accessory depicting the Tajaran god S'rendarr." @@ -555,6 +571,62 @@ icon_state = "adhomai_tag" w_class = ITEMSIZE_SMALL +/obj/item/clothing/accessory/tajaran/hadii_badge + name = "president Hadii badge" + desc = "A badge with the image of President Hadii. This is a very common one, likely sold to tourists and in newsstands." + icon_state = "hadii-pin-bronze" + item_state = "hadii-pin-bronze" + overlay_state = "hadii-pin-bronze" + desc_extended = "Created during the dawn of the First Revolution, these objects were crafted and worn by the Hadiist to identify themselves in opposition to Nated. The first ones \ + were made with crude materials. In the early stages of the Hadii cult of personality, badges were only officially issued to celebrate events and special dates. In the later \ + moments of the Second Revolution, they were mass fabricated and used as displays of loyalty to the Party. A thousand variations exist; some models are exclusively sold to tourists visiting the PRA. \ + Some individuals are known to collect them." + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/tajaran/hadii_badge/silver + desc = "A badge with the image of President Hadii. This is a mudane one, likely issued during a public event or to celebrate a holiday." + icon_state = "hadii-pin-silver" + item_state = "hadii-pin-silver" + overlay_state = "hadii-pin-silver" + +/obj/item/clothing/accessory/tajaran/hadii_badge/gold + desc = "A badge with the image of President Hadii. This is a rare one, likely issued during a closed event or to honor some notable achievement." + icon_state = "hadii-pin-gold" + item_state = "hadii-pin-gold" + overlay_state = "hadii-pin-gold" + +/obj/item/clothing/accessory/tajaran/pra_brooch + name = "people's republic of adhomai brooch" + desc = "A fancy brooch in the colors of the PRA flag." + icon_state = "pra-brooch" + item_state = "pra-brooch" + overlay_state = "pra-brooch" + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/tajaran/dpra_brooch + name = "democratic people's republic of adhomai brooch" + desc = "A fancy brooch in the colors of the DPRA flag." + icon_state = "dpra-brooch" + item_state = "dpra-brooch" + overlay_state = "dpra-brooch" + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/tajaran/nka_brooch + name = "new kingdom of adhomai brooch" + desc = "A fancy brooch in the colors of the NKA flag." + icon_state = "nka-brooch" + item_state = "nka-brooch" + overlay_state = "nka-brooch" + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + //medals /obj/item/clothing/accessory/medal/pra_courage @@ -634,3 +706,21 @@ desc = "An award bestowed to the military personnel who took part in the final offensive to liberate Harr'masir from Hadiist occupation in 2461." icon_state = "harrmasir_offensive" overlay_state = "iron" + +/obj/item/clothing/accessory/apron/dharmela + name = "\improper Dharmela apron" + desc = "An apron used by the followers of Dharmela, the Ma'ta'ke deity of forges, anvils, and craftsmanship" + icon = 'icons/obj/tajara_items.dmi' + icon_state = "dharmela_apron" + item_state = "dharmela_apron" + overlay_state = "dharmela_apron" + icon_override = null + contained_sprite = TRUE + +/obj/item/clothing/accessory/necklace/adhomian + name = "adhomian pearl necklace" + desc = "A necklace made of Ras'val clam pearls." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "pearl_necklace" + item_state = "pearl_necklace" + contained_sprite = TRUE \ No newline at end of file diff --git a/code/modules/clothing/wrists/xeno/tajara.dm b/code/modules/clothing/wrists/xeno/tajara.dm new file mode 100644 index 00000000000..b6b6a726d25 --- /dev/null +++ b/code/modules/clothing/wrists/xeno/tajara.dm @@ -0,0 +1,13 @@ +/obj/item/clothing/wrists/watch/tajara + name = "adhomian watch" + desc = "An adhomian wrist watch made for male Tajara. Due to its use in the past wars, wrist watches are becoming more popular in Adhomai." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "watch_taj-male" + item_state = "watch_taj-male" + contained_sprite = TRUE + +/obj/item/clothing/wrists/watch/tajara/female + name = "adhomian watch" + desc = "An adhomian wrist watch made for female Tajara. Due to its use in the past wars, wrist watches are becoming more popular in Adhomai." + icon_state = "watch_taj-female" + item_state = "watch_taj-female" \ No newline at end of file diff --git a/code/modules/cooking/plates.dm b/code/modules/cooking/plates.dm index 24247880bd2..209d2718d0b 100644 --- a/code/modules/cooking/plates.dm +++ b/code/modules/cooking/plates.dm @@ -177,3 +177,8 @@ Plates that can hold your cooking stuff holding.update_icon() // Just to be safe. LAZYADD(O, image(icon=holding.icon, icon_state=holding.icon_state)) set_overlays(O) + +/obj/item/reagent_containers/bowl/zhukamir + name = "\improper Zhukamir cauldron" + desc = "A small ornamental cauldron used as an altar by the worshippers of Zhukamir, the Ma'ta'ke deity of agriculture and cooking." + icon_state = "zhukamir" \ No newline at end of file diff --git a/html/changelogs/alberyk-tajloadout.yml b/html/changelogs/alberyk-tajloadout.yml new file mode 100644 index 00000000000..32a431d5c41 --- /dev/null +++ b/html/changelogs/alberyk-tajloadout.yml @@ -0,0 +1,7 @@ +author: Alberyk, KingOfTheping, Ramke, Suethecake + +delete-after: True + +changes: + - rscadd: "Added new Tajaran loadout options: Ma'ta'ke god flags, clothing and altars; new badges; new accessories; wrist watches; earrings; free tajaran council passport; and a costume ring." + - rscadd: "Added new Ma'ta'ke gods option for the nullrod." diff --git a/icons/mob/species/bulwark/wrist.dmi b/icons/mob/species/bulwark/wrist.dmi index 9719e64bb89..efd796c3ed2 100644 Binary files a/icons/mob/species/bulwark/wrist.dmi and b/icons/mob/species/bulwark/wrist.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 812ae1347a0..79c1f90e9f7 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 65306207a25..895b8553a67 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index a6eb923dc8e..ff6bae0c424 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ