Eldritch Affairs Port

This commit is contained in:
Dip
2020-09-20 20:26:15 -03:00
parent cfff70349a
commit 9aa6a44267
20 changed files with 184 additions and 54 deletions
@@ -222,7 +222,7 @@
data = 1
data++
M.jitteriness = min(M.jitteriness+4,10)
if(iscultist(M))
if(iscultist(M, FALSE, TRUE))
for(var/datum/action/innate/cult/blood_magic/BM in M.actions)
to_chat(M, "<span class='cultlarge'>Your blood rites falter as holy water scours your body!</span>")
for(var/datum/action/innate/cult/blood_spell/BS in BM.spells)
@@ -249,7 +249,7 @@
if("emote")
M.visible_message("<span class='warning'>[M] [pick("whimpers quietly", "shivers as though cold", "glances around in paranoia")].</span>")
if(data >= 60) // 30 units, 135 seconds
if(iscultist(M) || is_servant_of_ratvar(M))
if(iscultist(M, FALSE, TRUE) || is_servant_of_ratvar(M, FALSE, TRUE))
if(iscultist(M))
SSticker.mode.remove_cultist(M.mind, FALSE, TRUE)
else if(is_servant_of_ratvar(M))