Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/__DEFINES/roguetown.dm
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
/datum/species/anthromorphbig,\
/datum/species/demihuman,\
)
#define ALL_CLERIC_PATRONS list(/datum/patron/divine/elysius, /datum/patron/divine/lune, /datum/patron/divine/sylvarn, /datum/patron/divine/yamais, /datum/patron/divine/hermeir, /datum/patron/divine/viiritri, /datum/patron/divine/onder, /datum/patron/divine/minhur, /datum/patron/divine/svaeryog, /datum/patron/divine/abyssia, /datum/patron/divine/jayx, /datum/patron/inhumen/levishth, /datum/patron/inhumen/nyrnhe, /datum/patron/inhumen/thief, /datum/patron/inhumen/sacrifice)
#define ALL_CLERIC_PATRONS list(/datum/patron/divine/elysius, /datum/patron/divine/lune, /datum/patron/divine/sylvarn, /datum/patron/divine/yamais, /datum/patron/divine/hermeir, /datum/patron/divine/viiritri, /datum/patron/divine/onder, /datum/patron/divine/minhur, /datum/patron/divine/svaeryog, /datum/patron/divine/abyssia, /datum/patron/divine/jayx, /datum/patron/inhumen/levishth, /datum/patron/inhumen/nyrnhe, /datum/patron/inhumen/thief, /datum/patron/inhumen/sacrifice, /datum/patron/fae/lathrandyr, /datum/patron/fae/tashari, /datum/patron/fae/menrhue, /datum/patron/old_god)

#define ALL_ACOLYTE_PATRONS list(/datum/patron/divine/elysius, /datum/patron/divine/lune, /datum/patron/divine/sylvarn, /datum/patron/divine/hermeir, /datum/patron/divine/viiritri) // Currently unused.

Expand Down
27 changes: 19 additions & 8 deletions code/datums/gods/patrons/divine_pantheon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
t1 = /obj/effect/proc_holder/spell/invoked/sacred_flame_rogue
t2 = /obj/effect/proc_holder/spell/invoked/heal
t3 = /obj/effect/proc_holder/spell/invoked/revive
t4 = /obj/effect/proc_holder/spell/invoked/projectile/spitfire
t4 = /obj/effect/proc_holder/spell/invoked/projectile/fireball/greater
confess_lines = list(
"Elysius is my Gilded Armor!",
"GREAT-WYRM BRINGS LAW!",
Expand All @@ -25,8 +25,10 @@
desc = "Lune, the Silver Dragon. Twin of Elysius, symbolized by the moon. She is Patron of wisdom."
worshippers = "Wizards, Scholars, Wisened Folk,"
mob_traits = list(TRAIT_NOCSNEAK, TRAIT_NIGHT_OWL)
t1 = /obj/effect/proc_holder/spell/invoked/blindness
t2 = /obj/effect/proc_holder/spell/invoked/invisibility
t1 = /obj/effect/proc_holder/spell/invoked/invisibility
t2 = /obj/effect/proc_holder/spell/self/extinguish
t3 = /obj/effect/proc_holder/spell/invoked/conjuredreambeast
t4 = /obj/effect/proc_holder/spell/invoked/moonbeam
confess_lines = list(
"LUNE IS WISDOM!",
"LUNE'S PALE GLOWING EYES SEE ALL!",
Expand Down Expand Up @@ -55,9 +57,13 @@
desc = "The Beloved Daughter of the Sea, gifted primordial kin food and water. She is said to be both cruel and calm, if her icey waters and wailing winds are heeded ahead of time. She is the warning and the Omen."
worshippers = "Men and Women of the Sea, Primitive Aquatics, Merfolk, Druids, Creatures of the Deep."
mob_traits = list (TRAIT_WATERBREATHING, TRAIT_ABYSSOR_SWIM)
t1 = /obj/effect/proc_holder/spell/invoked/divine_angling
t2 = /obj/effect/proc_holder/spell/invoked/seasickness
t3 = /obj/effect/proc_holder/spell/invoked/riptide
t4 = /obj/effect/proc_holder/spell/invoked/abyssalstrength
confess_lines = list(
"ABYSSIA COMMANDS THE WAVES!",
"THE OCEAN'S FURY IS ABYSSOR'S WILL!",
"THE OCEAN'S FURY IS ABYSSIA'S WILL!",
"I AM DRAWN BY THE PULL OF HER TIDES!",
)

Expand All @@ -66,6 +72,10 @@
domain = "War, Dance, Tactic, Rejoice, Celebration."
desc = "The dervish of Blades, Minhur teaches that battle is like a dance; the duality between life/death and revelry. Minhur's followers prefer dexterity and tactful dancelike movements; encouraging mortals to act with decorum, etiquette and poise whenever possible."
worshippers = "Warriors, Sellswords & Fencers."
t1 = /obj/effect/proc_holder/spell/invoked/smite
t2 = /obj/effect/proc_holder/spell/invoked/haste
t3 = /obj/effect/proc_holder/spell/invoked/divine_weapon
t4 = /obj/effect/proc_holder/spell/invoked/revive/minhur
mob_traits = list (TRAIT_CIVILIZEDBARBARIAN, TRAIT_DEATHBYSNOOSNOO) // "duality between life/death and revelry"
confess_lines = list(
"MINHUR'S WHIRLWIND!",
Expand Down Expand Up @@ -95,6 +105,7 @@
desc = "Onder is said to be inspiration itself. The god of Stories, Music and Memory. Onder is worshipped by bards and rogues alike. Onder’s story of being a changeling bard who walked amidst many cultures, gathering their tales and impressive many beings alike made them the god of charisma and luck."
worshippers = "Bards, Gamblers, Poets, Musicians, Diplomats and Artists."
mob_traits = list(TRAIT_BOG_TREKKING)
// To-Do. Something with song and dance?
t1 = /obj/effect/proc_holder/spell/invoked/blindness
t2 = /obj/effect/proc_holder/spell/invoked/invisibility
confess_lines = list(
Expand Down Expand Up @@ -168,10 +179,10 @@
desc = "Jayx is known as the Herald of change, often depicted as a two-tailed comet or Phoenix. The Divine Phoenix represents the immortal cycle of growth and advancement, often a god of both magic and art; they are known more than anything as the passage of time itself and bright blue magical fire. (Mana)"
worshippers = "Mages, Alchemists, Soul-Searchers, Fateweavers, Supernatural Creatures, Soothsayers."
mob_traits = list(TRAIT_USEMAGIC)
t1 = /obj/effect/proc_holder/spell/invoked/forcewall_weak
t2 = /obj/effect/proc_holder/spell/targeted/projectile/magic_missile
t3 = /obj/effect/proc_holder/spell/invoked/invisibility
t4 = /obj/effect/proc_holder/spell/invoked/projectile/fireball/greater
t1 = /obj/effect/proc_holder/spell/targeted/projectile/magic_missile
t2 = /obj/effect/proc_holder/spell/invoked/projectile/eldritchblast5e/empowered
t3 = /obj/effect/proc_holder/spell/invoked/forcewall_weak
t4 = /obj/effect/proc_holder/spell/invoked/arcyne_storm
confess_lines = list(
"THE PHOENIX BURNS BRIGHT AND PURE!",
"IN HIS FLAMES I AM REBORN!",
Expand Down
16 changes: 13 additions & 3 deletions code/datums/gods/patrons/fae.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
/datum/patron/fae
name = null
associated_faith = /datum/faith/fae
t0 = /obj/effect/proc_holder/spell/invoked/lesser_heal

/datum/patron/fae/lathrandyr
name = "Lathrandyr"
domain = "The Spring Monarch, Court of Life and Light."
desc = "Spring and it's personifactions flow through him. Those who follow him are said to be ever-young. They dance in the life all around them."
worshippers = "Spring-Affiliated Fae, Elves, Fey-Pact Warlocks. Followers of the Spring Court."
associated_faith = /datum/faith/fae
mob_traits = list(TRAIT_KNEESTINGER_IMMUNITY)
undead_hater = TRUE
t1 = /obj/effect/proc_holder/spell/targeted/blesscrop
t2 = /obj/effect/proc_holder/spell/targeted/archfey_warlock_seelie_kiss
t3 = /obj/effect/proc_holder/spell/targeted/conjure_glowshroom
t4 = /obj/effect/proc_holder/spell/invoked/revive
confess_lines = list(
"Spring courts oath, I serve the Evergreen!",
"This plane is one of many, lodestar protect!",
Expand All @@ -18,9 +26,11 @@
domain = "The Winter Monarch, Court of Ice and Shadows."
desc = "Winter and it's personifications flow through her. Those who follow her are often said to be cold and deeply emotive. They form icicles in their hearts and wield them as daggers."
worshippers = "Winter-Affiliated Fae, Elves, Fey-Pact Warlocks. Those who follow the court of winter."
associated_faith = /datum/faith/fae
mob_traits = list(TRAIT_EMPATH)
undead_hater = FALSE
t1 = /obj/effect/proc_holder/spell/invoked/projectile/rayoffrost5e
t2 = /obj/effect/proc_holder/spell/invoked/invisibility
// t3 = Snowstorm spell? Retextured arcane storm?
confess_lines = list(
"Winter courts oath, I serve the Cold Queene!",
"I FEAR NOT THE FROZEN CLASP OF WINTER!",
Expand All @@ -33,8 +43,8 @@
domain = "The Autumn Monarch, Court of Fear and Death."
desc = "Autumn and its personifications flow through them. Those that follow autumn are known for their delight in fear, and their ties to the other side. They are steeled against evils and nightmares more than most."
worshippers = "Autumn-Affiliated Fae, Elves, Fey-Pact Warlocks. Those who follow the court of Autumn."
associated_faith = /datum/faith/fae
mob_traits = list(TRAIT_EMPATH)
// Fear/direct damage spells? I think the mob flee code is too janky to rely on for it
undead_hater = FALSE
confess_lines = list(
"Autumn courts oath, I serve the The Autumn Monarch!",
Expand Down
7 changes: 3 additions & 4 deletions code/datums/gods/patrons/inhumen_pantheon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = null
associated_faith = /datum/faith/inhumen
undead_hater = FALSE
t0 = /obj/effect/proc_holder/spell/invoked/lesser_heal_inhumen
confess_lines = list(
"GRRRRR!",
"GRRRRRRRRRRRR!!",
Expand All @@ -14,7 +15,6 @@
desc = "Discovered long ago, Levisth gives power to the weak who do his bidding,elevating them in time. There are many tales of those who serve the greatsnake, all which eventuate with tales of how it yearns to gain power over all things, jealous of it's 'rivals' the other gods."
worshippers = "Power-Hungry, Powerful, Charismatic, Liars."
mob_traits = list(TRAIT_NASTY_EATER, TRAIT_SNEK, TRAIT_ZOMBIE_IMMUNE) //had to add zombie immune so as not to double dip when making the infection immune
t0 = /obj/effect/proc_holder/spell/invoked/lesser_heal_inhumen
t1 = /obj/effect/proc_holder/spell/invoked/eldritchhealing/any
t2 = /obj/effect/proc_holder/spell/invoked/projectile/lifesteal
t3 = /obj/effect/proc_holder/spell/invoked/strengthen_undead
Expand All @@ -31,7 +31,6 @@
desc = "Nyrnhe, Goddess of many dark elves - mistress of pain, suffering and venoms. Nyrnhe revels in pain-giving, pain-receiving and suffering. Contrary to belief; to kill is against her creed in comparison to the struggle and entropy."
worshippers = "Assasins, Alchemists, Torturers, Dark Elves, Cruel folk, Masochists."
mob_traits = list(TRAIT_USEMAGIC)
t0 = /obj/effect/proc_holder/spell/invoked/lesser_heal_inhumen
t1 = /obj/effect/proc_holder/spell/invoked/eldritchhealing/any
t2 = /obj/effect/proc_holder/spell/invoked/projectile/acidsplash5e
t3 = /obj/effect/proc_holder/spell/targeted/lightninglure5e
Expand All @@ -48,7 +47,6 @@
desc = "Man turned God, the 'Giver' 'The Thief' stole fire from 'Elysius' and gave it to primitive Mortal Kin huddled in darkness and demands the riches flame creates in sacrifice."
worshippers = "Free-Men, Outlaws and Frontiersmen"
mob_traits = list(TRAIT_COMMIE, TRAIT_GOODRUNNER)
t0 = /obj/effect/proc_holder/spell/invoked/lesser_heal_inhumen
t1 = /obj/effect/proc_holder/spell/invoked/Joy_takes_flight
t2 = /obj/effect/proc_holder/spell/invoked/Laughing_god
t3 = /obj/effect/proc_holder/spell/invoked/Smokebomb
Expand All @@ -65,7 +63,8 @@
desc = "The Sacrifice wishes to take from you, and for you to give it willingly. You will never get it back if you go too far. But you will always have the sacrifice."
worshippers = "Nihilists, Gamblers, Warlocks, and Villains."
mob_traits = list(TRAIT_CRACKHEAD)
t0 = /obj/effect/proc_holder/spell/invoked/lesser_heal_inhumen
t1 = /obj/effect/proc_holder/spell/invoked/projectile/fetch // Hehe, yoink
// To-do the rest
confess_lines = list(
"I do not yearn for anything!!",
"I CANNOT LOSE WHAT I COULD NEVER HOPE TO HOLD!",
Expand Down
3 changes: 2 additions & 1 deletion code/datums/gods/patrons/old_god.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
representing reincarnation and the great cosmic wheel of the planes. \
Seraph-Iros is an ancient being, considered cryptic and wise but often unfathomable.\
This is unlike other gods, some believing that\
Seraphiros would not have the time nor desire to answer mortal prayers; nor needing their faith."
Seraph-Iros would not have the time nor desire to answer mortal prayers; nor needing their faith."
worshippers = "Animists, Tribals, Old-Souls, Mystics, Sages, Fools, Scholars."
associated_faith = /datum/faith/old_god
// WHAT WOULD FIT THE FUNNY SNEK?!
confess_lines = list(
"His scales glimmer with a thousand worlds..",
"This is but a mere flicker of his tongue. All of it..!",
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/rogueclothes/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1550,8 +1550,8 @@
//Eora content from Stonekeep

/obj/item/clothing/head/roguetown/eoramask
name = "eoran mask"
desc = "A silver rabbet mask worn by the faithful of Eora, usually during their rituals."
name = "Viriitran mask"
desc = "A silver rabbit mask worn by the faithful of Viriitri, usually during their rituals."
color = null
icon_state = "eoramask"
item_state = "eoramask"
Expand Down
Loading
Loading