shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverts the bleed changes till they can be better tuned

Browse Source
This commit is contained in:
Poojawa
2019-09-12 00:14:26 -05:00
parent 4408d1b684
commit 65a89030eb
13 changed files with 28 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
-8
View File
@@ -334,10 +334,6 @@
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)
@@ -365,10 +361,6 @@
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
code/modules/antagonists/cult/blood_magic.dm
-2
View File
@@ -687,8 +687,6 @@
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))