diff --git a/code/__DEFINES/storytellers.dm b/code/__DEFINES/storytellers.dm index 394741b7991..fc7a5db70e8 100644 --- a/code/__DEFINES/storytellers.dm +++ b/code/__DEFINES/storytellers.dm @@ -3,7 +3,7 @@ #define TAG_ASTRATA "Visires" #define TAG_NOC "Akan" -#define TAG_RAVOX "Al'Aqshir" +#define TAG_RAVOX "Mordsol" #define TAG_ABYSSOR "Mjallidhorn" #define TAG_XYLIX "Iliope" #define TAG_NECRA "Valdala" @@ -31,7 +31,7 @@ /// Tag reserved for combat logic (unused by gods) #define TAG_COMBAT "Combat" -/// Tag used for raid events, associated with Al'Aqshir +/// Tag used for raid events, associated with Mordsol #define TAG_RAID "Raid" /// Tag representing trade interactions, used by Mjallidhorn and Deceivers @@ -201,7 +201,7 @@ // Divine pantheon #define ASTRATA "Visires" #define NOC "Akan" -#define RAVOX "Al'Aqshir" +#define RAVOX "Mordsol" #define ABYSSOR "Mjallidhorn" #define XYLIX "Iliope" #define NECRA "Valdala" diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 4c051896639..f526415f9e8 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -337,8 +337,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_GUIDANCE "guidance" #define DEVOTION_TRAIT "devotion_trait" #define RAGE_TRAIT "rage_trait" -#define TRAIT_PSYDONIAN_GRIT "Psydonian Grit" // Pain Tolerance. Through faith, ENDURE. -#define TRAIT_PSYDONITE "Psydonite's Devotion" // Anti-Miracles on a selective basis, anastasis / cure rot still apply. Slow passive wound healing while you have blood. +#define TRAIT_PSYDONIAN_GRIT "Angrosian Grit" // Pain Tolerance. Through faith, ENDURE. #define TRAIT_BLACKBAGGER "Apprehension Techniques" // Capable of using Garrotes and Blackbags. Apprehension techniques. #define TRAIT_LYCANRESILENCE "Werewolf Resilence" @@ -423,23 +422,31 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai // Divine patron trait bonuses: #define TRAIT_SOUL_EXAMINE "Blessing of Valdala" //can check bodies to see if they have departed -#define TRAIT_ROT_EATER "Blessing of Erdl" //can eat rotten food +#define TRAIT_ROT_EATER "Blessing of Decay" //can eat rotten food #define TRAIT_KNEESTINGER_IMMUNITY "Blessing of Gani" //Can move through kneestingers. -#define TRAIT_LEECHIMMUNE "Unleechable" //leeches drain very little blood +#define TRAIT_LEECHIMMUNE "Blessing of Erdl" //leeches drain very little blood +#define TRAIT_ABYSSOR_SWIM "Blessing of the Nortics" //less base fatigue drain when swimming #define TRAIT_SHARPER_BLADES "Sharper Blades" //Weapons lose less blade integrity #define TRAIT_BETTER_SLEEP "Better Sleep" //Recover more energy (blue bar) when sleeping #define TRAIT_EXTEROCEPTION "Exteroception" //See others' hunger and thirst #define TRAIT_TUTELAGE "Tutelage" //Slightly more sleep xp to you and xp to apprentices #define TRAIT_APRICITY "Apricity" //Decreased stamina regen time during "day" #define TRAIT_BLACKLEG "Blackleg" //Rig coin, dice, cards in your favor -#define TRAIT_INQUISITION "Member of the Oratorium Throni Vacui" +#define TRAIT_SALVATIONIST "Salvationist's Grief" //Prayers about a dead god manifest differently or something +#define TRAIT_INQUISITION "Member of the Katholikos Inquisition" #define TRAIT_PURITAN "Puritan" #define TRAIT_SILVER_BLESSED "Silver Blessed" // Inhumen patron trait bonuses: -#define TRAIT_ORGAN_EATER "Blessing of Archdevil"//Can eat organs (duh.) and raw meat +#define TRAIT_ARCHDEVILS "Cult of the Archdevils" //Archdevil worshippers recognize each other +#define TRAIT_ORGAN_EATER "Blessing of the Archdevils"//Can eat organs (duh.) and raw meat +#define TRAIT_HERTANNEA "Cult of Hertannea" //Hertannea worshippers recognize each other #define TRAIT_CRACKHEAD "Blessing of Hertannea" //No overdose on drugs. -#define TRAIT_CABAL "Of the Cabal" //One Envy cultists recognize each other too +#define TRAIT_ABSOLUTIONIST "Cult of Madness" //Absolutionist Angros worshippers recognize each other +#define TRAIT_PSYDONITE "Absolutionist's Devotion" // Anti-Miracles on a selective basis, anastasis / cure rot still apply. Slow passive wound healing while you have blood. +#define TRAIT_CORRUPTED "Tainted" //All worshippers of Hell's pawns recognise each other. +#define TRAIT_CABAL "Blood of the One Envy" //Shirleighs recognize each other, and their non-royal believers +#define TRAIT_CABAL_CHUD "Cult of the Jealous God" //One Envy cultists recognize each other too #define TRAIT_MATTHIOS_EYES "Eyes of Deceivers" //Examine to see the most expensive item someone has #define INSPIRING_MUSICIAN "Inspiring Musician" // unlocks bardic inspiration stuff @@ -490,7 +497,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_PSYDON_CURSE "Angros' Curse" #define TRAIT_ASTRATA_CURSE "Visires' Curse" #define TRAIT_NOC_CURSE "Akan's Curse" -#define TRAIT_RAVOX_CURSE "Al'Aqshir's Curse" +#define TRAIT_RAVOX_CURSE "Mordsol's Curse" #define TRAIT_NECRA_CURSE "Valdala's Curse" #define TRAIT_XYLIX_CURSE "Iliope's Curse" #define TRAIT_PESTRA_CURSE "Erdl's Curse" diff --git a/code/__HELPERS/round_statistics.dm b/code/__HELPERS/round_statistics.dm index 8c3e707e730..3659931c676 100644 --- a/code/__HELPERS/round_statistics.dm +++ b/code/__HELPERS/round_statistics.dm @@ -103,7 +103,7 @@ #define STATS_DENDOR_SACRIFICES "dendor_sacrifices" #define STATS_FOREST_DEATHS "forest_deaths" -// Al'Aqshir +// Mordsol #define STATS_COMBAT_SKILLS "combat_skills" #define STATS_PARRIES "parries" #define STATS_WARCRIES "warcries" diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index d6597e79f85..98942f062b9 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -83,13 +83,20 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_FINGERPRINT_PASSTHROUGH" = TRAIT_FINGERPRINT_PASSTHROUGH, "TRAIT_SOUND_DEBUGGED" = TRAIT_SOUND_DEBUGGED, //Rogue Traits Past here + "Cult of the Archdevils" = TRAIT_ARCHDEVILS, + "Cult of Hertannea" = TRAIT_HERTANNEA, + "Cult of Madness" = TRAIT_ABSOLUTIONIST, + "Tainted" = TRAIT_CORRUPTED, "Blessing of Hertannea" = TRAIT_CRACKHEAD, - "Blessing of Archdevil" = TRAIT_ORGAN_EATER, - "Blessing of Erdl"= TRAIT_ROT_EATER, + "Blessing of the Archdevils" = TRAIT_ORGAN_EATER, + "Blessing of Decay"= TRAIT_ROT_EATER, "Blessing of Gani" = TRAIT_KNEESTINGER_IMMUNITY, "Blessing of Valdala" = TRAIT_SOUL_EXAMINE, + "Blessing of the Nortics" = TRAIT_ABYSSOR_SWIM, + "Salvationist's Grief" = TRAIT_SALVATIONIST, "Golden Blood" = TRAIT_SEEPRICES, - "Of the Cabal" = TRAIT_CABAL, + "Blood of the One Envy" = TRAIT_CABAL, + "Cult of the Jealous God" = TRAIT_CABAL_CHUD, "Unleechable" = TRAIT_LEECHIMMUNE, "Webwalker" = TRAIT_WEBWALK, "Brushwalker" = TRAIT_BRUSHWALK, @@ -224,6 +231,7 @@ GLOBAL_LIST_INIT(roguetraits, list( TRAIT_NOSLEEP = span_warning("I can't sleep."), TRAIT_NUDIST = "I refuse to wear clothes. They are a hindrance to my freedom.", TRAIT_KNEESTINGER_IMMUNITY = "I am immune to the shock of kneestingers.", + TRAIT_SALVATIONIST = span_blue("My prayers to Angros are no less fervent than those of the other faithful, but they must always be in service to keeping the Mad God in eternal slumber."), TRAIT_INHUMANE_ANATOMY = "My anatomy is inhumen, preventing me from wearing hats and shoes.", TRAIT_NASTY_EATER = span_dead("I can eat bad food, and water that would be toxic to humen will not affect me."), TRAIT_NOFALLDAMAGE1 = span_info("I can easily handle minor falls."), @@ -254,8 +262,13 @@ GLOBAL_LIST_INIT(roguetraits, list( TRAIT_SHOCKIMMUNE = "I am immune to electrical shocks.", TRAIT_INTRAINING = "I'm going to be a knight someday! I can use training dummies more effectively than others.", TRAIT_MALUMFIRE = "My hands are blessed by Goler Kanh to forge items of superb quality.", - TRAIT_DEATHSIGHT = span_info("I can feel when someone nearby draws the Undermaiden's attention, a tiny voice whispering 'Someone has died,' in my ear."), - TRAIT_CABAL = span_purple("In secret, I have studied the ways of Her ascension, and know of others of the Cabal."), + TRAIT_DEATHSIGHT = span_info("I can feel when someone nearby draws the Valkyrie's attention, a tiny voice whispering 'Someone has died,' in my ear."), + TRAIT_CABAL = span_purple("I'm a Shirleigh, and the power of the One Envy is present in my very blood. I know others that proclaim faith in her at a glance."), + TRAIT_CABAL_CHUD = span_purple("In secret, I have been initiated into the followers of the Jealous God, and know of others of the cult."), + TRAIT_ARCHDEVILS = span_red("I worship the powers of Hell beneath our feet, and can recognise others that do the same."), + TRAIT_HERTANNEA = span_purple("I'm a follower of Hertannea, the Faerie Devil, and know of others of Her cult."), + TRAIT_ABSOLUTIONIST = span_red("I pray for the return of the Mad God with all my heart, and I can recognise the same fervent belief in others."), + TRAIT_CORRUPTED = span_red("The taint of Hell is present within my blood, and I can sense it in others."), TRAIT_LEGENDARY_ALCHEMIST = span_info("An expert in the art of finding herbs in the wild."), TRAIT_DECEIVING_MEEKNESS = "People look at me and think I am a weakling. They are mistaken.", TRAIT_THIEVESGUILD = "I am a member of the thieves' guild!", @@ -269,7 +282,8 @@ GLOBAL_LIST_INIT(roguetraits, list( TRAIT_TUTELAGE = "I am a capable tutor to those who apprentice under me.", TRAIT_APRICITY = "The warmth of the sun rejuvenates me, allowing me to regain my stamina quicker.", TRAIT_BLACKLEG = "I can cheat by rigging coin and dice, and peek at cards.", - TRAIT_INQUISITION = span_info("I am a member of the Oratorium Throni Vacui. I can easily identify others of my cadre at a glance."), + TRAIT_ABYSSOR_SWIM = "I get far less tired when swimming than my peers.", + TRAIT_INQUISITION = span_info("I am a member of the Katholikos Inquisition. I can easily identify others of my cadre at a glance."), TRAIT_SILVER_BLESSED = span_info("I am anointed with holy silver, which preserves me from curses that bite, miracles of the false gods hold no sway over me."), TRAIT_MATTHIOS_EYES = span_notice("I have a sense for what the most valuable item someone has is."), TRAIT_CRATEMOVER = "I am able to drag heavy objects without any difficulty.", @@ -299,8 +313,8 @@ GLOBAL_LIST_INIT(roguetraits, list( TRAIT_POISON_RESILIENCE = span_info("I'm more resilient to poisons."), TRAIT_FORAGER = span_info("I can tell which jacksberries are poisonous."), TRAIT_SEED_FINDER = span_info("I find seeds more easily."), - TRAIT_PSYDONITE = span_info("PSYDON LIVES. PSYDON PERSISTS. I can ENDURE and LIVE with wounds better than most."), - TRAIT_PSYDONIAN_GRIT = span_info("I can shrug off my wounds and maintain composure under duress. My own mortality is proof that I LIVE, as too does HE."), + TRAIT_PSYDONITE = span_info("Angros will rise again! As long as I hold fast to my faith and do not bleed myself dry, I can recover from and endure most injuries. Most miracles of the betrayer pantheon will not be of aid to me."), + TRAIT_PSYDONIAN_GRIT = span_info("I can shrug off my wounds and maintain composure under duress. My faith must endure, for the sake of the Worldflame."), TRAIT_BLACKBAGGER = span_info("I've been trained to properly abduct individuals through the use of seizing garrotes and blackbags."), TRAIT_NOCSHADES = span_info("The lens I look through allows me to see in the dark clear as dae, at the cost of greater vision."), TRAIT_LYCANRESILENCE = span_info("Gani's fury flows through my veins, my wounds regenerate over time..."), diff --git a/code/controllers/subsystem/death_arena.dm b/code/controllers/subsystem/death_arena.dm index de12ae9afa3..d806c156d12 100644 --- a/code/controllers/subsystem/death_arena.dm +++ b/code/controllers/subsystem/death_arena.dm @@ -187,7 +187,7 @@ SUBSYSTEM_DEF(death_arena) /obj/structure/table/wood/fine/altar - name = "Al'Aqshir's sacrifical altar" + name = "Mordsol's sacrifical altar" desc = "It awaits an offering of your triumphs" icon = 'icons/roguetown/misc/structure.dmi' icon_state = "ravox_altar" @@ -201,8 +201,8 @@ SUBSYSTEM_DEF(death_arena) SSdeath_arena.process_fight_end(item, user) /obj/structure/underworld/ravox - name = "Al'Aqshir" - desc = "Al'Aqshir, God of Warfare, Justice, and Bravery. He finds solace in his friendship with Valdala and his retreat to the Underworld. Upon your gaze, he gives you a respectful nod. Damn, he's cool.." + name = "Mordsol" + desc = "Mordsol, God of Warfare, Justice, and Bravery. He finds solace in his friendship with Valdala and his retreat to the Underworld. Upon your gaze, he gives you a respectful nod. Damn, he's cool.." icon = 'icons/roguetown/underworld/ravox.dmi' icon_state = "ravox" layer = ABOVE_MOB_LAYER @@ -215,7 +215,7 @@ SUBSYSTEM_DEF(death_arena) /obj/structure/underworld/necra name = "Valdala" - desc = "The Undermaiden herself, in her true form. The most ancient of living gods. She observes your battles gleefully, gratitude in her eyes to be relieved from the arduousness of eternity. Her close friend and confidant, Al'Aqshir, sits by her side. The two must have worked hard to restructure the underworld like this. They seem pleased with their work." + desc = "The Undermaiden herself, in her true form. The most ancient of living gods. She observes your battles gleefully, gratitude in her eyes to be relieved from the arduousness of eternity. Her close friend and confidant, Mordsol, sits by her side. The two must have worked hard to restructure the underworld like this. They seem pleased with their work." icon = 'icons/roguetown/underworld/necra.dmi' icon_state = "necra" layer = ABOVE_MOB_LAYER diff --git a/code/controllers/subsystem/storyteller.dm b/code/controllers/subsystem/storyteller.dm index 5255e56b794..8d71a88e578 100644 --- a/code/controllers/subsystem/storyteller.dm +++ b/code/controllers/subsystem/storyteller.dm @@ -303,7 +303,7 @@ SUBSYSTEM_DEF(gamemode) "...you see a flower bloom in ash. It dies and returns, brighter, stranger. The rhythm of endings comforts you...", ), - "Al'Aqshir"= list( + "Mordsol"= list( "...a sword rests beside a scale... neither tips...", "...steel sings in your dreams... a verdict is written in blood and flame, but justice waits before it lands...", "...you duel a mirror image of yourself... the victor is neither, yet the fight continues... law and war share the same breath..." diff --git a/code/controllers/subsystem/triumph/buy_datums/storyteller/negative_influence.dm b/code/controllers/subsystem/triumph/buy_datums/storyteller/negative_influence.dm index 8a642d11a94..28f9734dcd7 100644 --- a/code/controllers/subsystem/triumph/buy_datums/storyteller/negative_influence.dm +++ b/code/controllers/subsystem/triumph/buy_datums/storyteller/negative_influence.dm @@ -70,7 +70,7 @@ storyteller_name = ABYSSOR /datum/triumph_buy/storyteller_influence_reduction/ravox - name = "Al'Aqshir's Influence Reduction" + name = "Mordsol's Influence Reduction" triumph_buy_id = TRIUMPH_BUY_RAVOX_INFLUENCE_REDUCTION storyteller_name = RAVOX diff --git a/code/controllers/subsystem/triumph/buy_datums/storyteller/positive_influence.dm b/code/controllers/subsystem/triumph/buy_datums/storyteller/positive_influence.dm index 359575b68df..fb8aaf1427e 100644 --- a/code/controllers/subsystem/triumph/buy_datums/storyteller/positive_influence.dm +++ b/code/controllers/subsystem/triumph/buy_datums/storyteller/positive_influence.dm @@ -70,7 +70,7 @@ storyteller_name = ABYSSOR /datum/triumph_buy/storyteller_influence_bonus/ravox - name = "Al'Aqshir's Influence" + name = "Mordsol's Influence" triumph_buy_id = TRIUMPH_BUY_RAVOX_INFLUENCE storyteller_name = RAVOX diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index d8ca314af96..6ed26616ae9 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -272,7 +272,7 @@ SUBSYSTEM_DEF(vote) if("endround") var/rng = rand(1, 1000) if(rng > 200) // 80% - initiator_key = pick("Visires", "Akan", "Gani", "Mjallidhorn", "Valdala", "Al'Aqshir", "Iliope", "Erdl", "Goler Kanh", "Pomette") + initiator_key = pick("Visires", "Akan", "Gani", "Mjallidhorn", "Valdala", "Mordsol", "Iliope", "Erdl", "Goler Kanh", "Pomette") else if(rng > 50) // 15% initiator_key = pick("One Envy", "Archdevil", "Deceivers", "Hertannea") else diff --git a/code/datums/faith/devotion_subtypes.dm b/code/datums/faith/devotion_subtypes.dm index c6fedd80ca6..c709ed9977b 100644 --- a/code/datums/faith/devotion_subtypes.dm +++ b/code/datums/faith/devotion_subtypes.dm @@ -83,6 +83,22 @@ CLERIC_T3 = /datum/action/cooldown/spell/charm/eoran ) +/datum/devotion/divine/angros + miracles = list( + CLERIC_T0 = /datum/action/cooldown/spell/healing, + CLERIC_T1 = /datum/action/cooldown/spell/sacred_flame, + CLERIC_T2 = /datum/action/cooldown/spell/healing/greater, + CLERIC_T3 = /datum/action/cooldown/spell/revive, + ) + +/datum/devotion/divine/undivided + miracles = list( + CLERIC_T0 = /datum/action/cooldown/spell/healing, + CLERIC_T1 = /datum/action/cooldown/spell/sacred_flame, + CLERIC_T2 = /datum/action/cooldown/spell/healing/greater, + CLERIC_T3 = /datum/action/cooldown/spell/revive, + ) + // Inhumen /datum/devotion/inhumen/make_cleric() . = ..() @@ -140,3 +156,11 @@ CLERIC_T2 = /datum/action/cooldown/spell/projectile/blowingdust, CLERIC_T3 = /datum/action/cooldown/spell/painkiller, ) + +/datum/devotion/inhumen/angros + miracles = list( + CLERIC_T0 = /datum/action/cooldown/spell/find_flaw, + CLERIC_T1 = /datum/action/cooldown/spell/baothablessings, + CLERIC_T2 = /datum/action/cooldown/spell/projectile/blowingdust, + CLERIC_T3 = /datum/action/cooldown/spell/painkiller, + ) diff --git a/code/datums/gods/patrons/atheism.dm b/code/datums/gods/patrons/atheism.dm index 4c024c74ac2..8d699bc0a07 100644 --- a/code/datums/gods/patrons/atheism.dm +++ b/code/datums/gods/patrons/atheism.dm @@ -15,10 +15,10 @@ /datum/patron/godless/godless //lol lmao name = "Godless" domain = "Abandonment of the Gods" - desc = "Worship of the gods is foolish! Gods exist, but you refuse to worship them due to your own hubris." - flaws = "Stubborn, Unrelenting, Misguided" - worshippers = "Egomaniacs, Heretics, the Ignorant" - sins = "Idolatry, Worship, Blind Faith" + desc = "Worship of the Gods is foolish! Gods exist, but you refuse to worship them due to your own hubris." + flaws = "Stubborn, unrelenting, misguided" + worshippers = "Egomaniacs, heretics, the ignorant" + sins = "Idolatry, worship, blind Faith" boons = "None, you godless heathen." confess_lines = list( @@ -30,11 +30,11 @@ /datum/patron/godless/autotheist name = "Autotheist" domain = "Self-Deification" - desc = "Forget the Divine Pantheon, YOU are a god! The mortals don't know it, but you walk alongside them in your shell. You are the true ruler of this world!" - flaws = "Stubborn, Pride, Superiority" - worshippers = "Egomaniacs, The Self-Obsessed, Megalomaniacs" - sins = "Humility, Self-Doubt" - boons = "None." + desc = "Forget the Divine Pantheon, YOU are a God! The mortals don't know it, but you walk alongside them in your shell. You are the true ruler of this world!" + flaws = "Stubborn, pride, superiority" + worshippers = "Egomaniacs, the self-obsessed, megalomaniacs" + sins = "Humility, self-doubt, deference to another." + boons = "None, you godless heathen." confess_lines = list( "I AM THE ONLY TRUE GOD!", @@ -46,10 +46,10 @@ name = "Defiant" domain = "Rejection of Gods" desc = "You have a grave distaste for authority, so much so to the point where you decided that you refuse to worship the gods! They are merely another form of authority, and you will never bow down to them." - flaws = "Defiant, Rebellious, Unrelenting" - worshippers = "Anarchists, Rebels" //fuck the system, og - sins = "Obedience, Submission" - boons = "None." + flaws = "Defiant, rebellious, unrelenting." + worshippers = "Anarchists, rebels, the listless." //fuck the system, og + sins = "Obedience, submission" + boons = "None, you godless heathen." confess_lines = list( "I WILL NEVER BOW TO ANYONE- NOT EVEN THE DIVINE!", @@ -60,45 +60,28 @@ /datum/patron/godless/dystheist name = "Dystheist" domain = "Rejection of Gods" - desc = "You see the gods for what they truly are: powerful, yet flawed and unworthy of worship." - flaws = "Cynical, Judgmental" - worshippers = "Skeptics, The Disillusioned" - sins = "Blind Faith" - boons = "None." + desc = "You see the Gods for what they truly are: powerful, yet flawed, and unworthy of worship." + flaws = "Cynical, judgmental, holier-than-thou." + worshippers = "Skeptics, the disillusioned." + sins = "Blind faith." + boons = "None, you godless heathen." confess_lines = list( "THE GODS MEAN NOTHING TO ME!", - "THE TEN ARE FLAWED!", - "I WILL NEVER BOW DOWN TO ANY OF THOSE TYRANTS, DIVINE NOR INHUMEN!" + "THE ELEMENTALS ARE FLAWED!", + "I WILL NEVER BOW DOWN TO ANY OF THOSE TYRANTS, DIVINE NOR INFERNAL!" ) /datum/patron/godless/naivety name = "Naivety" domain = "Indifference" - desc = "Either due to never being informed, a memory issue, or perhaps a brain injury, you have no clue what gods are!" - flaws = "Ignorant, Naive, Stupid" - worshippers = "Younglings, Ignorant, Fools" - sins = "..What's that?" - boons = "..What is that?" + desc = "Either due to never being informed, a memory issue, or perhaps a brain injury, you have no clue what Gods are!" + flaws = "Ignorant, naive, stupid." + worshippers = "Younglings, the ignorant, fools, and the addled." + sins = "...What's that?" + boons = "...What is that?" confess_lines = list( "I DON'T KNOW WHAT YOU'RE TALKING ABOUT!", "WHAT'S A GOD?!", "NOBODY EVER TOLD ME ABOUT THE DIVINE!" ) - -/datum/patron/godless/rashan - name = "Rashan-Kahl" - domain = "Twin-faced god of ambition and chains" - desc = "Rashan represents both creation and destruction, freedom and bondage: a duality that mirrors the rakshari's complex relationship with power. Temples to Rashan-Kahl often double as marketplaces, symbolizing the transactional nature of life." - flaws = "Flaws of their followers" - worshippers = "Rakshari, Slavers, His Majesty" - sins = "Sins of their Followers" - boons = "The will to meow" - confess_lines = list( - "WHAT MUST I PAY FOR THE PAIN TO STOP!", - "I AM UNCHAINED!!", - "I AM PROMISED FREEDOM", - "MY GOD IS FREEDOM WHILE YOURS ARE SHACKLES!", - "RASHAN-KAHL WILL ENSLAVE YOU!" - ) - allowed_races = list(SPEC_ID_RAKSHARI) diff --git a/code/datums/gods/patrons/curses.dm b/code/datums/gods/patrons/curses.dm index d26b4eb1b83..1fe5a4825f2 100644 --- a/code/datums/gods/patrons/curses.dm +++ b/code/datums/gods/patrons/curses.dm @@ -81,7 +81,7 @@ trait = TRAIT_NOC_CURSE /datum/curse/ravox - name = "Al'Aqshir's Curse" + name = "Mordsol's Curse" description = "Violence disgusts me. I struggle to bring myself to wield any kind of weapon." trait = TRAIT_RAVOX_CURSE diff --git a/code/datums/gods/patrons/divine_pantheon.dm b/code/datums/gods/patrons/divine_pantheon.dm index 90af8e619ab..afdb821a6fa 100644 --- a/code/datums/gods/patrons/divine_pantheon.dm +++ b/code/datums/gods/patrons/divine_pantheon.dm @@ -40,168 +40,177 @@ GLOBAL_LIST_INIT(patron_sound_themes, list( /datum/patron/divine/astrata name = ASTRATA - domain = "Goddess of Order, the Sun Queen" - desc = "Crafted from the head of Angros, twin of Akan. She gifted mankind the Sun, protecting Psydonia from all forces which may seek it harm: from both outside and within." - flaws = "Tyrannical, Ill-Tempered, Uncompromising" - worshippers = "Nobles, Zealots, Commoners" - sins = "Betrayal, Sloth, Witchcraft" + display_name = "Visires" + domain = "The Youthful; Aspect and sole remainder of the Court of Fire." + desc = "The youngest of the Elemental Gods. A once-mortal given host to the Aspect of Fire and made divine. The worship of Visires represents the plea for passion, life and the will to live; just as much it does the destruction, the hunger and the chaos that it may impose." + flaws = "Tyrannical, ill-tempered, uncompromising." + worshippers = "Conquerors, the wrathful, the pupils of the Sun's science." + sins = "Charity, overt benevolence without gain, giving handouts." boons = "Your stamina regeneration delay is lowered during daytime." added_traits = list(TRAIT_APRICITY) devotion_holder = /datum/devotion/divine/astrata confess_lines = list( - "ASTRATA IS MY LIGHT!", - "ASTRATA BRINGS LAW!", - "I SERVE THE GLORY OF THE SUN!", + "VISIRES SUNDERS!", + "THE ASPECT OF FIRE HUNGERS!", + "I SERVE THE STARS!", ) storyteller = /datum/storyteller/astrata associated_psycross = /obj/item/clothing/neck/psycross/silver/astrata /datum/patron/divine/noc name = NOC - domain = "God of Knowledge, the Moon Prince" - desc = "Crafted from the helmet of Angros, twin of Visires. He gifted mankind divine wisdom." - flaws = "Cynical, Isolationist, Unfiltered Honesty" - worshippers = "Magic Practitioners, Scholars, Scribes" - sins = "Suppressing Truth, Burning Books, Censorship" - boons = "You learn, dream, and teach apprentices slightly better. Access to roles with magic." - added_traits = list(TRAIT_TUTELAGE) + display_name = "Akan" + domain = "The Elder; Aspect and ruler of the Court of Air. God of the sky and heavens." + desc = "Akan, the Elder, embodies the fundamental element of air. They are an ancient spirit made divine as they would personify the very essence of the wistful, everlasting and free Aspect of the Sky." + flaws = "Fleeting, non-commital, unfiltered honesty." + worshippers = "Nomads, scholars, sailors and the forever-free." + sins = "Suppressing truth, burning books, willful ignorance." + boons = "You learn, dream, and teach apprentices slightly better. The veil of darkness parts easier for you under the light of the moon." + added_traits = list(TRAIT_NIGHT_OWL, TRAIT_TUTELAGE) devotion_holder = /datum/devotion/divine/noc confess_lines = list( - "NOC IS NIGHT!", - "NOC SEES THE TRUTH!", - "I SEEK THE MYSTERIES OF THE MOON!", + "AKAN HEARS, BUT DOES NOT SEE!", + "I SEE WHAT THE BLIND MAN SEES!", + "A CLOUD 'BOUT THE ERRANT SOUL!", ) storyteller = /datum/storyteller/noc associated_psycross = /obj/item/clothing/neck/psycross/silver/noc /datum/patron/divine/dendor name = DENDOR - domain = "God of Nature and Beasts" - desc = "Crafted from the bones of Angros as the embodiment of the natural world. Driven mad with time." - flaws = "Madness, Rebelliousness, Disorderliness" - worshippers = "Druids, Beasts, Madmen" - sins = "Deforestation, Overhunting, Disrespecting Nature" - boons = "You are immune to kneestingers." - added_traits = list(TRAIT_KNEESTINGER_IMMUNITY) + display_name = "Gani" + domain = "The Mother; Aspect and ruler of the Court of Earth. Goddess of the stone and soil." + desc = "Gani, the Mother, embodies the fundamental element of earth. They are an ancient spirit made divine as they would personify the very essence of the stern, immovable and protective Aspect of Stone. Gani is the world beneath the feet of all. She is the only God of the Four whose omnipresence extends beyond her domain." + flaws = "Overbearing, autophobic, anxiety-prone." + worshippers = "All Earthly things, the farms, the huntsmen, matriarchs and druids." + sins = "Cruelty, isolationism, disrespect of nature." + boons = "You are immune to kneestingers. You instinctively understand when people are stressed, in pain, or hungry." + added_traits = list(TRAIT_KNEESTINGER_IMMUNITY, TRAIT_EMPATH, TRAIT_EXTEROCEPTION) devotion_holder = /datum/devotion/divine/dendor confess_lines = list( - "DENDOR PROVIDES!", - "THE TREEFATHER BRINGS BOUNTY!", - "I ANSWER THE CALL OF THE WILD!", + "GOLDEN GREENING!", + "WE SPROUT ANEW!", + "BY LEAF AND LIMB!", ) storyteller = /datum/storyteller/dendor associated_psycross = /obj/item/clothing/neck/psycross/silver/dendor /datum/patron/divine/abyssor name = ABYSSOR - domain = "God of Seas and Storms" - desc = "Crafted from the blood of Angros as sovereign of the waters. Enraged by ignorance of Him from followers of The Ten." - flaws= "Reckless, Stubborn, Destructive" - worshippers = "Sailors of the Sea and Sky, Horrid Sea-Creachers, Fog Islanders" - sins = "Fear, Hubris, Forgetfulness" - boons = "Leeches will drain very little of your blood." - added_traits = list(TRAIT_LEECHIMMUNE) + display_name = "Mjallidhorn" + domain = "The Warrior; Aspect and ruler of the Court of Frost." + desc = "Mjhallidhorn, the Warrior, embodies the fundamental element of ice. They are a once-mortal made divine as they would personify the very essence of the ruthless, brutal and materialistic Aspect of Frost. Mjallidhorn is an Elemental locked in battle in the far north against the hordes of Hell, perhaps forevermore." + flaws = "Reckless, stubborn, destructive." + worshippers = "Warriors, sellswords, the vengeful and sailors." + sins = "Cowardice, hesitation, passivity." + boons = "Your used weapons dull slower. Swimming is less tiring. You may sense the presence of a soul within a body, and when a mortal meets their demise." + added_traits = list(TRAIT_ABYSSOR_SWIM, TRAIT_SOUL_EXAMINE, TRAIT_SHARPER_BLADES) devotion_holder = /datum/devotion/divine/abyssor confess_lines = list( - "ABYSSOR COMMANDS THE WAVES!", - "THE OCEAN'S FURY IS ABYSSOR'S WILL!", - "I AM DRAWN BY THE PULL OF THE TIDE!", + "THE NORTH'S MADNESS!", + "BLOOD IN THE FIRMAMENT! BLOOD IN ALL THINGS!", + "I FEAR NOT DEATH, THE FOREVER WAR AWAITS ME!", ) storyteller = /datum/storyteller/abyssor associated_psycross = /obj/item/clothing/neck/psycross/silver/abyssor /datum/patron/divine/necra name = NECRA - domain = "Mother Goddess of Death and Time" - desc = "The Veiled Lady, once close partner to Angros. She created the Nine others from his corpse, guiding them from the Underworld." - flaws = "Unchanging, Apathetic, Easy to Bore" - worshippers = "Orderlies, Gravetenders, Mourners" - sins = "Heretical Magic, Untimely Death, Disturbance of Rest" - boons = "You may see the presence of a soul in a body." + display_name = "Valdala" + domain = "Demi-deity of the Court of Frost; The Valkyrie, shepherd of souls." + desc = "Valdala, a once-earth spirit and daughter of Gani, now demi-deity of Mjallidhorn's court. Her eternal charge is the stewardship of souls after death; ferrying them to Heaven, or to the Forever War that Mjallidhorn fights in the north. She fights in the eternal battle against Hell alongside Mordsol for the Aspect of Frost, sewing her grief for mortals slain among her foes and reaping it as their doom." + flaws = "Melancholic, dismal, gloomy." + worshippers = "Orderlies, gravetenders, mourners and the bereaved." + sins = "Necromancy, disrespecting the dead, pre-meditated murder." + boons = "You may see the presence of a soul within a body. You become aware of when a person dies, though not where or how." added_traits = list(TRAIT_SOUL_EXAMINE) devotion_holder = /datum/devotion/divine/necra confess_lines = list( - "ALL SOULS FIND THEIR WAY TO NECRA!", - "THE UNDERMAIDEN IS OUR FINAL REPOSE!", - "I FEAR NOT DEATH, MY LADY AWAITS ME!", + "VALDALA'S WINGS STAY ALL BURDENS!", + "THE LAST ANGEL'S WAIL HAUNTS US!", + "THE SISTERS OF FROST OBSESS UPON THE WICK OF OUR SOUL!", ) storyteller = /datum/storyteller/necra associated_psycross = /obj/item/clothing/neck/psycross/silver/necra /datum/patron/divine/ravox name = RAVOX - domain = "God of Warfare, Justice, and Bravery" - desc = "Crafted from the blade of Angros, a champion of all who seek righteousness for themselves and others." - flaws = "Carelessness, Aggression, Pride" - worshippers = "Warriors, Sellswords, Guardsmen" - sins = "Cowardice, Cruelty, Stagnation" - boons = "Your used weapons dull slower." - added_traits = list(TRAIT_SHARPER_BLADES) + display_name = "Mordsol" + domain = "Demi-deity of the Court of Frost; The Righteous, servant of honour and justice." + desc = "Mordsol, once Al'aqshir. Water, once fire. He is one of the oldest and has a storied past. Friend to Akan, servant to Angros, champion of Mjallidhorn; in modernity, Mordsol is part of the Court of Frost. He represents the pursuit of honourable combat, true justice, and what is truly right; as opposed to blind obedience to codified, written mortal laws; and reminds the worshippers of Frost to never let their hearts truly freeze." + flaws = "Stubborn, duty-bound, single-minded." + worshippers = "Honourbound warriors, freedom fighters, the noble-hearted and sailors." + sins = "Cowardice, injustice, tyranny." + boons = "Your weapons dull slower. Swimming is less tiring." + added_traits = list(TRAIT_SHARPER_BLADES, TRAIT_ABYSSOR_SWIM) devotion_holder = /datum/devotion/divine/ravox confess_lines = list( - "RAVOX IS JUSTICE!", - "THROUGH STRIFE, GRACE!", - "THE DRUMS OF WAR BEAT IN MY CHEST!", + "THE RIGHTEOUS WILL PREVAIL!", + "MORDSOL IS MY STRENGTH, AND MY MERCY!", + "THE EMBERS OF JUSTICE KEEP MY HEART THAWED!", ) storyteller = /datum/storyteller/ravox associated_psycross = /obj/item/clothing/neck/psycross/silver/ravox /datum/patron/divine/xylix name = XYLIX - domain = "Deity of Trickery, Freedom, and Inspiration" - desc = "Crafted from the silver tongue of Angros. Iliope is a force of change and deceit, yet allows little known of their gender let alone presence." - flaws = "Petulance, Deception, Gambling-Prone" - worshippers = "Cheats, Performers, The Hopeless" - sins = "Boredom, Predictability, Routine" + display_name = "Iliope" + domain = "Demi-deity of the Court of Air; The Fool, comedy and tragedy." + desc = "A demi-deity of Akan's court, both famous and infamous for their sway over the forces of luck. Iliope is known for the inspiration of many a bards lyric. Speaks through their gift to man; the Tarot deck." + flaws = "Petulant, deceptive, gambling-prone." + worshippers = "Gamblers, bards, artists, and the silver-tongued." + sins = "Boredom, predictability, routine." boons = "You can rig different forms of gambling in your favor." added_traits = list(TRAIT_BLACKLEG) devotion_holder = /datum/devotion/divine/xylix confess_lines = list( - "ASTRATA IS MY LIGHT!", - "NOC IS NIGHT!", - "DENDOR PROVIDES!", - "ABYSSOR COMMANDS THE WAVES!", - "RAVOX IS JUSTICE!", - "ALL SOULS FIND THEIR WAY TO NECRA!", - "HAHAHAHA! AHAHAHA! HAHAHAHA!", //the only xylix-related confession - "PESTRA SOOTHES ALL ILLS!", - "MALUM IS MY FORGE!", - "EORA BRINGS US TOGETHER!", + "VISIRES IS MY LIGHT!", + "AKAN FLIES FREE AND TOO FAR FROM ME!", + "GANI PROVIDES!", + "MJALLIDHORN IS MY TERROR!", + "MORDSOL IS JUSTICE!", + "ALL SOULS FIND THEIR WAY TO VALDALA!", + "HAHAHAHA! AHAHAHA! HAHAHAHA!", //the only iliope-related confession + "ERDL SOOTHES ALL ILLS!", + "GOLER KANH IS MY MUSE!", + "POMETTE BRINGS US TOGETHER!", ) storyteller = /datum/storyteller/xylix associated_psycross = /obj/item/clothing/neck/psycross/silver/ravox /datum/patron/divine/pestra name = PESTRA - domain = "Goddess of Disease, Alchemy, and Medicine" - desc = "A mistake; Angros' intestines left behind. She slithered out, bringing forth the cycle of life and decay." - flaws = "Drunkenness, Crudeness, Irresponsibility" - worshippers = "The Ill and Infirm, Alchemists, Physicians" - sins = "´Curing´ Abnormalities, Refusing to Help Unfortunates, Groveling" - boons = "You may consume rotten food without being sick." - added_traits = list(TRAIT_ROT_EATER) + display_name = "Erdl" + domain = "Demi-deity of the Court of Air; The Bloodfather, sculptor of flesh." + desc = "A demi-deity of Akan's court, Erdl embodies utter devotion to the progression of the academic understanding of medicine; all to one end - to create a fix-all elixir against death itself. Where the Court of Frost handles the inevitability of death, Erdl seeks to eliminate it entire through the perfection of flesh. His teachings have created the finest physicians in the Goblet, though many more would-be disciples of His teachings find themselves falling short of the exacting standards and the utter devotion to the craft that He demands. Though many of his doctors are known to toe the line of ethical boundaries, the Bloodfather is absolute that every act must be done for a reason and for the greater good; to pervert the art of medicine into mere butchery or cruelty is a sin." + flaws = "Obsessive, fervent, thanatophobic." + worshippers = "The ill and infirm, alchemists, physicians and healers." + sins = "Idleness, sadism, abandonment of the ill and infirm, reducing medicine to butchery." + boons = "Leeches will not seek your blood." + added_traits = list(TRAIT_LEECHIMMUNE) devotion_holder = /datum/devotion/divine/pestra confess_lines = list( - "PESTRA SOOTHES ALL ILLS!", - "DECAY IS A CONTINUATION OF LIFE!", - "MY AFFLICTION IS MY TESTAMENT!", + "THE BLOODFATHER SEEKS PERFECTION!", + "THE ESCAPE OF DEATH LIES IN THE MASTERING OF FLESH!", + "I SEEK THE ICHOR OF LIFE!", ) storyteller = /datum/storyteller/pestra associated_psycross = /obj/item/clothing/neck/psycross/silver/pestra /datum/patron/divine/malum name = MALUM - domain = "God of Toil, Innovation, and Creation" - desc = "Crafted from the hands of Angros. He would later use his own to construct wondrous inventions." - flaws = "Obsessive, Exacting, Overbearing" - worshippers = "Smiths, Miners, Sculptors" - sins = "Cheating, Shoddy Work, Suicide" - boons = "You recover more energy when sleeping." - added_traits = list(TRAIT_BETTER_SLEEP) + display_name = "Goler Kanh" + domain = "Demi-deity of the Court of Earth; The Shaper, divine artifice." + desc = "A demi-deity of Gani's court. The creator of technology, and he who first harnessed land and rock to serve mortal will." + flaws = "Obsessive, exacting, single-minded." + worshippers = "Smiths, engineers, tinkerers and craftsmen of all kinds." + sins = "Cheating, shoddy work, duplicity." + boons = "You recover more energy when sleeping. You learn, dream, and teach apprentices slightly better." + added_traits = list(TRAIT_BETTER_SLEEP, TRAIT_TUTELAGE) devotion_holder = /datum/devotion/divine/malum confess_lines = list( - "MALUM IS MY FORGE!", - "TRUE VALUE IS IN THE TOIL!", + "IN MY HAND IS ALL MORTAL POWER!", + "WITH GANI'S EDGE I STRIKE!", "I AM AN INSTRUMENT OF CREATION!", ) storyteller = /datum/storyteller/malum @@ -209,18 +218,37 @@ GLOBAL_LIST_INIT(patron_sound_themes, list( /datum/patron/divine/eora name = EORA - domain = "Goddess of Love, Family, and Art" - desc = "Crafted from the heart of Angros, a spreader of love and beauty, and strengthener of bonds." - flaws= "Naivete, Impulsiveness, Bigotry" - worshippers = "Mothers, Artists, Married Couples" - sins = "Sadism, Abandonment, Ruining Beauty" - boons = "You can understand others' needs better." - added_traits = list(TRAIT_EXTEROCEPTION) + display_name = "Pomette" + domain = "Demi-deity of the Court of Earth; The Daughter, love transcendent." + desc = "A demi-deity of Gani's court. An immaculately-conceived Daughter, crafted from a shard of the Mother's own divinity; Pomette's divine purity is thought to be absolute among the Pantheon. The youngest of the Elementals, Pomette's love for all grants her the capacity to assume any form she wishes; and alongside her Mother, she taught the first Druids the art of shapeshifting. However, her naivety leads her to hold love for all things in creation, even the soulless and wicked. This fringe belief is only possible due to her being the child of Gani, and it brews worry in the rest of the Pantheon. All fundamentalist texts reinforce that the whole Pantheon - even the solitary Visires - owe Pomette protection due to such childish beliefs." + flaws= "Naivete, impulsiveness, underestimation of danger." + worshippers = "The truly benevolent, friends and lovers, parents and grandparents, and druids." + sins = "Cruelty, abandonment, bigotry." + boons = "You can understand the needs of others better. You're immune to the shock of kneestingers." + added_traits = list(TRAIT_KNEESTINGER_IMMUNITY, TRAIT_EMPATH, TRAIT_EXTEROCEPTION) devotion_holder = /datum/devotion/divine/eora confess_lines = list( - "EORA BRINGS US TOGETHER!", + "POMETTE BRINGS US TOGETHER!", "HER BEAUTY IS EVEN IN THIS TORMENT!", "I LOVE YOU, EVEN AS YOU TRESPASS AGAINST ME!", ) storyteller = /datum/storyteller/eora associated_psycross = /obj/item/clothing/neck/psycross/silver/eora + +/datum/patron/divine/undivided + name = "The All-Aspect" + domain = "The balance of all four Elemental Aspects." + desc = "The balance between the Elementals is always adhered to, but the worshippers most keen to maintain the balance are those of the Katholikos. Worship of the All-Aspect is common both among the most fervent and true believers of the Katholikos and the Inquisition; but also among communities who generalise their worship to the entire Pantheon, rather than to any particular patron." + flaws = "The wide and varied flaws of all the Pantheon." + worshippers = "Fanatics, generalists, Katholikos clergy, the Inquisition." + sins = "The wide and varied sins of all the Pantheon." + boons = "Your stamina regeneration delay is lowered during daytime." + added_traits = list(TRAIT_APRICITY) + devotion_holder = /datum/devotion/divine/undivided + confess_lines = list( + "THE BALANCE COMMANDS!", + "THE ASPECTS PREVAIL!", + "THE CYCLE IS MAINTAINED!", + ) + storyteller = null + associated_psycross = /obj/item/clothing/neck/psycross/silver/undivided diff --git a/code/datums/gods/patrons/forgotten.dm b/code/datums/gods/patrons/forgotten.dm index 7d3ca94ecef..5f48e179bd8 100644 --- a/code/datums/gods/patrons/forgotten.dm +++ b/code/datums/gods/patrons/forgotten.dm @@ -1,17 +1,19 @@ /datum/patron/psydon name = "Angros" - display_name = "Orthodox Psydonite" - domain = "God of Humenity, Dreams and Creation" - desc = "Deceased, slain by Valdala in His final moments. She ripped His body apart to create The Ten... we must put Him back together again. Angros lives on, He will return." - flaws = "Grudge-Holding, Judgemental, Self-Sacrificing" - worshippers = "Grenzelhoftians, Inquisitors, Heroes" - sins = "Apostasy, Demon Worship, Betraying thy Father" - boons = "None. His power is divided." + display_name = "Salvationist" + domain = "The Mad; former Aspect of Fire. Harbinger of ruin, now maintainer of the Worldflame." + desc = "Deceased; slain by the rest of the Pantheon, ending the apocalyptic Big Burn. Angros was once the Aspect of Fire, worshipped similar to how Visires is in the modern day. Yet, after being corrupted by Hell, his death was necessary to avert the end of the world. To be a Salvationist is to remember the deity that Angros used to be before his corruption, and to mourn his loss; not to wish for his return. You occupy a peculiar position, holy lamb. The Katholikos permits your worship, as your continued belief in Angros is what sustains the Worldflame. Other faithful may respect you or pity you, but they all keep a watchful eye lest your belief change to something more sinister, and draw the ire of the Inquisition. Mourn your dead God, remember who he used to be, and bring silence to any foolish enough to wish for the return of the one who brought the world to its knees." + flaws = "Grudge-holding, sullen, self-sacrificing" + worshippers = "Fatigued warriors, Martyrs, the lost without purpose." + sins = "Zealotry, demon worship, Angrosian Absolutionism" + boons = "Your enduring faith grants you more tolerance to pain." + added_traits = list(TRAIT_PSYDONIAN_GRIT) associated_faith = /datum/faith/psydon + devotion_holder = /datum/devotion/divine/angros confess_lines = list( - "THERE IS ONLY ONE TRUE GOD!", - "THE SUCCESSORS HALT HIS RETURN!", - "PSYDON WILL RETURN!", + "I'M ASH UPON THE WIND!", + "THE MAD MUST STAY DREAMING!", + "WE TEND THE FLAME OF THE WORLD!", ) profane_words = list() @@ -26,15 +28,18 @@ return FALSE /datum/patron/psydon/extremist - display_name = "Extremist Psydonite" - desc = "The Ten are conmen, false prophets, and heathens. The acts of the Tennite church are all tricks to beguile the mind and dissuade you from following the true path of Angros. My actions prove my faith and His strength. Angros lives, and you cannot convince me otherwise." - flaws = "Stubborn, Fanatical, Spiteful" - worshippers = "Fanatics, Misinformed Fools" - sins = "Blasphemy, False Prophets, Trickery" + display_name = "Absolutionist" + desc = "Betrayed; murdered by the rest of the Pantheon, sacrificed as fuel for the Worldflame. Angros was once the Aspect of Fire, a glorious and powerful conquerer that led the Sultanate to victory far and wide. Yet, after being influenced by Hell, the Pantheon resigned to slay their former comrade instead of aiding him. To be an Absolutionist is to believe that Angros' death has absolved him of any sin, and to pray wholeheartedly for his return as the rightful Aspect of Fire; not the pretender and usurper Visires. The Katholikos declares you a heretic of the highest order, the common faithful despise you, the Inquisition seeks your head for the pyre. Even those Salvationist fools, your so-called brethren, want you snuffed out. Will you endure through these trials, sacrifical lamb, and burn in a blaze of glory?" + flaws = "Zealous, Fanatical, Hell-Corrupted" + worshippers = "Fanatics, misinformed fools, and madmen." + sins = "False prophets, worship of the Elemental Pantheon, Angrosian Salvationism" + boons = "Your bitter determination towards your own faith in your dead God lends you an enhanced resistance to pain, and your wounds will slowly regenerate as long as your body is not bled dry. The beneficial miracles of the betrayer Elemental Pantheon will not benefit you, however." + added_traits = list(TRAIT_PSYDONIAN_GRIT, TRAIT_PSYDONITE, TRAIT_CORRUPTED) + devotion_holder = /datum/devotion/inhumen/angros confess_lines = list( - "THERE IS ONLY ONE GOD!", - "YOUR FALSE TEN ARE LIES!", - "PSYDON LIVES!", + "CAST DOWN THE PRETENDER! THE FIRE RISES!", + "THE MAD MUST RISE AGAIN!", + "CLAW AT THE SOIL! BREAK THE FIRMAMENT!", ) diff --git a/code/datums/gods/patrons/inhumen_pantheon.dm b/code/datums/gods/patrons/inhumen_pantheon.dm index 3e43f7d6847..1eb70cb4838 100644 --- a/code/datums/gods/patrons/inhumen_pantheon.dm +++ b/code/datums/gods/patrons/inhumen_pantheon.dm @@ -19,20 +19,21 @@ /* ----------------- */ -/datum/patron/inhumen/zizo +/datum/patron/inhumen/zizo // The One Envy considers non-royals chuds and doesn't give them magic or abilities name = ZIZO - domain = "Ascended Goddess of Forbidden Magic, Domination, and Power" - desc = "Snow elf who slaughtered her kind in ascension, conquered and remade the Dark Elven empires in her name. She proves that any with will can achieve divinity... though at a cost." - flaws = "Hubris, Superiority, Fury" - worshippers = "Dark Elves, Aspirants, Necromancers, Misandrists" - sins = "Pearl-clutching, Moralism, Wastefulness" - boons = "You may perform fleshcrafting. Access to roles with magic." - //added_traits = list(TRAIT_CABAL) No need for this. They have fleshcrafting now. + display_name = "The Jealous God" + domain = "Domotan Island, and seemingly little else." + desc = "She whose name is unknown, she whose agenda is lost; the Jealous God embodies no elemental aspect, and serves neither the divine nor ilk of Hell. Her solemn devotees are the royal family of Etgard itself, the Shirleigh Dynasty and their constituents. They are the only divine to lay absolute claim over Domotan Island, and is thus praised only in hushed tones beyond the walls of Etgard Keep." + flaws = "Unknown." + worshippers = "The Shirleigh Dynasty, the brainwashed and the desperate" + sins = "Unknown." + boons = "You can recognise other worshippers at a glance. For the Shirleighs; access to innate and sinister miracles, and the awareness of when and where a mortal meets their demise, but not how. For all else; nothing." + added_traits = list(TRAIT_CABAL_CHUD) devotion_holder = /datum/devotion/inhumen/zizo confess_lines = list( - "I FOLLOW THE PATH OF ZIZO!", - "LONG LIVE QUEEN ZIZO!", - "ZIZO SHOWED ME THE WAY!", + "SHE SEES! SHE LAUGHS!", + "SHE LAUGHS! SHE SEES!", + "SHE KNOWS! SHE KNOWS!", ) storyteller = /datum/storyteller/zizo added_verbs = list( @@ -42,65 +43,68 @@ /datum/patron/inhumen/graggar name = GRAGGAR - domain = "Ascended God, the Dark Sini-Star of Unnatural Beasts, Unsated Consumption, and Unbridled Hatred" - desc = "Became the first orc upon ascension through his habit of consuming the bodies of those he conquered. His forces continue to ravage the lands in his name. Through him, one may achieve true strength." - flaws = "Rage, Hatred, Bloodthirst" - worshippers = "Greenskins, The Revenge-Driven, Sadists, Misogynists" - sins = "Compassion, Frailty, Servility" - boons = "You are drawn to the flavour of raw flesh and organs, and may consume without worry." - added_traits = list(TRAIT_ORGAN_EATER) + display_name = "The Archdevils" + domain = "All heretical anti-deities subservient to Hell." + desc = "The Archdevils of Hell, despite their hand in bringing the world to its knees, attract worshippers for any number of reasons - for vengeance, for power, from indoctrination, or from those who yet quake in terror from the threat it poses - but such belief is a poisoned chalice, for Hell's power corrupts all it touches. You may worship the Archdevils directly, or worship a Deceiver God who has been corrupted by Hell's power; but whatever the case, you seek the disruption of the Elemental balance and the downfall of the Aspects." + flaws = "Rage, hatred, bloodthirst." + worshippers = "The vengeful, the power-hungry, the indoctrinated, the fearful." + sins = "Compassion, frailty, servility." + boons = "You are drawn to the flavour of raw flesh, organs, and rotten food, and may consume without worry. You can recognise other Archdevil worshippers at a glance, as well as servants of other Hell-corrupted deities." + added_traits = list(TRAIT_ROT_EATER, TRAIT_ORGAN_EATER, TRAIT_ARCHDEVILS, TRAIT_CORRUPTED) devotion_holder = /datum/devotion/inhumen/graggar confess_lines = list( - "GRAGGAR IS THE BEAST I WORSHIP!", - "GRAGGAR WILL RAVAGE YOU!", - "GRAGGAR BRINGS UNHOLY DESTRUCTION!" + "CLAW AT THE SOIL! BREAK THE FIRMAMENT!", + "RELEASE THE OLD ONES! RETURN THEIR CROWN!", + "WHAT ONCE WAS WILL BECOME NOW, AGAIN!", ) storyteller = /datum/storyteller/graggar /datum/patron/inhumen/matthios name = MATTHIOS - domain = "God of Thievery, Ill-Gotten Gains, and Highwaymen" - desc = "Legendary humen bandit whose name was attributed to countless great thefts. It is because of his legacy that nobles clutch their coin purses to their chests in town." - flaws = "Pride, Greed, Orneriness" - worshippers = "Outlaws, Noble-Haters, Downtrodden Peasantry" - sins = "Clumsiness, Stupidity, Humility" + display_name = "The Deceiver Gods" + domain = "Secret sects hidden within the Divine Courts." + desc = "The praise of divines other than those subservient to the Four Elementals is heresy, even if those stragglers seek not to disrupt the balance; the mere worship gives power to Heavenly figures, after all. Which God that is remains up to you." + flaws = "Specific to the divine in question." + worshippers = "The desperate, the drunk, the disillusioned and the depraved." + sins = "Specific to the divine in question." boons = "You can see the most expensive item someone is carrying." added_traits = list(TRAIT_MATTHIOS_EYES) devotion_holder = /datum/devotion/inhumen/matthios confess_lines = list( - "MATTHIOS STEALS FROM THE WORTHLESS!", - "MATTHIOS IS JUSTICE FOR THE COMMON MAN!", - "MATTHIOS IS MY LORD, I SHALL BE HIS MARTYR!", + "THE DECEIVERS FLEE! SEE THEIR LIES!", + "A PANTHEON EXISTS BEYOND YOUR OWN!", + "DIVINES WITHOUT NUMBER ARE BEYOND THE STARS!", ) storyteller = /datum/storyteller/matthios /datum/patron/inhumen/baotha name = BAOTHA - domain = "Goddess of Drugs, Self-Preservation, and Remorseless Joy" //Bright-dyed hair falls within 'remorseless joy.' Joy for one's self at expense of the setting. Same for her music taste. - desc = "Ascended, formerly disgraced tiefling queen, notorious for having a mind elsewhere. Drove her kingdom into the ground through her demands and addictions. The first tiefling noble, last tiefling noble, and sole reason there are no more tiefling nobles. As she preaches to her followers, 'Joy at all costs!'" - flaws = "Manipulation, Self-Destruction, Willingness to Sacrifice Others" - worshippers = "Addicts, Hedonists, Pink-Haired Harlots" - sins = "Sobriety, Self-Sacrifice, Faltering Willpower" - boons = "You will never overdose on drugs." - added_traits = list(TRAIT_CRACKHEAD) + display_name = "Hertannea" + domain = "A corrupted deity, hiding within the shadows from the wrath of the Aspect of Fire; the Faerie Devil, Visires' Loathed, euphoric release of inhibitions." + desc = "A once-mortal Drow, Visires' most intimate companion in their youth, Hertannea is a goddess scorned and exiled for her betrayal of the nascent Aspect of Fire at the moment of her ascension. Lurking beneath the twisting spires of Palasi Necra, she represents the lowest of depravity; the proliferation of the most potent narcotic substances, the alteration of the mind, defilement of purity and self, all in the pursuit of the most hedonistic desires. She provides an escape to the downtrodden, ensnaring them in her corrupt and addictive web before they realise they've become trapped. Though not an Archdevil herself, Hertannea was afflicted by the corruption of Hell when she was still mortal, and to this day she still acts upon the will of Hell and its accursed bounty." + flaws = "Manipulation, self-Destruction, willingness to sacrifice others." + worshippers = "Addicts, hedonists, the downtrodden, the heartbroken and those seeking escape." + sins = "Sobriety, self-Sacrifice, faltering willpower." + boons = "You will never overdose on drugs. You can recognise other Hertannea worshippers at a glance, as well as servants of other Hell-corrupted deities." + added_traits = list(TRAIT_CRACKHEAD, TRAIT_CORRUPTED) devotion_holder = /datum/devotion/inhumen/baotha confess_lines = list( - "LIVE, LAUGH, LOVE! IN BAOTHA'S NAME!", - "JOY AT ALL COSTS! BAOTHA'S TEACHINGS REIGN!", - "BAOTHA'S WHISPERS CALM MY MIND!", + "LIVE, LAUGH, LOVE! IN THE FAERIE DEVIL'S NAME!", + "JOY AT ALL COSTS! HERTANNEA'S TEACHINGS REIGN!", + "THE WHISPERS BELOW CALM MY MIND!", ) storyteller = /datum/storyteller/baotha /// Maniac Patron - Their mind is broken by secrets of One Envy/Archdevil combined. They quite possibly know the reality of what happens outside the planet. They may think this is all a game. They are clearly insane. /datum/patron/inhumen/graggar_zizo - name = "Graggazo" - domain = "Ascended God who slaughtered her kind in ascension, the Dark Sini-Star of Unnatural Beasts, Forbidden Magic, and Unbridled Hatred." - desc = "Became the first snow orc upon ascension through his habit of consuming the bodies of those he conquered. His forces continue to ravage the lands in her name. He proves that any with will can achieve divinity... though at a cost. MAKE THIS MAKE SENSE. MY MIND! MY MIND!!" - flaws = "Nothing, Everything, Nothing" - worshippers = "Broken Minds, Overshared Secrets, Space-Faring Species Like You, Misanthropes" - sins = "The Unseen, Secrets, Worthless Pigs" - boons = "You are drawn to the flavour of other followers of One Envy, and may see them when you consume without worry." - added_traits = list(TRAIT_ORGAN_EATER, TRAIT_CABAL) + name = "The Lost Gods" + domain = "Forever lost deities of the old world whose meddling has somehow endured far longer than civilization's memory." + desc = "Empowered entities of divinity and unholy nature alike may, with enough effort and systemic erasure, simply cease to exist in the world altogether in the past, present and future- this option represents a disciple of one such unknowable idol. They toil in shadows in opposition to both elementalist and heretic alike, seeking knowledge through the ephemeral Sages to rekindle their lost history. They may be carryovers from cultures sundered in the Big Burn, or perhaps simply enamored by visions of lost grandeur you seek in a constant trance." + flaws = "Nothing, Everything, Nothing." + worshippers = "Lunatics, the lost and the outsiders." + sins = "The New World and its theology as a whole." + boons = "Secrets of the past reveal themselves in manic and insane ways." + added_traits = list(TRAIT_SCHIZO_FLAW) confess_lines = list( "WHERE AM I!", "NONE OF THIS IS REAL!", diff --git a/code/datums/gods/patrons/patrons_blessings.dm b/code/datums/gods/patrons/patrons_blessings.dm index 6a2ab79e237..ef66cc8bd8f 100644 --- a/code/datums/gods/patrons/patrons_blessings.dm +++ b/code/datums/gods/patrons/patrons_blessings.dm @@ -151,7 +151,7 @@ /// Returns the immersive flavor text based on both the target's patron and the specific blessing applied /// Falls back to generic patron text or a default generic divine message /// Returns the immersive flavor text based on both the target's patron and the specific blessing applied -/// Fully extended for Mjallidhorn, Visires, Hertannea, Gani, Pomette, Archdevil, Goler Kanh, Deceivers, Valdala, Akan, Erdl, Al'Aqshir, Iliope, One Envy +/// Fully extended for Mjallidhorn, Visires, Hertannea, Gani, Pomette, Archdevil, Goler Kanh, Deceivers, Valdala, Akan, Erdl, Mordsol, Iliope, One Envy /proc/get_patron_blessing_text(mob/living/carbon/human/M, blessing_path) var/patron_type = M.patron?.type if(!patron_type) @@ -336,20 +336,20 @@ /datum/status_effect/buff/barbrage = "Erdl shrieks: \"Destruction is yet another form of change.\"" ), - /// Al'Aqshir - Justice Incarnate + /// Mordsol - Justice Incarnate /datum/patron/divine/ravox = list( - /datum/status_effect/buff/beastsense = "Al'Aqshir growls: \"Smell your enemy. Hunt them down with purpose.\"", - /datum/status_effect/buff/trollshape = "Al'Aqshir commands: \"Let might serve justice. Let strength carry duty.\"", - /datum/status_effect/buff/divine_beauty = "Al'Aqshir declares: \"Wear your glory well, warrior. Let honor shine brighter.\"", - /datum/status_effect/buff/call_to_arms = "Al'Aqshir bellows: \"To war! You've got this, kid.\"", - /datum/status_effect/buff/craft_buff = "Al'Aqshir nods: \"Forge victory with your hands. Let each blow ring true.\"", - /datum/status_effect/buff/foodbuff = "Al'Aqshir grunts: \"Eat. Even the strong must endure the march.\"", - /datum/status_effect/buff/clean_plus = "Al'Aqshir commands: \"Clean your blade. We should not revel in blood we spill.\"", - /datum/status_effect/buff/featherfall = "Al'Aqshir comments: \"Even the bold must fall with grace.\"", - /datum/status_effect/buff/darkvision = "Al'Aqshir growls: \"See the coward. Bring them to justice.\"", - /datum/status_effect/buff/haste = "Al'Aqshir barks: \"Swift feet carry righteous blades.\"", - /datum/status_effect/buff/calm = "Al'Aqshir grunts: \"Still your heart. The battle shall come.\"", - /datum/status_effect/buff/barbrage = "Al'Aqshir roars: \"BE FILLED WITH RIGHTEOUS ANGER!\"" + /datum/status_effect/buff/beastsense = "Mordsol growls: \"Smell your enemy. Hunt them down with purpose.\"", + /datum/status_effect/buff/trollshape = "Mordsol commands: \"Let might serve justice. Let strength carry duty.\"", + /datum/status_effect/buff/divine_beauty = "Mordsol declares: \"Wear your glory well, warrior. Let honor shine brighter.\"", + /datum/status_effect/buff/call_to_arms = "Mordsol bellows: \"To war! You've got this, kid.\"", + /datum/status_effect/buff/craft_buff = "Mordsol nods: \"Forge victory with your hands. Let each blow ring true.\"", + /datum/status_effect/buff/foodbuff = "Mordsol grunts: \"Eat. Even the strong must endure the march.\"", + /datum/status_effect/buff/clean_plus = "Mordsol commands: \"Clean your blade. We should not revel in blood we spill.\"", + /datum/status_effect/buff/featherfall = "Mordsol comments: \"Even the bold must fall with grace.\"", + /datum/status_effect/buff/darkvision = "Mordsol growls: \"See the coward. Bring them to justice.\"", + /datum/status_effect/buff/haste = "Mordsol barks: \"Swift feet carry righteous blades.\"", + /datum/status_effect/buff/calm = "Mordsol grunts: \"Still your heart. The battle shall come.\"", + /datum/status_effect/buff/barbrage = "Mordsol roars: \"BE FILLED WITH RIGHTEOUS ANGER!\"" ), /// Iliope - The Trickster diff --git a/code/datums/status_effects/rogue/roguebuff.dm b/code/datums/status_effects/rogue/roguebuff.dm index e1be43413ba..6b76015a0de 100644 --- a/code/datums/status_effects/rogue/roguebuff.dm +++ b/code/datums/status_effects/rogue/roguebuff.dm @@ -426,7 +426,7 @@ icon_state = "beauty" /*-----------------\ -| Al'Aqshir Miracles | +| Mordsol Miracles | \-----------------*/ /datum/status_effect/buff/call_to_arms diff --git a/code/datums/storytellers/gods.dm b/code/datums/storytellers/gods.dm index 2ef7ddb67b7..99fd0bc8ad1 100644 --- a/code/datums/storytellers/gods.dm +++ b/code/datums/storytellers/gods.dm @@ -67,7 +67,7 @@ /datum/storyteller/ravox name = RAVOX - desc = "Al'Aqshir will cause raids to happen naturally instead of only when people are dying a lot." + desc = "Mordsol will cause raids to happen naturally instead of only when people are dying a lot." welcome_text = "The drums of war grow louder." weight = 4 always_votable = TRUE diff --git a/code/game/gamemodes/personal_objectives/ravox/duel.dm b/code/game/gamemodes/personal_objectives/ravox/duel.dm index 6b4f2daa455..6b11278d6de 100644 --- a/code/game/gamemodes/personal_objectives/ravox/duel.dm +++ b/code/game/gamemodes/personal_objectives/ravox/duel.dm @@ -1,9 +1,9 @@ /datum/objective/personal/ravox_duel name = "Honor Duels" - category = "Al'Aqshir's Chosen" + category = "Mordsol's Chosen" triumph_count = 3 immediate_effects = list("Gained an ability to challenge others") - rewards = list("3 Triumphs", "Al'Aqshir grows stronger", "Al'Aqshir blesses you (+1 Strength)") + rewards = list("3 Triumphs", "Mordsol grows stronger", "Mordsol blesses you (+1 Strength)") var/duels_won = 0 var/duels_required = 1 @@ -21,7 +21,7 @@ /datum/objective/personal/ravox_duel/complete_objective() . = ..() - to_chat(owner.current, span_greentext("You have proven your worth in combat! Al'Aqshir is pleased!")) + to_chat(owner.current, span_greentext("You have proven your worth in combat! Mordsol is pleased!")) adjust_storyteller_influence(RAVOX, 20) /datum/objective/personal/ravox_duel/reward_owner() diff --git a/code/game/gamemodes/personal_objectives/ravox/improve_combat.dm b/code/game/gamemodes/personal_objectives/ravox/improve_combat.dm index 3f4789ab455..2ca925cf46e 100644 --- a/code/game/gamemodes/personal_objectives/ravox/improve_combat.dm +++ b/code/game/gamemodes/personal_objectives/ravox/improve_combat.dm @@ -1,8 +1,8 @@ /datum/objective/personal/improve_combat name = "Improve Combat Skills" - category = "Al'Aqshir's Chosen" + category = "Mordsol's Chosen" triumph_count = 2 - rewards = list("2 Triumphs", "Al'Aqshir grows stronger", "Al'Aqshir blesses you (+1 Strength)") + rewards = list("2 Triumphs", "Mordsol grows stronger", "Mordsol blesses you (+1 Strength)") var/levels_gained = 0 var/required_levels = 2 @@ -37,11 +37,11 @@ complete_objective() else var/remaining = required_levels - levels_gained - to_chat(owner.current, span_notice("Combat skill improved! [remaining] more level[remaining == 1 ? "" : "s"] needed to fulfill Al'Aqshir's task!")) + to_chat(owner.current, span_notice("Combat skill improved! [remaining] more level[remaining == 1 ? "" : "s"] needed to fulfill Mordsol's task!")) /datum/objective/personal/improve_combat/complete_objective() . = ..() - to_chat(owner.current, span_greentext("You've improved your combat skills enough to satisfy Al'Aqshir!")) + to_chat(owner.current, span_greentext("You've improved your combat skills enough to satisfy Mordsol!")) adjust_storyteller_influence(RAVOX, 20) UnregisterSignal(owner.current, COMSIG_SKILL_RANK_INCREASED) @@ -50,4 +50,4 @@ owner.current.adjust_stat_modifier(STATMOD_RAVOX_BLESSING, STATKEY_STR, 1) /datum/objective/personal/improve_combat/update_explanation_text() - explanation_text = "Improve your combat skills by gaining [required_levels] new skill levels through practice or dreams. For Al'Aqshir!" + explanation_text = "Improve your combat skills by gaining [required_levels] new skill levels through practice or dreams. For Mordsol!" diff --git a/code/game/gamemodes/personal_objectives/ravox/ultimate_sacrifice.dm b/code/game/gamemodes/personal_objectives/ravox/ultimate_sacrifice.dm index 3040207564c..efa3110e39a 100644 --- a/code/game/gamemodes/personal_objectives/ravox/ultimate_sacrifice.dm +++ b/code/game/gamemodes/personal_objectives/ravox/ultimate_sacrifice.dm @@ -1,9 +1,9 @@ /datum/objective/personal/ultimate_sacrifice name = "Ultimate Sacrifice" - category = "Al'Aqshir's Chosen" + category = "Mordsol's Chosen" triumph_count = 3 immediate_effects = list("Gained an ability to give up your life to save another") - rewards = list("3 Triumphs", "Al'Aqshir grows stronger", "Honorable Death") + rewards = list("3 Triumphs", "Mordsol grows stronger", "Honorable Death") /datum/objective/personal/ultimate_sacrifice/on_creation() . = ..() @@ -16,4 +16,4 @@ adjust_storyteller_influence(RAVOX, 20) /datum/objective/personal/ultimate_sacrifice/update_explanation_text() - explanation_text = "Make the highest sacrifice by giving your own life to save truly innocent and worthy soul in the name of Al'Aqshir." + explanation_text = "Make the highest sacrifice by giving your own life to save truly innocent and worthy soul in the name of Mordsol." diff --git a/code/game/objects/items/weapons/melee/swords.dm b/code/game/objects/items/weapons/melee/swords.dm index c3a60d4d134..4bd6458cae9 100644 --- a/code/game/objects/items/weapons/melee/swords.dm +++ b/code/game/objects/items/weapons/melee/swords.dm @@ -1178,7 +1178,7 @@ gripped_intents = list(/datum/intent/sword/cut, /datum/intent/sword/thrust, /datum/intent/sword/strike, /datum/intent/sword/chop/long) force_wielded = DAMAGE_LONGSWORD_WIELD name = "iron claymore" - desc = "A large sword originating from the northern land of Caledon, a proud warrior nation beholden to Al'Aqshir." + desc = "A large sword originating from the northern land of Caledon, a proud warrior nation beholden to Mordsol." icon_state = "ironclaymore" minstr = 10 smeltresult = /obj/item/ingot/iron diff --git a/code/game/objects/structures/fake_machines/mail.dm b/code/game/objects/structures/fake_machines/mail.dm index c183094dbf7..312ff7da874 100644 --- a/code/game/objects/structures/fake_machines/mail.dm +++ b/code/game/objects/structures/fake_machines/mail.dm @@ -503,7 +503,7 @@ GLOBAL_LIST_EMPTY(letters_sent) switch(accusation.paired.subject.patron.type) if(/datum/patron/inhumen/matthios, /datum/patron/inhumen/zizo, /datum/patron/inhumen/graggar, /datum/patron/inhumen/baotha, /datum/patron/godless/godless, /datum/patron/godless/autotheist, - /datum/patron/godless/defiant, /datum/patron/godless/dystheist, /datum/patron/godless/rashan) + /datum/patron/godless/defiant, /datum/patron/godless/dystheist, /datum/patron/psydon/extremist) is_correct = TRUE // Check excommunication diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm index 5294292a9dc..7ee75bc95cd 100644 --- a/code/game/turfs/open/water.dm +++ b/code/game/turfs/open/water.dm @@ -331,6 +331,8 @@ var/drained = max(15 - (user.get_skill_level(/datum/skill/misc/swimming) * 5), 1) // drained += (user.checkwornweight()*2) drained += user.get_encumbrance() * 50 + if(HAS_TRAIT(user, TRAIT_ABYSSOR_SWIM)) + drained -=5 if(!user.adjust_stamina(drained)) user.Immobilize(30) addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living, Knockdown), 30), 10) diff --git a/code/modules/client/round_end_panel.dm b/code/modules/client/round_end_panel.dm index f5d81e75729..d30e5f876c8 100644 --- a/code/modules/client/round_end_panel.dm +++ b/code/modules/client/round_end_panel.dm @@ -939,7 +939,7 @@ // Gani data += god_ui_block("DENDOR", "#412938", "#66745c", /datum/storyteller/dendor, debug) - // Al'Aqshir + // Mordsol data += god_ui_block("RAVOX", "#2c232d", "#710f0f", /datum/storyteller/ravox, debug) // Pomette diff --git a/code/modules/clothing/head/crown.dm b/code/modules/clothing/head/crown.dm index 3eec81d6b63..bb1120592a4 100644 --- a/code/modules/clothing/head/crown.dm +++ b/code/modules/clothing/head/crown.dm @@ -129,7 +129,7 @@ /obj/item/clothing/head/crown/sparrowcrown name = "champions circlet" - desc = "Winner of tournaments, bask in Al'Aqshir's glory." + desc = "Winner of tournaments, bask in Mordsol's glory." icon_state = "sparrowcrown" sellprice = VALUE_GOLD_ITEM diff --git a/code/modules/clothing/head/helmets/heavy.dm b/code/modules/clothing/head/helmets/heavy.dm index 66e878cf31e..f8dd51dd981 100644 --- a/code/modules/clothing/head/helmets/heavy.dm +++ b/code/modules/clothing/head/helmets/heavy.dm @@ -275,7 +275,7 @@ /obj/item/clothing/head/helmet/heavy/necked/ravox name = "ravoxian helmet" - desc = "Headwear commonly worn by Templars in service to Al'Aqshir. It resembles a heavily-adorned visored sallet." + desc = "Headwear commonly worn by Templars in service to Mordsol. It resembles a heavily-adorned visored sallet." icon_state = "ravoxhelm" item_state = "ravoxhelm" item_weight = 6 * IRON_MULTIPLIER diff --git a/code/modules/clothing/neck/psycross.dm b/code/modules/clothing/neck/psycross.dm index fd6d7fb491e..4dd61a1d40b 100644 --- a/code/modules/clothing/neck/psycross.dm +++ b/code/modules/clothing/neck/psycross.dm @@ -55,7 +55,7 @@ resistance_flags = FIRE_PROOF /obj/item/clothing/neck/psycross/silver/ravox - name = "amulet of Al'Aqshir" + name = "amulet of Mordsol" desc = "Struggle. Challenge. And rise to struggle again. That is the sword of he who yet lives to fight again." icon_state = "ravox" resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/outfits/patrons.dm b/code/modules/clothing/outfits/patrons.dm index bb196d52d55..d89f8f3bc41 100644 --- a/code/modules/clothing/outfits/patrons.dm +++ b/code/modules/clothing/outfits/patrons.dm @@ -162,7 +162,7 @@ /obj/item/clothing/cloak/ravox name = "ravox tabard" - desc = "An outer garment commonly worn by soldiers. This one has the symbol of Al'Aqshir on it." + desc = "An outer garment commonly worn by soldiers. This one has the symbol of Mordsol on it." icon_state = "tabard_ravox" alternate_worn_layer = TABARD_LAYER body_parts_covered = CHEST|GROIN @@ -297,7 +297,7 @@ /obj/item/clothing/head/helmet/heavy/ravoxhelm name = "justice eagle" - desc = "Forged in reverence to Al'Aqshir, this helm bears the stylized visage of an eagle, symbol of unyielding judgment and divine vigilance. Its hollow eyes see not just foes, but the truth behind every deed." + desc = "Forged in reverence to Mordsol, this helm bears the stylized visage of an eagle, symbol of unyielding judgment and divine vigilance. Its hollow eyes see not just foes, but the truth behind every deed." icon_state = "ravoxhelmet" item_state = "ravoxhelmet" emote_environment = 3 diff --git a/code/modules/crafting/anvil_recipes/armor.dm b/code/modules/crafting/anvil_recipes/armor.dm index 66873ee99da..78635344dda 100644 --- a/code/modules/crafting/anvil_recipes/armor.dm +++ b/code/modules/crafting/anvil_recipes/armor.dm @@ -571,7 +571,7 @@ additional_items = list(/obj/item/ingot/iron) /datum/anvil_recipe/armor/steel/templar/helmet_ravox - name = "Al'Aqshir Helmet (+Iron Bar)" + name = "Mordsol Helmet (+Iron Bar)" recipe_name = "a ravoxian helmet" created_item = /obj/item/clothing/head/helmet/heavy/necked/ravox additional_items = list(/obj/item/ingot/iron) diff --git a/code/modules/crafting/artificer/misc.dm b/code/modules/crafting/artificer/misc.dm index ee81d0af7e2..0dfbc845c1f 100644 --- a/code/modules/crafting/artificer/misc.dm +++ b/code/modules/crafting/artificer/misc.dm @@ -511,7 +511,7 @@ created_item = /obj/item/clothing/neck/psycross/silver/necra /datum/artificer_recipe/psycross/ravox - name = "Al'Aqshir Psycross" + name = "Mordsol Psycross" required_item = /obj/item/ingot/silver created_item = /obj/item/clothing/neck/psycross/silver/ravox diff --git a/code/modules/events/god_intervention/ravox.dm b/code/modules/events/god_intervention/ravox.dm index 98e34f6999f..17fe220da55 100644 --- a/code/modules/events/god_intervention/ravox.dm +++ b/code/modules/events/god_intervention/ravox.dm @@ -1,5 +1,5 @@ /datum/round_event_control/ravox_resolve - name = "Al'Aqshir's Resolve" + name = "Mordsol's Resolve" track = EVENT_TRACK_INTERVENTION typepath = /datum/round_event/ravox_resolve weight = 8 @@ -17,7 +17,7 @@ . = ..() if(!.) return FALSE - if(GLOB.patron_follower_counts["Al'Aqshir"] < 3) + if(GLOB.patron_follower_counts["Mordsol"] < 3) return FALSE /datum/round_event/ravox_resolve/start() @@ -53,6 +53,6 @@ weakest.adjust_stat_modifier(STATMOD_RAVOX_RESOLVE, STATKEY_LCK, 2) bordered_message(weakest, list( - span_green("You may be weak compared to your fellow warriors of justice, but still you persevere. Al'Aqshir honors those who fight even when victory seems impossible. May his gift of strength help you overcome the odds.") + span_green("You may be weak compared to your fellow warriors of justice, but still you persevere. Mordsol honors those who fight even when victory seems impossible. May his gift of strength help you overcome the odds.") )) weakest.playsound_local(weakest, 'sound/vo/male/knight/rage (6).ogg', 70) diff --git a/code/modules/events/personal/ravox/honor_duels.dm b/code/modules/events/personal/ravox/honor_duels.dm index 73a4af8e4bb..f1fdbdde680 100644 --- a/code/modules/events/personal/ravox/honor_duels.dm +++ b/code/modules/events/personal/ravox/honor_duels.dm @@ -46,7 +46,7 @@ bordered_message(chosen_one, list( span_userdanger("YOU ARE RAVOX'S CHOSEN!"), - span_notice("Al'Aqshir wants you to challenge others to honor duels! Win [new_objective.duels_required] duel\s to prove your worth! Duels end when a fighter yields or is knocked unconscious."), + span_notice("Mordsol wants you to challenge others to honor duels! Win [new_objective.duels_required] duel\s to prove your worth! Duels end when a fighter yields or is knocked unconscious."), )) chosen_one.playsound_local(chosen_one, 'sound/vo/male/knight/rage (6).ogg', 70) diff --git a/code/modules/events/personal/ravox/improve_combat_skills.dm b/code/modules/events/personal/ravox/improve_combat_skills.dm index 6ebb0619b79..5e31df2f89e 100644 --- a/code/modules/events/personal/ravox/improve_combat_skills.dm +++ b/code/modules/events/personal/ravox/improve_combat_skills.dm @@ -45,7 +45,7 @@ bordered_message(chosen_one, list( span_userdanger("YOU ARE RAVOX'S CHOSEN!"), - span_notice("Al'Aqshir demands you prove your might! Improve your combat skills to earn Al'Aqshir's favor!"), + span_notice("Mordsol demands you prove your might! Improve your combat skills to earn Mordsol's favor!"), )) chosen_one.playsound_local(chosen_one, 'sound/vo/male/knight/rage (6).ogg', 70) diff --git a/code/modules/events/personal/ravox/ultimate_sacrifice.dm b/code/modules/events/personal/ravox/ultimate_sacrifice.dm index 71ae9a76ce0..1a8a5c809de 100644 --- a/code/modules/events/personal/ravox/ultimate_sacrifice.dm +++ b/code/modules/events/personal/ravox/ultimate_sacrifice.dm @@ -50,7 +50,7 @@ bordered_message(chosen_one, list( span_userdanger("YOU ARE RAVOX'S CHOSEN!"), - span_notice("There is an honor in sacrifice. You have been granted a power by Al'Aqshir to sacrifice your own life to revive another. Beware, as you won't be able to be revived ever again. Use it only as a last resort to see a truly heinous injustice undone."), + span_notice("There is an honor in sacrifice. You have been granted a power by Mordsol to sacrifice your own life to revive another. Beware, as you won't be able to be revived ever again. Use it only as a last resort to see a truly heinous injustice undone."), )) chosen_one.playsound_local(chosen_one, 'sound/vo/male/knight/rage (6).ogg', 70) diff --git a/code/modules/fishing/leeches.dm b/code/modules/fishing/leeches.dm index e7647a0cced..6a7adc45fa4 100644 --- a/code/modules/fishing/leeches.dm +++ b/code/modules/fishing/leeches.dm @@ -261,7 +261,7 @@ "Akan's magick is nothing to One Envy!", \ "Mjallidhorn is but a grain of salt!", \ "Erdl is the most foul of goddesses!", \ - "Al'Aqshir's justice is flawed and dull!", \ + "Mordsol's justice is flawed and dull!", \ "Rip the Sun Tyrant from the sky!", \ "Iliope is the tongue that must be severed off!", \ "Cast Goler Kanh into the fires of hell!", \ diff --git a/code/modules/instruments/_instruments.dm b/code/modules/instruments/_instruments.dm index f97739bc1f7..c28ba7883dd 100644 --- a/code/modules/instruments/_instruments.dm +++ b/code/modules/instruments/_instruments.dm @@ -231,13 +231,13 @@ "Goler Kanh's Perseverance (+1 END)" = /datum/status_effect/bardicbuff/endurance, "Erdl's Blessing (+1 CON)" = /datum/status_effect/bardicbuff/constitution, "Iliope's Alacrity (+1 SPD)" = /datum/status_effect/bardicbuff/speed, - "Al'Aqshir's Righteous Fury (+1 STR, +1 PER)" = /datum/status_effect/bardicbuff/ravox) + "Mordsol's Righteous Fury (+1 STR, +1 PER)" = /datum/status_effect/bardicbuff/ravox) if(6 to INFINITY) // Legendary onwards buffs2pick += list("Akan's Brilliance (+1 INT)" = /datum/status_effect/bardicbuff/intelligence, "Goler Kanh's Perseverance (+1 END)" = /datum/status_effect/bardicbuff/endurance, "Erdl's Blessing (+1 CON)" = /datum/status_effect/bardicbuff/constitution, "Iliope's Alacrity (+1 SPD)" = /datum/status_effect/bardicbuff/speed, - "Al'Aqshir's Righteous Fury (+1 STR, +1 PER)" = /datum/status_effect/bardicbuff/ravox, + "Mordsol's Righteous Fury (+1 STR, +1 PER)" = /datum/status_effect/bardicbuff/ravox, "Visires' Awakening (+energy, +stamina, +1 FOR)" = /datum/status_effect/bardicbuff/awaken) // TAKE THE LAND THAT MUST BE TAKEN else // debug message_admins("[key_name(usr)] is a bard with zero music skill and couldn't choose a buff.") diff --git a/code/modules/jobs/job_types/adventurer/types/special/crusader.dm b/code/modules/jobs/job_types/adventurer/types/special/crusader.dm index 9b444428adb..c2b8c368fca 100644 --- a/code/modules/jobs/job_types/adventurer/types/special/crusader.dm +++ b/code/modules/jobs/job_types/adventurer/types/special/crusader.dm @@ -2,7 +2,7 @@ title = "Totod Order Emissary" tutorial = "The Crusaders are knights who have pledged their wealth and lands to the Church, \ taking up the banner of the Totod Order dedicated to retaking Valoria. \ - Three cults provide knights for the Order: Visires, Valdala and Al'Aqshir. \ + Three cults provide knights for the Order: Visires, Valdala and Mordsol. \ You were sent to Vanderlin by the Order to get any and all assistance from the faithful for the Crusade." allowed_races = RACES_PLAYER_NONHERETICAL allowed_patrons = list(/datum/patron/divine/astrata, /datum/patron/divine/necra, /datum/patron/divine/ravox) diff --git a/code/modules/jobs/job_types/inquistion/inquisitor.dm b/code/modules/jobs/job_types/inquistion/inquisitor.dm index 24a6f48b031..2704d9c9170 100644 --- a/code/modules/jobs/job_types/inquistion/inquisitor.dm +++ b/code/modules/jobs/job_types/inquistion/inquisitor.dm @@ -1,5 +1,5 @@ /datum/job/inquisitor - title = "Herr Prafekt" + title = "Inquisitor" department_flag = INQUISITION faction = "Station" total_positions = 1 @@ -48,15 +48,15 @@ spawned.hud_used?.shutdown_bloodpool() spawned.hud_used?.initialize_bloodpool() spawned.hud_used?.bloodpool.set_fill_color("#dcdddb") - spawned.hud_used?.bloodpool?.name = "Angros' Grace: [spawned.bloodpool]" + spawned.hud_used?.bloodpool?.name = "All-Aspect's Grace: [spawned.bloodpool]" spawned.hud_used?.bloodpool?.desc = "Devotion: [spawned.bloodpool]/[spawned.maxbloodpool]" spawned.maxbloodpool = 1000 var/prev_real_name = spawned.real_name var/prev_name = spawned.name - var/honorary = "Herr Prafekt" + var/honorary = "Inquisitor" if(spawned.pronouns == SHE_HER) - honorary = "Frau Prafekt" + honorary = "Inquisitrix" spawned.real_name = "[honorary] [prev_real_name]" spawned.name = "[honorary] [prev_name]" @@ -169,7 +169,7 @@ addtimer(TRAIT_CALLBACK_REMOVE(H, TRAIT_RECENTLY_TORTURED, TRAIT_GENERIC), 30 SECONDS) var/static/list/faith_lines = list( - "DO YOU DENY PSYDON AND THE TEN?", + "DO YOU DENY THE ELEMENTALS?", "WHO IS YOUR GOD?", "ARE YOU FAITHFUL?", "TO WHICH SHEPHERD DO YOU FLOCK TO?", @@ -320,7 +320,7 @@ held_confession.bad_type = "AN OUTLAW OF THE THIEF-LORD" held_confession.antag = initial(antag_type:name) if(/datum/patron/inhumen/matthios) - held_confession.bad_type = "A FOLLOWER OF THE THIEF-LORD" + held_confession.bad_type = "A FOLLOWER OF THE DECEIVERS" held_confession.antag = "worshiper of " + initial(antag_type:name) if(/datum/antagonist/maniac) held_confession.bad_type = "A MANIAC DELUDED BY MADNESS" @@ -329,13 +329,13 @@ held_confession.bad_type = "A DEATH CULTIST" held_confession.antag = initial(antag_type:name) if(/datum/antagonist/zizocultist) - held_confession.bad_type = "A SERVANT OF THE FORBIDDEN ONE" + held_confession.bad_type = "A SERVANT OF THE ONE ENVY" held_confession.antag = initial(antag_type:name) if(/datum/antagonist/zizocultist/leader) - held_confession.bad_type = "A SERVANT OF THE FORBIDDEN ONE" + held_confession.bad_type = "A SERVANT OF THE ONE ENVY" held_confession.antag = initial(antag_type:name) if(/datum/patron/inhumen/zizo) - held_confession.bad_type = "A FOLLOWER OF THE FORBIDDEN ONE" + held_confession.bad_type = "A FOLLOWER OF THE ONE ENVY" held_confession.antag = "worshiper of " + initial(antag_type:name) if(/datum/antagonist/werewolf) var/datum/antagonist/werewolf/werewolf_antag = mind.has_antag_datum(/datum/antagonist/werewolf, TRUE) @@ -359,7 +359,7 @@ held_confession.bad_type = "AN UNDERLING OF THE BLOOD-LORD" held_confession.antag = initial(antag_type:name) if(/datum/patron/inhumen/graggar) - held_confession.bad_type = "A FOLLOWER OF THE DARK SUN" + held_confession.bad_type = "A FOLLOWER OF THE ARCHDEVILS" held_confession.antag = "worshiper of " + initial(antag_type:name) if(/datum/patron/godless/godless) held_confession.bad_type = "A DAMNED ANTI-THEIST" @@ -376,11 +376,11 @@ if(/datum/patron/godless/naivety) held_confession.bad_type = "A IGNORANT FOOL" held_confession.antag = "worshiper of nothing" - if(/datum/patron/godless/rashan) - held_confession.bad_type = "A FOLLOWER OF A FALSE GOD" - held_confession.antag = "worshiper of the false god, Rashan-Kahl" if(/datum/patron/inhumen/baotha) - held_confession.bad_type = "A FOLLOWER OF THE REMORSELESS RUINER" + held_confession.bad_type = "A FOLLOWER OF THE FAERIE DEVIL" + held_confession.antag = "worshiper of " + initial(antag_type:name) + if(/datum/patron/psydon/extremist) + held_confession.bad_type = "A RADICAL WHO SEEKS THE RETURN OF ANGROS" held_confession.antag = "worshiper of " + initial(antag_type:name) else return diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 87cdf0cfecf..9732d5c1e45 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -213,8 +213,32 @@ if(HAS_TRAIT(src, TRAIT_THIEVESGUILD) && HAS_TRAIT(user, TRAIT_THIEVESGUILD)) . += span_green("A member of the Thieves' Guild.") - if((HAS_TRAIT(src, TRAIT_CABAL) && HAS_TRAIT(user, TRAIT_CABAL)) || (src.patron?.type == /datum/patron/inhumen/zizo && HAS_TRAIT(user, TRAIT_CABAL))) - . += span_purple("A fellow seeker of Her ascension.") + if((HAS_TRAIT(src, TRAIT_CABAL) && HAS_TRAIT(user, TRAIT_CABAL))) + . += span_purple("Another possessed of the blood of the One Envy.") + + if((HAS_TRAIT(src, TRAIT_CABAL_CHUD) && HAS_TRAIT(user, TRAIT_CABAL))) + . += span_purple("An unenlightened fool who professes to follow the One Envy.") + + if((HAS_TRAIT(src, TRAIT_CABAL_CHUD) && HAS_TRAIT(user, TRAIT_CABAL_CHUD))) + . += span_purple("A fellow follower of the Jealous God.") + + if((HAS_TRAIT(src, TRAIT_CABAL) && HAS_TRAIT(user, TRAIT_CABAL_CHUD))) + . += span_purple("A Shirleigh, one of Her annointed!") + + if((HAS_TRAIT(src, TRAIT_ARCHDEVILS) && HAS_TRAIT(user, TRAIT_ARCHDEVILS))) + . += span_red("Another soul enlightened to the power of the Archdevils.") + + if((HAS_TRAIT(src, TRAIT_HERTANNEA) && HAS_TRAIT(user, TRAIT_HERTANNEA))) + . += span_purple("The scent of perfume and hedonism lingers on this one. A kindred devoted of Hertannea.") + + if((HAS_TRAIT(src, TRAIT_ABSOLUTIONIST) && HAS_TRAIT(user, TRAIT_ABSOLUTIONIST))) + . += span_red("The determined fury in their eye is familiar. They, too, seek the return of the Mad God.") + + if((HAS_TRAIT(src, TRAIT_SALVATIONIST) && HAS_TRAIT(user, TRAIT_ABSOLUTIONIST))) + . += span_red("BETRAYER! COWARD! SALVATIONIST SCUM! Their prayers keep the Mad God impotent and weak!") + + if((HAS_TRAIT(src, TRAIT_CORRUPTED) && HAS_TRAIT(user, TRAIT_CORRUPTED))) + . += span_red("I see it in them, the same taint within my own veins. They worship a patron touched by Hell. But which one...") var/inquisition_text =get_inquisition_text(user) if(inquisition_text) diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 4ae0794e1ea..36afe200086 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -130,7 +130,7 @@ GLOBAL_LIST_EMPTY(last_words) if (HAS_TRAIT(player, TRAIT_CABAL) || istype(player.patron, /datum/patron/inhumen/zizo)) to_chat(player, span_warning("I feel the faint passage of disjointed life essence as it flees [locale].")) else - to_chat(player, span_warning("Veiled whispers herald the Undermaiden's gaze in my mind's eye as it turns towards [locale] for but a brief, singular moment.")) + to_chat(player, span_warning("Veiled whispers herald the Valkyrie's gaze in my mind's eye as it turns towards [locale] for but a brief, singular moment.")) return TRUE @@ -152,6 +152,6 @@ GLOBAL_LIST_EMPTY(last_words) if ("sewers") locale = "somwhere under the city of [SSmapping.config.map_name] and all its bustling souls" if ("church") - locale = "a hallowed place, sworn to the Ten" // special bit for the church since it's sacred ground + locale = "a hallowed place, sworn to the Aspects" // special bit for the church since it's sacred ground return locale diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/farm/cow.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/farm/cow.dm index 7b8ff40ce82..ef9c526062b 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/farm/cow.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/farm/cow.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/hostile/retaliate/cow icon = 'icons/roguetown/mob/monster/cow.dmi' name = "moo-beast" - desc = "The grail of many farmers. Commonfolk associate the motherly sow with Pomette, and the raging bull with Al'Aqshir." + desc = "The grail of many farmers. Commonfolk associate the motherly sow with Pomette, and the raging bull with Mordsol." icon_state = "cow" icon_living = "cow" icon_dead = "cow_dead" diff --git a/code/modules/spells/spell_types/pointed/healing.dm b/code/modules/spells/spell_types/pointed/healing.dm index a18ab23b77c..0397288c51c 100644 --- a/code/modules/spells/spell_types/pointed/healing.dm +++ b/code/modules/spells/spell_types/pointed/healing.dm @@ -52,8 +52,8 @@ return if((cast_on.real_name in GLOB.excommunicated_players) && !HAS_TRAIT(cast_on, TRAIT_FANATICAL)) cast_on.visible_message( - span_warning("The angry Ten the flesh of [cast_on]! a foolish blasphemer and heretic!"), - span_notice("I am despised by the Ten, rejected, and they remind me just how unlovable I am with a wave of pain!"), + span_warning("The angry Elementals burn the flesh of [cast_on]! A foolish blasphemer and heretic!"), + span_notice("I am despised by the Elementals, rejected, and they remind me of my crimes with a wave of pain!"), ) cast_on.emote("scream") return @@ -64,11 +64,11 @@ if(isliving(owner)) var/mob/living/living_owner = owner switch(living_owner.patron?.type) - if(/datum/patron/psydon) - cast_on.visible_message(span_info("A strange stirring feeling pours from [cast_on]!"), span_notice("Sentimental thoughts drive away my pains!")) + if(/datum/patron/divine/undivided) + cast_on.visible_message(span_info("A strange stirring feeling pours from [cast_on]!"), span_notice("Purest faith brings balance to my humours!")) if(/datum/patron/divine/astrata) - cast_on.visible_message(span_info("A wreath of gentle light passes over [cast_on]!"), span_notice("I'm bathed in holy light!")) + cast_on.visible_message(span_info("A wreath of fierce sunlight passes over [cast_on]!"), span_notice("I'm bathed in blazing sunlight!")) // during the day, heal 10 more (basic as fuck) if(GLOB.tod == "day") conditional_buff = TRUE @@ -91,7 +91,7 @@ conditional_buff = TRUE if(/datum/patron/divine/abyssor) - cast_on.visible_message(span_info("A mist of salt-scented vapour settles on [cast_on]!"), span_notice("I'm invigorated by healing vapours!")) + cast_on.visible_message(span_info("The implacable power of the tides fortifies [cast_on]!"), span_notice("I'm invigorated by healing waters!")) // if our owner or cast_on is standing in water, heal a flat amount extra if(istype(get_turf(cast_on), /turf/open/water) || istype(get_turf(owner), /turf/open/water)) conditional_buff = TRUE @@ -106,7 +106,7 @@ conditional_buff = TRUE if(/datum/patron/divine/necra) - cast_on.visible_message(span_info("A sense of quiet respite radiates from [cast_on]!"), span_notice("I feel the Undermaiden's gaze turn from me for now!")) + cast_on.visible_message(span_info("A sense of quiet resolve radiates from [cast_on]!"), span_notice("I feel the Valkyrie's gaze turn from me for now!")) if(iscarbon(cast_on)) var/mob/living/carbon/C = cast_on // if the cast_on is "close to death" (at or below 25% health) @@ -120,6 +120,7 @@ if(prob(50)) conditional_buff = TRUE situational_bonus = rand(1, 25) + if(/datum/patron/divine/pestra) cast_on.visible_message(span_info("An aura of clinical care encompasses [cast_on]!"), span_notice("I'm sewn back together by sacred medicine!")) // pestra always heals a little more toxin damage and restores a bit more blood @@ -144,8 +145,18 @@ conditional_buff = TRUE situational_bonus = 25 + if(/datum/patron/psydon) + // Angros is dying, it's faith in him that sustains the worldflame - there's little left to sustain us, so no conditional heal bonus. + cast_on.visible_message(span_info("Flickering, dying embers swirl around [cast_on]!"), span_notice("The solemn respite of the sundered God soothes me!")) + if(/datum/patron/inhumen/zizo) - cast_on.visible_message(span_info("Vital energies are sapped towards [cast_on]!"), span_notice("The life around me pales as I am restored!")) + cast_on.visible_message(span_info("A foreign light burns impossibly bright around [cast_on]!"), span_notice("Light empowers my body, making quick work of my wounds. I hear the voice of a divine being which is far too close to me.")) + if (HAS_TRAIT(target, TRAIT_CABAL)) + conditional_buff = TRUE + situational_bonus = 2.5 + + if(/datum/patron/inhumen/graggar) + cast_on.visible_message(span_info("Vital energies are sapped towards [cast_on]! The very Earth cries out!"), span_notice("The life around me pales as I am restored!")) // set up a ritual pile of bones (or just cast near a stack of bones whatever) around us for massive bonuses, cap at 50 for 75 healing total (wowie) situational_bonus = 0 for(var/obj/item/alch/bone/O in oview(5, owner)) @@ -153,19 +164,10 @@ if(situational_bonus > 0) conditional_buff = TRUE - if(/datum/patron/inhumen/graggar) - cast_on.visible_message(span_info("Foul fumes billow outward as [cast_on] is restored!"), span_notice("A noxious scent burns my nostrils, but I feel better!")) - // if you've got lingering toxin damage, you get healed more, but your bonus healing doesn't affect toxin - var/toxloss = cast_on.getToxLoss() - if(toxloss >= 10) - conditional_buff = TRUE - situational_bonus = 25 - cast_on.adjustToxLoss(situational_bonus) // remember we do a global toxloss adjust down below so this is okay - if(/datum/patron/inhumen/matthios) - cast_on.visible_message(span_info("A shadowed hand passes [cast_on] a small, stolen vial... its contents glimmer faintly before sinking into their veins..."), span_notice("A quick swig and the ache fades...")) - // COMRADES! WE MUST BAND TOGETHER! Or Outlaw. - if(HAS_TRAIT(cast_on, TRAIT_BANDITCAMP) || (cast_on.real_name in GLOB.outlawed_players)) + cast_on.visible_message(span_info("Unfamiliar shadowy tendrils crawl forth and embrace [cast_on], mending their wounds."), span_notice("A hidden being of great power is stitching me shut!")) + message_admins("A hidden Deceiver God has shown favor to [cast_on]! The One of Envy stirs.") + if(HAS_TRAIT(cast_on, TRAIT_MATTHIOS_EYES) || (cast_on.real_name in GLOB.outlawed_players)) conditional_buff = TRUE situational_bonus = 25 @@ -186,6 +188,13 @@ situational_bonus = 25 break + if(/datum/patron/psydon/extremist) + // Heretical Angros worshippers suppliment the weakened power of their god with Hell's magic, so they get a bonus heal on fellow Absolutionists. + cast_on.visible_message(span_info("Stubbornly burning shadowy embers blaze about [cast_on]!"), span_notice("The defiant fury of a dying and dark flame sears my wounds shut!")) + if (HAS_TRAIT(target, TRAIT_PSYDONITE)) + conditional_buff = TRUE + situational_bonus = 2.5 + else if(istype(living_owner.patron, /datum/patron/godless)) cast_on.visible_message(span_info("No Gods answer these prayers."), span_notice("No Gods answer these prayers.")) diff --git a/code/modules/spells/spell_types/pointed/persistence.dm b/code/modules/spells/spell_types/pointed/persistence.dm index f27fe6353eb..86618296ba3 100644 --- a/code/modules/spells/spell_types/pointed/persistence.dm +++ b/code/modules/spells/spell_types/pointed/persistence.dm @@ -9,7 +9,7 @@ associated_skill = /datum/skill/magic/holy required_items = list(/obj/item/clothing/neck/psycross/silver/ravox) - invocation = "Al'Aqshir deems your persistence worthy!" + invocation = "Mordsol deems your persistence worthy!" invocation_type = INVOCATION_SHOUT charge_required = FALSE @@ -35,7 +35,7 @@ phy.pain_mod *= 1.5 addtimer(VARSET_CALLBACK(phy, bleed_mod, phy.bleed_mod /= 1.5), 19 SECONDS) addtimer(VARSET_CALLBACK(phy, pain_mod, phy.pain_mod /= 1.5), 19 SECONDS) - human_target.visible_message(span_danger("[cast_on]'s wounds become inflamed as their vitality is sapped away!"), span_userdanger("Al'Aqshir inflames my wounds and weakens my body!")) + human_target.visible_message(span_danger("[cast_on]'s wounds become inflamed as their vitality is sapped away!"), span_userdanger("Mordsol inflames my wounds and weakens my body!")) return cast_on.visible_message(span_info("Warmth radiates from [cast_on] as their wounds seal over!"), span_notice("The pain from my wounds fade as warmth radiates from my soul!")) @@ -43,7 +43,7 @@ for(var/obj/effect/decal/cleanable/blood/O in view(5, cast_on)) situational_bonus = min(situational_bonus + 0.015, 1) if(situational_bonus > 0.25) - to_chat(owner, "Channeling Al'Aqshir's power is easier in these conditions!") + to_chat(owner, "Channeling Mordsol's power is easier in these conditions!") if(iscarbon(cast_on)) var/mob/living/carbon/C = cast_on diff --git a/code/modules/spells/spell_types/pointed/revive.dm b/code/modules/spells/spell_types/pointed/revive.dm index c34a53b32d8..09d2309b648 100644 --- a/code/modules/spells/spell_types/pointed/revive.dm +++ b/code/modules/spells/spell_types/pointed/revive.dm @@ -1,6 +1,6 @@ /datum/action/cooldown/spell/revive name = "Anastasis" - desc = "Return a soul from Valdala's grasp with the light of Visires." + desc = "Petition the Elementals to return the soul of the deceased, or to utterly unmake one tainted by the curse of undeath." button_icon_state = "revive" sound = 'sound/magic/revive.ogg' charge_sound = 'sound/magic/holycharging.ogg' @@ -90,7 +90,7 @@ ghost.mind.transfer_to(cast_on, TRUE) cast_on.grab_ghost(force = TRUE) // even suicides if(!cast_on.revive(full_heal = FALSE)) - to_chat(owner, span_warning("Visires' light fails to revive [cast_on]!")) + to_chat(owner, span_warning("Divine light fails to revive [cast_on]!")) return record_round_statistic(STATS_ASTRATA_REVIVALS) cast_on.emote("breathgasp") diff --git a/code/modules/spells/spell_types/pointed/ultimate_sacrifice.dm b/code/modules/spells/spell_types/pointed/ultimate_sacrifice.dm index 5894f8fbead..179e186d825 100644 --- a/code/modules/spells/spell_types/pointed/ultimate_sacrifice.dm +++ b/code/modules/spells/spell_types/pointed/ultimate_sacrifice.dm @@ -36,8 +36,8 @@ return owner.visible_message( - span_userdanger("[owner] begins chanting Al'Aqshir's sacrificial rites!"), - span_userdanger("You feel Al'Aqshir's presence around you as you prepare to give your life..."), + span_userdanger("[owner] begins chanting Mordsol's sacrificial rites!"), + span_userdanger("You feel Mordsol's presence around you as you prepare to give your life..."), ) if(!do_after(owner, 10 SECONDS, owner)) diff --git a/code/modules/spells/spell_types/undirected/call_to_slaughter.dm b/code/modules/spells/spell_types/undirected/call_to_slaughter.dm index a2ee404a648..12aec0cc77e 100644 --- a/code/modules/spells/spell_types/undirected/call_to_slaughter.dm +++ b/code/modules/spells/spell_types/undirected/call_to_slaughter.dm @@ -17,14 +17,25 @@ /datum/action/cooldown/spell/undirected/call_to_slaughter/cast(atom/cast_on) . = ..() for(var/mob/living/carbon/target in viewers(3, get_turf(owner))) - if(istype(target.patron, /datum/patron/inhumen)) - target.apply_status_effect(/datum/status_effect/buff/call_to_slaughter) //Buffs inhumens - return - if(istype(target.patron, /datum/patron/psydon)) - to_chat(target, span_danger("You feel a surge of cold wash over you; leaving your body as quick as it hit..")) //No effect on Psydonians, Endure. + if(istype(target.patron, /datum/patron/inhumen/graggar || /datum/patron/inhumen/baotha || /datum/patron/psydon/extremist)) + target.apply_status_effect(/datum/status_effect/buff/call_to_slaughter) //Buffs patrons in service to Hell + to_chat(target, span_danger("You feel the ancient roiling madness call to you from beneath the Firmament, briefly empowering you.")) return + if(istype(target.patron, /datum/patron/inhumen/zizo)) + if((target.job == "Prince Regent") || (target.job == "Prince")) + to_chat(target, span_danger("You feel a wash of heat and the scent of iron rush past you - but the One Envy holds you apart from its path...")) //Jealous God protects the Shirleighs + return + else if((target.job != "Prince Regent") || (target.job == "Prince")) + to_chat(target, span_danger("The Jealous God cares not to shield you from the maddened blood-call of the Hells.")) //But She doesn't give a shit otherwise + continue + if(istype(target.patron, /datum/patron/inhumen/matthios)) + to_chat(target, span_danger("Your enigmatic patron recoils, caught unprepared by the vicious call of demonic hunger.")) //Deceiver Gods are caught unprepared + continue + if(istype(target.patron, /datum/patron/divine || /datum/patron/psydon)) + to_chat(target, span_danger("You smell rot and taste bile as the reeking madness of the Hells crashes into you, ravenous for Flesh and Thauma. Yours.")) //Elementals and All-Aspect are Hell's biggest rivals + continue if(!owner.faction_check_mob(target)) continue if(target.mob_biotypes & MOB_UNDEAD) continue - target.apply_status_effect(/datum/status_effect/debuff/call_to_slaughter) //Debuffs non-inhumens/psydonians + target.apply_status_effect(/datum/status_effect/debuff/call_to_slaughter) //Debuffs all patrons not loyal to Hell diff --git a/code/modules/spells/spell_types/undirected/divine_strike.dm b/code/modules/spells/spell_types/undirected/divine_strike.dm index db594225d44..4443045212a 100644 --- a/code/modules/spells/spell_types/undirected/divine_strike.dm +++ b/code/modules/spells/spell_types/undirected/divine_strike.dm @@ -9,7 +9,7 @@ associated_skill = /datum/skill/magic/holy required_items = list(/obj/item/clothing/neck/psycross/silver/ravox) - invocation = "Al'Aqshir deems your persistence worthy!" + invocation = "Mordsol deems your persistence worthy!" invocation_type = INVOCATION_SHOUT charge_required = FALSE @@ -92,7 +92,7 @@ effectedstats[STATKEY_END] -= 1 /atom/movable/screen/alert/status_effect/debuff/ravox_burden - name = "Al'Aqshir's Burden" + name = "Mordsol's Burden" desc = "My arms and legs are restrained by divine chains!" icon_state = "restrained"