This commit is contained in:
Ghommie
2019-09-23 17:25:08 +02:00
parent 05a9b63b79
commit 1fa40dac38
2 changed files with 12 additions and 7 deletions
@@ -210,6 +210,9 @@
/datum/reagent/water/holywater/on_mob_end_metabolize(mob/living/L)
REMOVE_TRAIT(L, TRAIT_HOLY, id)
if(iscultist(M))
for(var/datum/action/innate/cult/blood_magic/BM in M.actions)
BM.holy_dispel = FALSE
return ..()
/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
@@ -219,12 +222,11 @@
M.jitteriness = min(M.jitteriness+4,10)
if(iscultist(M))
for(var/datum/action/innate/cult/blood_magic/BM in M.actions)
var/msg = FALSE
for(var/datum/action/innate/cult/blood_spell/BS in BM.spells)
qdel(BS)
inform = TRUE
if(msg)
if(!BM.holy_dispel)
BM.holy_dispel = TRUE
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)
qdel(BS)
if(data >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec
if(!M.stuttering)
M.stuttering = 1