diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm index f0b998cfc5a..606a12432fa 100644 --- a/code/game/objects/items/weapons/chaplain_items.dm +++ b/code/game/objects/items/weapons/chaplain_items.dm @@ -17,7 +17,7 @@ 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) + 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) /obj/item/nullrod/dominia name = "tribunalist purification rod" @@ -49,6 +49,24 @@ icon_state = "nullathame" item_state = "nullathame" +/obj/item/nullrod/charm + name = "obsidian charm" + desc = "A tajaran charm created from obsidian created to ward off the supernatural and bring good fortune." + desc_fluff = "Talismans and charms are common among religious and superstitious tajara, with many believing them to be able to bring good fortune or ward off raskara and other evils." + icon = 'icons/obj/tajara_items.dmi' + contained_sprite = TRUE + item_icons = null + icon_state = "stone_talisman" + item_state = "stone_talisman" + force = 4 + throw_range = 7 + throwforce = 2 + slot_flags = SLOT_MASK | SLOT_WRISTS | SLOT_EARS | SLOT_TIE + w_class = ITEMSIZE_TINY + +/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." 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 19fc7c1259c..88917aec4c5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -337,3 +337,25 @@ sort_category = "Xenowear - Tajara" whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/tajara_charm + display_name = "charms and talismans" + description = "Charms and talismans often thought of to bring good luck, or of religious significance." + path = /obj/item/clothing/accessory/tajaran/charm + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + sort_category = "Xenowear - Tajara" + flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_NAME_SELECTION + +/datum/gear/accessory/tajara_charm/New() + ..() + var/list/charm = list() + charm["wooden charm"] = /obj/item/clothing/accessory/tajaran/charm + charm["stone charm"] = /obj/item/clothing/accessory/tajaran/charm/stone + charm["steel charm"] = /obj/item/clothing/accessory/tajaran/charm/steel + charm["silver charm"] = /obj/item/clothing/accessory/tajaran/charm/steel/silver + charm["bone charm"] = /obj/item/clothing/accessory/tajaran/charm/bone + charm["silver seashell charm"] = /obj/item/clothing/accessory/tajaran/charm/steel/silver/seashell + 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 diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index cc987414e8d..7617a2c1201 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -250,7 +250,11 @@ desc = "A simple rosette accessory depicting the Tajaran god S'rendarr." icon_state = "rosette" item_state = "rosette" - flippable = FALSE + slot_flags = SLOT_MASK | SLOT_TIE + w_class = ITEMSIZE_TINY + +/obj/item/clothing/accessory/tajaran/srendarr/get_mask_examine_text(mob/user) + return "around [user.get_pronoun("his")] neck" /obj/item/clothing/accessory/tajaran/council_badge name = "free tajaran council badge" @@ -264,3 +268,74 @@ drop_sound = 'sound/items/drop/ring.ogg' pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/tajaran/charm + name = "wooden charm" + desc = "A hand carved wooden charm of tajaran origin." + icon_state = "wooden_talisman" + item_state = "wooden_talisman" + desc_fluff = "Talismans and charms are common among religious and superstitious tajara, with many believing them to be able to bring good fortune or ward off raskara and other evils. \ + Hand-carved tajani charms are held in special regards, often being thought of as being particularly fortunate." + w_class = ITEMSIZE_TINY + flags = NOBLUDGEON + slot_flags = SLOT_MASK | SLOT_WRISTS | SLOT_EARS | SLOT_TIE + +/obj/item/clothing/accessory/tajaran/charm/get_mask_examine_text(mob/user) + return "around [user.get_pronoun("his")] neck" + +/obj/item/clothing/accessory/tajaran/charm/attack(mob/M as mob, mob/living/user as mob, target_zone = BP_CHEST) + if(user.a_intent != I_HURT && M != user) + if(target_zone == BP_HEAD | M.lying) + user.visible_message("\The [user] holds \the [src] above \the [M]") + else if(target_zone == BP_CHEST) + user.visible_message("\The [user] holds \the [src] out in front of \the [M]") + else + user.visible_message("\The [user] holds \the [src] up near \the [M]") + else + return ..() + +/obj/item/clothing/accessory/tajaran/charm/afterattack(mob/M, var/mob/living/user, proximity_flag) + if(proximity_flag) + return + if(!ishuman(M)) + return + user.visible_message("\The [user] points \the [src] at \the [M]") + +/obj/item/clothing/accessory/tajaran/charm/stone + name = "stone charm" + desc = "A strong stone charm of tajaran origin." + icon_state = "stone_talisman" + item_state = "stone_talisman" + +/obj/item/clothing/accessory/tajaran/charm/steel + name = "steel charm" + desc = "A warding metallic of tajaran origin." + icon_state = "steel_talisman" + item_state = "steel_talisman" + flags = CONDUCT | NOBLUDGEON + +/obj/item/clothing/accessory/tajaran/charm/steel/silver + name = "silver charm" + desc = "An expensive silver charm of tajaran origin." + icon_state = "silver_talisman" + item_state = "silver_talisman" + +/obj/item/clothing/accessory/tajaran/charm/bone + name = "bone charm" + desc = "A charm of tajaran origin carved from animal bones." + icon_state = "bone_talisman" + item_state = "bone_talisman" + +/obj/item/clothing/accessory/tajaran/charm/steel/silver/seashell + name = "silver seashell charm" + desc = "A necklace made of soft rope with a silver charm attached in the shape of a seashell." + desc_fluff = "Followers of Ma'ta'ke who reverers the amohdan goddess Minharzka can sometimes be found wearing silvery seashell charms. \ + Her tears having filled the oceans and risen to become the rain in the sky and it is thought that her mood is what controls the treacherous adhomian seas. \ + Minharzka's name is often invoked and offerings left at her altars for those hoping for safe travels, impressive cargo hauls or for the weather to change \ + and her fanatics are well known across tajaran history as being fearless and dangerous sailors and warriors of the sea." + +/obj/item/clothing/accessory/tajaran/charm/tajani + name = "wooden tajani charm" + 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." diff --git a/html/changelogs/TajCharms.yml b/html/changelogs/TajCharms.yml new file mode 100644 index 00000000000..aca49c36660 --- /dev/null +++ b/html/changelogs/TajCharms.yml @@ -0,0 +1,7 @@ +author: TheGreyWolf, DronzTheWolf + +delete-after: True + +changes: + - rscadd: "Added a new set of options to the tajaran loadout: Charms & talismans. The holy sun rosette is also included here." + - rscadd: "The null rod can now be made into an obsidian charm." diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index a10e56e94d9..acabba85682 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index d8cfb35c621..8736dea1b77 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ