cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9348 from Ghommie/Ghommie-cit209

Browse Source 
Reduces holy water message spam for blood/clock cultists.
This commit is contained in:
kevinz000
2019-09-26 19:31:01 -07:00
committed by GitHub
parent 34740e1be3 274fdf8c06
commit 428a34d0f4
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/antagonists/cult/blood_magic.dm
View File

@@ -4,6 +4,7 @@
desc = "Prepare blood magic by carving runes into your flesh. This rite is most effective with an <b>empowering rune</b>" desc = "Prepare blood magic by carving runes into your flesh. This rite is most effective with an <b>empowering rune</b>"
var/list/spells = list() var/list/spells = list()
var/channeling = FALSE var/channeling = FALSE
var/holy_dispel = FALSE
/datum/action/innate/cult/blood_magic/Grant() /datum/action/innate/cult/blood_magic/Grant()
..() ..()
@@ -33,6 +34,9 @@
B.button.moved = B.button.screen_loc B.button.moved = B.button.screen_loc
/datum/action/innate/cult/blood_magic/Activate() /datum/action/innate/cult/blood_magic/Activate()
if(holy_dispel)
to_chat(owner, "<span class='cultbold'>Holy water currently scours your body, nullifying the power of the rites!</span>")
return
var/rune = FALSE var/rune = FALSE
var/limit = RUNELESS_MAX_BLOODCHARGE var/limit = RUNELESS_MAX_BLOODCHARGE
for(var/obj/effect/rune/empower/R in range(1, owner)) for(var/obj/effect/rune/empower/R in range(1, owner))
@@ -64,7 +68,7 @@
qdel(nullify_spell) qdel(nullify_spell)
return return
BS = possible_spells[entered_spell_name] BS = possible_spells[entered_spell_name]
if(QDELETED(src) || owner.incapacitated() || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (spells.len >= limit)) if(QDELETED(src) || owner.incapacitated() || !BS || holy_dispel || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (spells.len >= limit))
return return
to_chat(owner,"<span class='warning'>You begin to carve unnatural symbols into your flesh!</span>") to_chat(owner,"<span class='warning'>You begin to carve unnatural symbols into your flesh!</span>")
SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10)) SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10))
@@ -73,7 +77,7 @@
else else
to_chat(owner, "<span class='cultitalic'>You are already invoking blood magic!") to_chat(owner, "<span class='cultitalic'>You are already invoking blood magic!")
return return
if(do_after(owner, 100 - rune*60, target = owner)) if(do_after(owner, 100 - rune*60, target = owner) && !holy_dispel)
if(ishuman(owner)) if(ishuman(owner))
var/mob/living/carbon/human/H = owner var/mob/living/carbon/human/H = owner
H.bleed(40 - rune*32) H.bleed(40 - rune*32)

30
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -200,22 +200,20 @@
pH = 7.5 //God is alkaline pH = 7.5 //God is alkaline
/datum/reagent/water/holywater/on_mob_metabolize(mob/living/L) /datum/reagent/water/holywater/on_mob_metabolize(mob/living/L)
..() . = ..()
ADD_TRAIT(L, TRAIT_HOLY, id) ADD_TRAIT(L, TRAIT_HOLY, id)
if(is_servant_of_ratvar(L))
to_chat(L, "<span class='userdanger'>A fog spreads through your mind, purging the Justiciar's influence!</span>")
else if(iscultist(L))
to_chat(L, "<span class='userdanger'>A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence</span>")
/datum/reagent/water/holywater/on_mob_end_metabolize(mob/living/L) /datum/reagent/water/holywater/on_mob_end_metabolize(mob/living/L)
REMOVE_TRAIT(L, TRAIT_HOLY, id) REMOVE_TRAIT(L, TRAIT_HOLY, id)
..() if(iscultist(L))
for(var/datum/action/innate/cult/blood_magic/BM in L.actions)
/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) BM.holy_dispel = FALSE
if(is_servant_of_ratvar(M)) return ..()
to_chat(M, "<span class='userdanger'>A fog spreads through your mind, purging the Justiciar's influence!</span>")
..()
/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(iscultist(M))
to_chat(M, "<span class='userdanger'>A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence</span>")
..()
/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M) /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
if(!data) if(!data)
@@ -224,9 +222,11 @@
M.jitteriness = min(M.jitteriness+4,10) M.jitteriness = min(M.jitteriness+4,10)
if(iscultist(M)) if(iscultist(M))
for(var/datum/action/innate/cult/blood_magic/BM in M.actions) 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>") if(!BM.holy_dispel)
for(var/datum/action/innate/cult/blood_spell/BS in BM.spells) BM.holy_dispel = TRUE
qdel(BS) 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(data >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec
if(!M.stuttering) if(!M.stuttering)
M.stuttering = 1 M.stuttering = 1