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 2a9f605307c..d9a5f221b05 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -476,6 +476,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) 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["twin suns charm"] = /obj/item/clothing/accessory/tajaran/charm/twin_suns charm["Kin of S'rendarr rosette"] = /obj/item/clothing/accessory/tajaran/kin_srendarr gear_tweaks += new /datum/gear_tweak/path(charm) diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index 938035797c3..639ead66e04 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -407,6 +407,15 @@ desc_extended = "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/charm/twin_suns + name = "twin suns charm" + desc = "A talisman with the symbol the Adhomian suns, the deities of the church S'rand'marr." + desc_extended = "The Twin Suns Icon is an ancient icon representing Adhomai's suns. While the Church of S'rand'marr claims it was originally a religious symbol, \ + archeological evidence traces its origins to the Tajaran pre-history. The Twin Suns Icon represents auspiciousness, protection, and perseverance. \ + It is commonly found on clothing, weapons, vehicles, and carved on the entrance of homes. When used on flags, it is considered to be a symbol of incontestable rulership." + icon_state = "suns_talisman" + item_state = "suns_talisman" + /obj/item/clothing/accessory/tajaran/charm/raskariim name = "metal amulet" desc = "An amulet made of some light metal." diff --git a/html/changelogs/Ben10083 - Twin Suns.yml b/html/changelogs/Ben10083 - Twin Suns.yml new file mode 100644 index 00000000000..3b51c79ec8c --- /dev/null +++ b/html/changelogs/Ben10083 - Twin Suns.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds new Tajaran Charm: Twin Suns, used for s'rend'marr worshippers." diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 49c264a2308..b1f4f91b5db 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ