From aea562bbe99e9ab4a32b50f15a6890d5f7587a27 Mon Sep 17 00:00:00 2001 From: Dip Date: Wed, 7 Oct 2020 05:50:53 -0300 Subject: [PATCH] Eldritch Affairs Patch --- code/datums/mind.dm | 10 ++++++++-- code/modules/antagonists/cult/blood_magic.dm | 4 +--- code/modules/antagonists/cult/cult_items.dm | 2 +- code/modules/antagonists/cult/runes.dm | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index cf3202c2..7c86cfe6 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -325,14 +325,20 @@ /datum/mind/proc/enslave_mind_to_creator(mob/living/creator) if(iscultist(creator)) - SSticker.mode.add_cultist(src) + if(iscultist(creator, TRUE)) + SSticker.mode.add_cultist(src) + else + src.add_antag_datum(/datum/antagonist/cult/neutered/traitor) else if(is_revolutionary(creator)) var/datum/antagonist/rev/converter = creator.mind.has_antag_datum(/datum/antagonist/rev,TRUE) converter.add_revolutionary(src,FALSE) else if(is_servant_of_ratvar(creator)) - add_servant_of_ratvar(current) + if(is_servant_of_ratvar(creator, TRUE)) + add_servant_of_ratvar(current) + else + add_servant_of_ratvar(current, FALSE, FALSE, /datum/antagonist/clockcult/neutered/traitor) else if(is_nuclear_operative(creator)) var/datum/antagonist/nukeop/converter = creator.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 50d24821..d520528c 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -797,11 +797,9 @@ else to_chat(user, "You need a free hand for this rite!") qdel(rite) - if("Blood Beam (500)") + if("Blood Beam (500)") //This spell is honestly a bit useless. Why would anyone limit it? if(uses < 500) to_chat(user, "You need 500 charges to perform this rite.") - else if(!iscultist(user, TRUE)) - to_chat(user, "You are not strongly connected to Nar'sie enough to use something of this power.") else var/obj/rite = new /obj/item/blood_beam() uses -= 500 diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 54f803a0..0ac245a1 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -511,7 +511,7 @@ var/global/curselimit = 0 /obj/item/shuttle_curse/attack_self(mob/living/user) - if(!iscultist(user, TRUE)) + if(!iscultist(user)) //This is fine. Diminishing returns on different alert levels and can only be used once. user.dropItemToGround(src, TRUE) user.Knockdown(100) to_chat(user, "A powerful force shoves you away from [src]!") diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index df696a97..73a7f7fe 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -948,7 +948,7 @@ structure_check() searches for nearby cultist structures required for the invoca color = RUNE_COLOR_DARKRED req_cultists = 3 scribe_delay = 100 - requires_full_power = TRUE + requires_full_power = FALSE // Requires 3 blood cultists. 3 Neutered blood Ts acting together for a common goal should probably be able to have this sort of power. /obj/effect/rune/apocalypse/invoke(var/list/invokers) if(rune_in_use)