mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user