From bff11c4fe5d057ecf739ff696c1256b189a943f8 Mon Sep 17 00:00:00 2001 From: kiwedespars <47008095+kiwedespars@users.noreply.github.com> Date: Thu, 13 Aug 2020 01:12:10 -0700 Subject: [PATCH] fixes, changes. - buffed eldritch fluid - readded patron's reach as a 1 point off from aggressive spread - buffed amount of ghouls flesh can have. - buffed the stam regen of rust a little bit. - fixed sacrifices not giving points if they were in your pockets (thanks to tgstation/tgstation#51648) - removal of heretic status no longer gives a loud deconvert message (thanks to tgstation/tgstation#52629) - description fixes, eldritch amulet now works. --- code/datums/mood_events/generic_positive_events.dm | 2 +- .../antagonists/eldritch_cult/eldritch_antag.dm | 5 ++--- .../antagonists/eldritch_cult/eldritch_items.dm | 2 +- .../antagonists/eldritch_cult/eldritch_knowledge.dm | 2 +- .../antagonists/eldritch_cult/knowledge/ash_lore.dm | 4 ++-- .../eldritch_cult/knowledge/flesh_lore.dm | 4 ++-- .../antagonists/eldritch_cult/knowledge/rust_lore.dm | 12 ++++++++++-- code/modules/mob/inventory.dm | 2 +- .../reagents/chemistry/reagents/other_reagents.dm | 10 +++++----- 9 files changed, 25 insertions(+), 18 deletions(-) diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 2f4d702849..b73756c2b1 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -71,7 +71,7 @@ hidden = TRUE /datum/mood_event/heretics - description = "THE HIGHER I RISE , THE MORE I SEE.\n" + description = "THE HIGHER I RISE, THE MORE I SEE.\n" mood_change = 12 //maybe being a cultist isnt that bad after all hidden = TRUE diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index ba3017e380..ca6230db14 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -23,8 +23,8 @@ The old ones gave you these tasks to fulfill:") owner.announce_objectives() to_chat(owner, "The book whispers, the forbidden knowledge walks once again!
\ - Your book allows you to research abilities, read it very carefully! you cannot undo what has been done!
\ - You gain charges by either collecting influences or sacrificng people tracked by the living heart
\ + Your book allows you to research abilities, but be careful, you cannot undo what has been done.
\ + You gain charges by either collecting influences or sacrificing people tracked by the living heart
\ You can find a basic guide at : https://tgstation13.org/wiki/Heresy_101 ") /datum/antagonist/heretic/on_gain() @@ -49,7 +49,6 @@ EK.on_lose(owner.current) if(!silent) - owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current) to_chat(owner.current, "Your mind begins to flare as the otherwordly knowledge escapes your grasp!") owner.current.log_message("has renounced the cult of the old ones!", LOG_ATTACK, color="#960000") GLOB.reality_smash_track.RemoveMind(owner) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm index af6f5cbd2a..4dab6d789d 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm @@ -100,7 +100,7 @@ /obj/item/clothing/neck/eldritch_amulet/equipped(mob/user, slot) . = ..() - if(ishuman(user) && user.mind && slot == ITEM_SLOT_NECK) + if(ishuman(user) && user.mind && slot == SLOT_NECK && IS_HERETIC(user)) ADD_TRAIT(user, trait, CLOTHING_TRAIT) user.update_sight() diff --git a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm index 08bcc81290..ede9ac31f3 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm @@ -245,7 +245,7 @@ for(var/obj/item/living_heart/LH in atoms) if(LH.target && LH.target.stat == DEAD) - to_chat(carbon_user,"Your patrons accepts your offer..") + to_chat(carbon_user,"Your patrons accepts your offer...") var/mob/living/carbon/human/H = LH.target H.become_husk() LH.target = null diff --git a/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm index b3148287c8..8dabcd428f 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm @@ -90,9 +90,9 @@ chosen_mob.cure_blind(MAGIC_TRAIT) /datum/eldritch_knowledge/spell/flame_birth - name = "Flame Birth" + name = "Fiery Rebirth" gain_text = "Nightwatcher was a man of principles, and yet he arose from the chaos he vowed to protect from." - desc = "Short range spell that allows you to curse someone with massive sanity loss." + desc = "Drains nearby alive people that are engulfed in flames. It heals 10 of each damage type per person. If a person is in critical condition it finishes them off." cost = 1 spell_to_add = /obj/effect/proc_holder/spell/targeted/fiery_rebirth next_knowledge = list(/datum/eldritch_knowledge/spell/cleave,/datum/eldritch_knowledge/summon/ashy,/datum/eldritch_knowledge/final/ash_final) diff --git a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm index fd0763fb3c..06c56184d1 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm @@ -70,7 +70,7 @@ desc = "Empowers your Mansus Grasp to be able to create a single ghoul out of a dead player. You cannot raise the same person twice. Ghouls have only 50 HP and look like husks." cost = 1 next_knowledge = list(/datum/eldritch_knowledge/flesh_ghoul) - var/ghoul_amt = 1 + var/ghoul_amt = 6 var/list/spooky_scaries route = PATH_FLESH @@ -192,7 +192,7 @@ /datum/eldritch_knowledge/summon/rusty name = "Rusted Ritual" gain_text = "I combined principle of hunger with desire of corruption. The rusted hills call my name." - desc = "You can now summon a Rust Walker transmuting a vomit pool, a head using a transmutation circle. Rust Walkers possess the ability to spread rust and can fire bolts of rust to further corrode the area." + desc = "You can now summon a Rust Walker transmuting a vomit pool, a head, and a book using a transmutation circle. Rust Walkers possess the ability to spread rust and can fire bolts of rust to further corrode the area." cost = 1 required_atoms = list(/obj/effect/decal/cleanable/vomit,/obj/item/bodypart/head,/obj/item/book) mob_to_summon = /mob/living/simple_animal/hostile/eldritch/rust_spirit diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm index 1a73d22636..36996a498d 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm @@ -36,7 +36,15 @@ gain_text = "All wise men know not to touch the bound king." cost = 1 spell_to_add = /obj/effect/proc_holder/spell/aoe_turf/rust_conversion - next_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/curse/corrosion,/datum/eldritch_knowledge/spell/blood_siphon) + next_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/curse/corrosion,/datum/eldritch_knowledge/spell/blood_siphon,/datum/eldritch_knowledge/spell/rust_wave) + route = PATH_RUST + +/datum/eldritch_knowledge/spell/rust_wave + name = "Patron's Reach" + desc = "You can now send a bolt of rust that corrupts the immediate area, and lightly c the first target hit." + gain_text = "Messengers of hope fear the rustbringer." + cost = 1 + spell_to_add = /obj/effect/proc_holder/spell/aimed/rust_wave route = PATH_RUST /datum/eldritch_knowledge/rust_regen @@ -57,7 +65,7 @@ living_user.adjustFireLoss(-3, FALSE) living_user.adjustToxLoss(-3, FALSE) living_user.adjustOxyLoss(-1, FALSE) - living_user.adjustStaminaLoss(-4) + living_user.adjustStaminaLoss(-6) /datum/eldritch_knowledge/rust_mark name = "Mark of Rust" diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 84f0a39531..4a133ed5f6 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -479,7 +479,7 @@ //GetAllContents that is reasonable and not stupid /mob/living/carbon/proc/get_all_gear() - var/list/processing_list = get_equipped_items() + held_items + var/list/processing_list = get_equipped_items(include_pockets = TRUE) + held_items listclearnulls(processing_list) // handles empty hands var/i = 0 while(i < length(processing_list) ) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 329d74b1bf..d34640ab15 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2341,11 +2341,11 @@ datum/reagent/eldritch if(IS_HERETIC(M)) M.drowsyness = max(M.drowsyness-5, 0) M.AdjustAllImmobility(-40, FALSE) - M.adjustStaminaLoss(-10, FALSE) - M.adjustToxLoss(-2, FALSE) - M.adjustOxyLoss(-2, FALSE) - M.adjustBruteLoss(-2, FALSE) - M.adjustFireLoss(-2, FALSE) + M.adjustStaminaLoss(-15, FALSE) + M.adjustToxLoss(-3, FALSE) + M.adjustOxyLoss(-3, FALSE) + M.adjustBruteLoss(-3, FALSE) + M.adjustFireLoss(-3, FALSE) if(ishuman(M) && M.blood_volume < BLOOD_VOLUME_NORMAL) M.blood_volume += 3 else