From c03e10a3bd6e258df34321edcbc19b567f656ecd Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 24 Sep 2017 01:25:59 -0500 Subject: [PATCH] Adds adjust_fire_stack to a few places --- code/modules/mob/living/carbon/carbon.dm | 10 +++++----- code/modules/mob/living/carbon/resist.dm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index fb4c3f50f9..3fb8fe8ac9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -220,15 +220,15 @@ M.visible_message("[M] tries to pat out [src]'s flames!", "You try to pat out [src]'s flames! Hot!") if(do_mob(M, src, 15)) - src.fire_stacks -= 0.5 + src.adjust_fire_stacks(-0.5) if (prob(10) && (M.fire_stacks <= 0)) - M.fire_stacks += 1 + M.adjust_fire_stacks(1) M.IgniteMob() if (M.on_fire) M.visible_message("The fire spreads from [src] to [M]!", "The fire spreads to you as well!") else - src.fire_stacks -= 0.5 //Less effective than stop, drop, and roll - also accounting for the fact that it takes half as long. + src.adjust_fire_stacks(-0.5) //Less effective than stop, drop, and roll - also accounting for the fact that it takes half as long. if (src.fire_stacks <= 0) M.visible_message("[M] successfully pats out [src]'s flames.", "You successfully pat out [src]'s flames.") @@ -264,8 +264,8 @@ M.visible_message("[M] hugs [src] to make [t_him] feel better!", \ "You hug [src] to make [t_him] feel better!") if(M.fire_stacks >= (src.fire_stacks + 3)) - src.fire_stacks += 1 - M.fire_stacks -= 1 + src.adjust_fire_stacks(1) + M.adjust_fire_stacks(-1) if(M.on_fire) src.IgniteMob() AdjustParalysis(-3) diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index 1b00bb2a8e..86597afba6 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -2,7 +2,7 @@ //drop && roll if(on_fire && !buckled) - fire_stacks -= 1.2 + adjust_fire_stacks(-1.2) Weaken(3) spin(32,2) visible_message(