diff --git a/code/datums/gods/patrons/divine_pantheon.dm b/code/datums/gods/patrons/divine_pantheon.dm index 315cb45bc..105552e47 100644 --- a/code/datums/gods/patrons/divine_pantheon.dm +++ b/code/datums/gods/patrons/divine_pantheon.dm @@ -8,9 +8,9 @@ domain = "Twinned Goddess of the Sun, Day, and Order" desc = "The she-form of the Twinned Gods, the combined amalgam of single-bodied Astrata and Noc that opens her eyes at glorious Dae. Men bask under the gift of the Sun. A single form begets two Gods that shift at Dusk and Dawn but always endures, even at night." worshippers = "The Noble Hearted, Zealots and Farmers" - t1 = list(/obj/effect/proc_holder/spell/invoked/sacred_flame_rogue) - t2 = list(/obj/effect/proc_holder/spell/invoked/heal) - t3 = list(/obj/effect/proc_holder/spell/invoked/revive) + 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 confess_lines = list( "ASTRATA IS MY LIGHT!", "ASTRATA BRINGS LAW!", @@ -23,9 +23,9 @@ desc = "The he-form of the Twinned Gods, the combined amalgam of single-bodied Noc and Astrata that opens his eyes during pondorous Night. He gifted man knowledge of divinity and magicks. A single form begets two Gods that shift at Dusk and Dawn but always endures, even at dae." worshippers = "Wizards and Scholars" mob_traits = list(TRAIT_NOCSIGHT) - t1 = list(/obj/effect/proc_holder/spell/invoked/blindness) - //t2 = list(/obj/effect/proc_holder/spell/invoked/noc_blindsight) - t2 = list(/obj/effect/proc_holder/spell/invoked/invisibility) + t1 = /obj/effect/proc_holder/spell/invoked/blindness + t2 = /obj/effect/proc_holder/spell/targeted/touch/Nocdarkvision + t3 = /obj/effect/proc_holder/spell/invoked/invisibility confess_lines = list( "NOC IS NIGHT!", "NOC SEES ALL!", @@ -38,10 +38,10 @@ desc = "The God of Wilds, born from Abyssor's feverish dreams. Spilt forth life from the oceans to land in a wild craze. The Father of Ground-Lyfe. Treefather." worshippers = "Druids, Beasts, Madmen" mob_traits = list(TRAIT_KNEESTINGER_IMMUNITY) - t1 = list(/obj/effect/proc_holder/spell/targeted/blesscrop) - t2 = list(/obj/effect/proc_holder/spell/targeted/beasttame) - t3 = list(/obj/effect/proc_holder/spell/targeted/conjure_glowshroom) - t4 = list(/obj/effect/proc_holder/spell/self/howl/call_of_the_moon) + t1 = /obj/effect/proc_holder/spell/targeted/blesscrop + t2 = /obj/effect/proc_holder/spell/targeted/beasttame + t3 = /obj/effect/proc_holder/spell/targeted/conjure_glowshroom + t4 = /obj/effect/proc_holder/spell/self/howl/call_of_the_moon confess_lines = list( "DENDOR PROVIDES!", "THE TREEFATHER BRINGS BOUNTY!", @@ -78,9 +78,9 @@ desc = "Veiled Lady of the underworld, equally feared and respected by mortals. She taught mortals the inevitability of death and cares for them as they reach the afterlife." worshippers = "The Dead, Mourners, Gravekeepers" mob_traits = list(TRAIT_SOUL_EXAMINE) - t1 = list(/obj/effect/proc_holder/spell/invoked/avert) - t2 = list(/obj/effect/proc_holder/spell/targeted/churn) - t3 = list(/obj/effect/proc_holder/spell/targeted/soulspeak) + t1 = /obj/effect/proc_holder/spell/invoked/avert + t2 = /obj/effect/proc_holder/spell/targeted/churn + t3 = /obj/effect/proc_holder/spell/targeted/soulspeak confess_lines = list( "ALL SOULS FIND THEIR WAY TO NECRA!", "THE UNDERMAIDEN IS OUR FINAL REPOSE!", @@ -129,11 +129,11 @@ desc = "Opinionless god of the crafts. He teaches that great works for killing or saving are great works, either way. The well-oiled guillotine and the well-sharpened axe are tools, and there is no good and evil to their craft." worshippers = "Smiths, Miners, Engineers" mob_traits = list(TRAIT_MALUMSGRACE) - t1 = list(/obj/effect/proc_holder/spell/invoked/sacred_flame_rogue) - t1 = list(/obj/effect/proc_holder/spell/invoked/vigorousexchange) - t2 = list(/obj/effect/proc_holder/spell/invoked/heatmetal) - t3 = list(/obj/effect/proc_holder/spell/invoked/hammerfall) - t4 = list(/obj/effect/proc_holder/spell/invoked/craftercovenant) + t1 = /obj/effect/proc_holder/spell/invoked/sacred_flame_rogue + t1 = /obj/effect/proc_holder/spell/invoked/vigorousexchange + t2 = /obj/effect/proc_holder/spell/invoked/heatmetal + t3 = /obj/effect/proc_holder/spell/invoked/hammerfall + t4 = /obj/effect/proc_holder/spell/invoked/craftercovenant confess_lines = list( "MALUM IS MY MUSE!", "TRUE VALUE IS IN THE TOIL!", @@ -147,9 +147,9 @@ domain = "Goddess of Love, Life and Beauty" desc = "Baotha's fairer half, made from blind, unconditional love. She is without a shred of hate in her heart and taught mankind that true love that even transcends Necra's grasp." worshippers = "Lovers, the romantically inclined, and Doting Grandparents" - t0 = list(/obj/effect/proc_holder/spell/invoked/lesser_heal) - t1 = list(/obj/effect/proc_holder/spell/invoked/bud) - t2 = list(/obj/effect/proc_holder/spell/invoked/eoracurse) + t0 = /obj/effect/proc_holder/spell/invoked/lesser_heal + t1 = /obj/effect/proc_holder/spell/invoked/bud + t2 = /obj/effect/proc_holder/spell/invoked/eoracurse t3 = null confess_lines = list( "EORA BRINGS US TOGETHER!", diff --git a/code/datums/gods/patrons/inhumen_pantheon.dm b/code/datums/gods/patrons/inhumen_pantheon.dm index f2b5215cc..59b74ab9b 100644 --- a/code/datums/gods/patrons/inhumen_pantheon.dm +++ b/code/datums/gods/patrons/inhumen_pantheon.dm @@ -42,9 +42,9 @@ desc = "The Man who stole fire from the Underworld and gave it in exchange for worship; the first Transaction, cutting a hole in the firmament and flooding ontological reality with the fact of Wealth. Take from the wealthy, give to the worthless, empower." worshippers = "Highwaymen, Robbers, Downtrodden Peasants, Merchants" mob_traits = list(TRAIT_COMMIE) - t1 = list(/obj/effect/proc_holder/spell/invoked/appraise) - t2 = list(/obj/effect/proc_holder/spell/invoked/transact) - t3 = list(/obj/effect/proc_holder/spell/invoked/equalize) + t1 = /obj/effect/proc_holder/spell/invoked/appraise + t2 = /obj/effect/proc_holder/spell/invoked/transact + t3 = /obj/effect/proc_holder/spell/invoked/equalize //t3 = /obj/effect/proc_holder/spell/invoked/churnwealthy - maybe if i could think on how to nerf that. confess_lines = list( "MATTHIOS STEALS FROM THE WORTHLESS!", diff --git a/code/modules/jobs/job_types/roguetown/church/monk.dm b/code/modules/jobs/job_types/roguetown/church/monk.dm index cba839092..765f756b5 100644 --- a/code/modules/jobs/job_types/roguetown/church/monk.dm +++ b/code/modules/jobs/job_types/roguetown/church/monk.dm @@ -22,7 +22,7 @@ name = "Acolyte" jobtype = /datum/job/roguetown/monk - allowed_patrons = list(/datum/patron/divine/pestra, /datum/patron/divine/astrata, /datum/patron/divine/eora, /datum/patron/divine/noc, /datum/patron/divine/necra) //Eora content from Stonekeep + allowed_patrons = list(/datum/patron/divine/pestra, /datum/patron/divine/astrata, /datum/patron/divine/eora, /datum/patron/divine/noc, /datum/patron/divine/necra, /datum/patron/divine/malum) //Eora content from Stonekeep /datum/outfit/job/roguetown/monk/pre_equip(mob/living/carbon/human/H)