Merge pull request #561 from ArchieBeepBoop/patch

Eldritch Affairs Patch
This commit is contained in:
Dahlular
2020-10-07 19:34:19 -06:00
committed by GitHub
4 changed files with 11 additions and 7 deletions
+8 -2
View File
@@ -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)
+1 -3
View File
@@ -797,11 +797,9 @@
else
to_chat(user, "<span class='cultitalic'>You need a free hand for this rite!</span>")
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, "<span class='cultitalic'>You need 500 charges to perform this rite.</span>")
else if(!iscultist(user, TRUE))
to_chat(user, "<span class='warning'>You are not strongly connected to Nar'sie enough to use something of this power.</span>")
else
var/obj/rite = new /obj/item/blood_beam()
uses -= 500
+1 -1
View File
@@ -512,7 +512,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, "<span class='warning'>A powerful force shoves you away from [src]!</span>")
+1 -1
View File
@@ -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)