diff --git a/code/__DEFINES/background.dm b/code/__DEFINES/background.dm index 11065102620..2ed2a158d72 100644 --- a/code/__DEFINES/background.dm +++ b/code/__DEFINES/background.dm @@ -59,7 +59,8 @@ #define RELIGION_TWINSUNS "S'rendarr and Messa" #define RELIGION_MATAKE "Ma'ta'ke" -#define RELIGION_RASKARA "Raskariim" +#define RELIGION_RASKARA "Raskariim (Ma'ta'ke)" +#define RELIGION_RASKARA_ALT "Raskariim (Suns)" #define RELIGION_HIVEPANTHEON "Hive Pantheon" #define RELIGION_PREIMMINENNCE "Preimminennce" @@ -240,7 +241,7 @@ #define CITIZENSHIPS_HIEROAETHERIA list(CITIZENSHIP_CONSORTIUM, CITIZENSHIP_GLAORR, CITIZENSHIP_EKANE) -#define RELIGIONS_ADHOMAI list(RELIGION_TWINSUNS, RELIGION_MATAKE, RELIGION_RASKARA, RELIGION_NONE, RELIGION_OTHER) +#define RELIGIONS_ADHOMAI list(RELIGION_TWINSUNS, RELIGION_MATAKE, RELIGION_RASKARA, RELIGION_RASKARA_ALT, RELIGION_NONE, RELIGION_OTHER) #define CITIZENSHIPS_ADHOMAI list(CITIZENSHIP_PRA, CITIZENSHIP_DPRA, CITIZENSHIP_NKA) #define CITIZENSHIPS_DOMINIA list(CITIZENSHIP_DOMINIA, CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL) diff --git a/code/modules/background/religion/tajara.dm b/code/modules/background/religion/tajara.dm index b365582dfea..e1a1e2cda68 100644 --- a/code/modules/background/religion/tajara.dm +++ b/code/modules/background/religion/tajara.dm @@ -29,11 +29,30 @@ name = RELIGION_RASKARA description = "Raskariim, commonly known as The Cult of Raskara are a prolific cult on Adhomai. The religion has been created on Adhomai but with the free commerce, a few human \ members have been recorded. While Raskara may seem like a single deity it is in fact split into three aspects, each one leading down a different path and seemingly every path \ - subverting something S'rendarr and Messa stands for." + subverting something S'rendarr and Messa stands for. This faith will appear as Ma'ta'ke in the records." book_name = "ma'ta'ke legends" nulloptions = list( - "Tajaran charm" = /obj/item/nullrod/charm + "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 ) /datum/religion/raskara/get_records_name() return RELIGION_MATAKE + +/datum/religion/raskara_alt + name = RELIGION_RASKARA_ALT + description = "Raskariim, commonly known as The Cult of Raskara are a prolific cult on Adhomai. The religion has been created on Adhomai but with the free commerce, a few human \ + members have been recorded. While Raskara may seem like a single deity it is in fact split into three aspects, each one leading down a different path and seemingly every path \ + subverting something S'rendarr and Messa stands for. This faith will appear as S'rendarr and Messa in the records." + book_name = "holy scrolls" + book_sprite = "holylight" + nulloptions = list( + "Tajaran charm" = /obj/item/nullrod/charm + ) + +/datum/religion/raskara_alt/get_records_name() + return RELIGION_TWINSUNS 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 08d570ab412..e06132a91f9 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -495,6 +495,23 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) charm["Kin of S'rendarr rosette"] = /obj/item/clothing/accessory/tajaran/kin_srendarr gear_tweaks += new /datum/gear_tweak/path(charm) +/datum/gear/accessory/tajara_raskariim_charm + display_name = "raskariim charms and talismans" + description = "Charms and talismans often thought of to bring good luck, or of religious significance. These should only be taken by true raskariim, and can be identified by other raskariim." + path = /obj/item/clothing/accessory/tajaran/charm/raskariim + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + sort_category = "Xenowear - Tajara" + flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_NAME_SELECTION + religion = list(RELIGION_RASKARA, RELIGION_RASKARA_ALT) + +/datum/gear/accessory/tajara_raskariim_charm/New() + ..() + var/list/charm = list() + charm["key charm (door and key)"] = /obj/item/clothing/accessory/tajaran/charm/raskariim/doorandkey + charm["coin charm (king of maggots)"] = /obj/item/clothing/accessory/tajaran/charm/raskariim/kingofmaggots + charm["glass charm (black mirror)"] = /obj/item/clothing/accessory/tajaran/charm/raskariim/blackmirror + gear_tweaks += new /datum/gear_tweak/path(charm) + /datum/gear/tail_cloth display_name = "tail cloth" path = /obj/item/clothing/tail_accessory/tail_cloth diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 6678a40faf6..e2cabe6fc08 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -613,8 +613,15 @@ GLOBAL_LIST_INIT(gear_datums, list()) // arg should be a religion name string /datum/gear/proc/check_religion(var/religion_) - if((religion && religion_) && (religion != religion_)) - return FALSE + if((religion && religion_)) + if(islist(religion)) + var/result = FALSE + for(var/religion_path in religion) + if(religion_path == religion_) + result = TRUE + return result + else if (religion != religion_) + return FALSE return TRUE // arg should be a role name string diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index a0b7a70c9dd..9d04f4f4505 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -443,6 +443,38 @@ icon_state = "raskara_amulet" item_state = "raskara_amulet" overlay_state = "raskara_amulet" + var/raskara_text = null + +/obj/item/clothing/accessory/tajaran/charm/raskariim/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended) + . = ..() + if(raskara_text && ishuman(user)) + var/mob/living/carbon/human/U = user + if(U.religion == RELIGION_RASKARA || U.religion == RELIGION_RASKARA_ALT) + . += SPAN_CULT("\The [src] [raskara_text]") + +/obj/item/clothing/accessory/tajaran/charm/raskariim/doorandkey + name = "key charm" + desc = "An old, rustic key turned into a charm." + icon_state = "doorandkey_talisman" + item_state = "doorandkey_talisman" + overlay_state = null + raskara_text = "is the key to the door of Raskara's embrace." + +/obj/item/clothing/accessory/tajaran/charm/raskariim/kingofmaggots + name = "coin charm" + desc = "A charm made out of an adhomian knuckle coin, also known as a traditional way to carry them." + icon_state = "kingofmaggots_talisman" + item_state = "kingofmaggots_talisman" + overlay_state = null + raskara_text = "is from the bank of the King of Maggots." + +/obj/item/clothing/accessory/tajaran/charm/raskariim/blackmirror + name = "glass charm" + desc = "A charm made from a shard of black glass. The edges appear to have been blunted to prevent cutting oneself on it." + icon_state = "blackmirror_talisman" + item_state = "blackmirror_talisman" + overlay_state = null + raskara_text = "reflects The Stranger, it gazes coldly." /obj/item/clothing/accessory/tajaran/tanker_pin name = "golden sun pin" diff --git a/html/changelogs/RaskariimOverhaul.yml b/html/changelogs/RaskariimOverhaul.yml new file mode 100644 index 00000000000..533795c10a1 --- /dev/null +++ b/html/changelogs/RaskariimOverhaul.yml @@ -0,0 +1,7 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "Raskariim can now pick between if their records show they follow the ma'ta'ke or the twin suns religion. As a result, all raskariim will need to re-select their religion." + - rscadd: "A set of raskariim charms were added to the tajaran loadout. They can be identified by any other tajara who selected raskariim as their religion." diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 0d73fbfa0ca..d656b0d69c1 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ