mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Gives different costs to heretic sacrifice targets & Allows heretics to sac people in crit (#20558)
* wow this works? who knew * we're so back gojo bros * this is ognna need some code review fuck me * Update code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> * Update code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> * Update code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> * I think I did this right probably * baiomu recommended changeq we're getting big brained now * Update code/__DEFINES/stat.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * Update code/modules/antagonists/eldritch_cult/eldritch_transmutations.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> * I forgot to change this 1 billion years ago sorry * I like baiomu's ting better sorry * ok ok * minor mistake accidentally forgot to update this * I totally updated this already there was another PR about it, how did I fuck this up so much --------- Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com> Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
//mob/var/stat things
|
||||
#define CONSCIOUS 0
|
||||
#define SOFT_CRIT 1
|
||||
#define UNCONSCIOUS 2
|
||||
#define UNCONSCIOUS 2 //THIS MEANS HARD CRIT
|
||||
#define DEAD 3
|
||||
|
||||
//Maximum healthiness an individual can have
|
||||
|
||||
@@ -1018,7 +1018,7 @@
|
||||
name = "Void Phase"
|
||||
desc = "Let's you blink to your pointed destination, causes 3x3 aoe damage bubble \
|
||||
around your pointed destination and your current location. \
|
||||
It has a minimum range of 3 tiles and a maximum range of 9 tiles."
|
||||
It has a minimum range of 3 tiles and a maximum range of 5 tiles."
|
||||
background_icon_state = "bg_heretic"
|
||||
overlay_icon_state = "bg_heretic_border"
|
||||
button_icon = 'icons/mob/actions/actions_ecult.dmi'
|
||||
|
||||
@@ -177,16 +177,26 @@
|
||||
var/mob/living/carbon/carbon_user = user
|
||||
for(var/obj/item/living_heart/LH in atoms)
|
||||
|
||||
if(LH.target && LH.target.stat == DEAD)
|
||||
if(LH.target?.stat) ///wow this works
|
||||
to_chat(carbon_user,span_danger("Your patrons accepts your offer.."))
|
||||
var/mob/living/carbon/human/H = LH.target
|
||||
H.apply_status_effect(STATUS_EFFECT_BRAZIL_PENANCE)
|
||||
LH.target = null
|
||||
var/datum/antagonist/heretic/EC = carbon_user.mind.has_antag_datum(/datum/antagonist/heretic)
|
||||
|
||||
EC.total_sacrifices++
|
||||
EC.charge += 2
|
||||
if(LH.target.mind.has_antag_datum(/datum/antagonist/heretic))
|
||||
EC.charge += 4
|
||||
|
||||
else if(LH.target.mind.assigned_role in GLOB.command_positions)
|
||||
|
||||
EC.charge += 3
|
||||
|
||||
else if(LH.target.mind.assigned_role in GLOB.security_positions)
|
||||
EC.charge += 3
|
||||
|
||||
else
|
||||
EC.charge += 2
|
||||
EC.total_sacrifices++
|
||||
|
||||
if(QDELETED(LH.target))
|
||||
var/datum/objective/A = new
|
||||
|
||||
@@ -86,12 +86,12 @@
|
||||
tier = TIER_2
|
||||
|
||||
/datum/eldritch_knowledge/spell/famished_roar
|
||||
name = "T2 - Famished Roar"
|
||||
name = "T3 - Famished Roar"
|
||||
gain_text = "Beasts all over the shop. You'll be one of them... Sooner or later... What's that smell? The sweet blood, oh, it sings to me. It's enough to make a man sick..."
|
||||
desc = "An AOE roar spell that freezes all nearby people with sheer terror."
|
||||
cost = 1
|
||||
spell_to_add = /datum/action/cooldown/spell/aoe/immobilize/famished_roar
|
||||
tier = TIER_2
|
||||
tier = TIER_3
|
||||
|
||||
/datum/eldritch_knowledge/mind_blade_upgrade
|
||||
name = "Blade Upgrade - Spine of The Infinite Beast"
|
||||
@@ -125,7 +125,7 @@
|
||||
ADD_TRAIT(user, TRAIT_REDUCED_DAMAGE_SLOWDOWN, type)
|
||||
|
||||
/datum/eldritch_knowledge/spell/eldritchbolt
|
||||
name = "T3 - Eldritch Bolt"
|
||||
name = "T2 - Eldritch Bolt"
|
||||
gain_text = "Remain wary of the frailty of men. Their wills are weak, minds young. Were it not for fear, death would go unlamented. Seek the old blood. Let us pray, let us wish... to partake in communion."
|
||||
desc = "A strong single target spell, shoot a target with raw energy from another dimension."
|
||||
cost = 1
|
||||
|
||||
@@ -258,6 +258,7 @@
|
||||
#include "code\_globalvars\lists\client.dm"
|
||||
#include "code\_globalvars\lists\flavor_misc.dm"
|
||||
#include "code\_globalvars\lists\keybindings.dm"
|
||||
#include "code\_globalvars\lists\maintenance_loot.dm"
|
||||
#include "code\_globalvars\lists\mapping.dm"
|
||||
#include "code\_globalvars\lists\medals.dm"
|
||||
#include "code\_globalvars\lists\mobs.dm"
|
||||
@@ -265,7 +266,6 @@
|
||||
#include "code\_globalvars\lists\objects.dm"
|
||||
#include "code\_globalvars\lists\poll_ignore.dm"
|
||||
#include "code\_globalvars\lists\typecache.dm"
|
||||
#include "code\_globalvars\lists\maintenance_loot.dm"
|
||||
#include "code\_js\byjax.dm"
|
||||
#include "code\_js\menus.dm"
|
||||
#include "code\_onclick\adjacent.dm"
|
||||
@@ -722,8 +722,8 @@
|
||||
#include "code\datums\mutations\radiantburst.dm"
|
||||
#include "code\datums\mutations\radioactive.dm"
|
||||
#include "code\datums\mutations\radproof.dm"
|
||||
#include "code\datums\mutations\sapblood.dm"
|
||||
#include "code\datums\mutations\ravenous.dm"
|
||||
#include "code\datums\mutations\sapblood.dm"
|
||||
#include "code\datums\mutations\sight.dm"
|
||||
#include "code\datums\mutations\space_adaptation.dm"
|
||||
#include "code\datums\mutations\speech.dm"
|
||||
|
||||
Reference in New Issue
Block a user