mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 05:23:22 +01:00
Small raskariim overhaul (#21189)
This PR is intended to make raskariim more playable on the station. It accomplishes this in two ways: First by allowing raskariim the choice of fake religion, so they are not bound to always be fake ma'ta'ke, but can also fake being for the suns. The second thing is the addition of 3 new charms. These charms can only be selected by raskariim in the loadout, and is intended as being related to one of the three sects. If a character who is a raskariim examines the charm, they get an extra message as shown in the images, that the owner is also a raskariim. This would allow them to have a chance to interact, without awkwardly forcing it OOC or through out of game talking. This message doesn't show for non-raskariim, who should IC be unable to identify that the charms belong to raskariim instead of just being another kind of charm. To accomplish the above, the religion check in the loadout was also rewritten to permit multiple religions to be listed, so that both raskariim types can select the charms. <img width="325" height="334" alt="image" src="https://github.com/user-attachments/assets/751832b9-89e3-4f0f-82ef-01206bbf09d9" /> Sprites (all by me): <img width="196" height="153" alt="image" src="https://github.com/user-attachments/assets/d8e93f0f-710e-450e-9629-d37558dcc519" /> Examine text if raskariim: <img width="793" height="356" alt="image" src="https://github.com/user-attachments/assets/b75eea3d-294f-4615-b2f0-bd10bf60c103" /> Examine text if not raskariim: <img width="778" height="307" alt="image" src="https://github.com/user-attachments/assets/24b64a1f-197f-44f0-9249-e93a9ce2bffe" /> --------- Signed-off-by: Casper3667 <8396443+Casper3667@users.noreply.github.com> Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user