diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index 97d7f0c128..a24edc8f1f 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -334,6 +334,10 @@ if(ghost) ghost.reenter_corpse() L.revive(1, 1) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + if(H.bleed_rate) + H.bleed_rate = 0 // just a double check, since it's a full heal. var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src)) animate(V, alpha = 0, transform = matrix()*2, time = 8) playsound(L, 'sound/magic/staff_healing.ogg', 50, 1) @@ -361,11 +365,17 @@ vitality_for_cycle = 2 vitality_for_cycle = min(GLOB.clockwork_vitality, vitality_for_cycle) var/vitality_used = L.heal_ordered_damage(vitality_for_cycle, damage_heal_order) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + if(H.bleed_rate) + H.bleed_rate -= vitality_for_cycle //might as well make this reduce bleeding as per the healing too. if(!vitality_used) break if(!GLOB.ratvar_awakens) + if(GLOB.clockwork_vitality <= 0) + break GLOB.clockwork_vitality -= vitality_used sleep(2) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 1dbae4ca98..6fa974a7af 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -687,6 +687,8 @@ H.adjustToxLoss((overall_damage*ratio) * (H.getToxLoss() / overall_damage), 0) H.adjustFireLoss((overall_damage*ratio) * (H.getFireLoss() / overall_damage), 0) H.adjustBruteLoss((overall_damage*ratio) * (H.getBruteLoss() / overall_damage), 0) + if(H.bleed_rate) + H.bleed_rate -= 20 H.updatehealth() playsound(get_turf(H), 'sound/magic/staff_healing.ogg', 25) new /obj/effect/temp_visual/cult/sparks(get_turf(H)) diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index ab4ac32106..33eafb067c 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -96,11 +96,11 @@ if(brutedamage >= 20) temp_bleed += (brutedamage * 0.013) - bleed_rate = max(bleed_rate - 0.5, temp_bleed)//if no wounds, other bleed effects (heparin) naturally decreases + bleed_rate = max(bleed_rate - 0.25, temp_bleed)//if no wounds, other bleed effects (heparin) naturally decreases //since blood loss is capped, reduced the heal rate if(bleed_rate && !bleedsuppress && !(HAS_TRAIT(src, TRAIT_FAKEDEATH))) - if(bleed_rate >= 20) //let's cap blood loss. - bleed_rate = 20 + if(bleed_rate >= 30) //let's cap blood loss. + bleed_rate = 30 bleed(bleed_rate) //Makes a blood drop, leaking amt units of blood from the mob diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index ada22ef816..90d374d98b 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -297,9 +297,7 @@ /datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(is_servant_of_ratvar(M)) to_chat(M, "A fog spreads through your mind, purging the Justiciar's influence!") - ..() -/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(iscultist(M)) to_chat(M, "A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence") ..() @@ -423,6 +421,10 @@ M.adjustOxyLoss(-3, 0) M.adjustBruteLoss(-3, 0) M.adjustFireLoss(-5, 0) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.bleed_rate) + H.bleed_rate = 0 if(iscultist(M)) M.AdjustUnconscious(1, 0) M.AdjustStun(10, 0)