cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patting out flames is no longer extremely effective

Browse Source
This commit is contained in:
mwerezak
2015-06-20 20:03:30 -04:00
parent 6a8aeb0153
commit a4fb9fbb51
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/carbon/carbon.dm
View File

@@ -218,23 +218,23 @@
else if (on_fire) else if (on_fire)
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if (M.on_fire) if (M.on_fire)
M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames, but to no avail!</span>", \ M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames, but to no avail!</span>",
"<span class='warning'>You try to pat out [src]'s flames, but to no avail! Put yourself out first!</span>") "<span class='warning'>You try to pat out [src]'s flames, but to no avail! Put yourself out first!</span>")
else else
M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames!</span>", \ M.visible_message("<span class='warning'>[M] tries to pat out [src]'s flames!</span>",
"<span class='warning'>You try to pat out [src]'s flames! Hot!</span>") "<span class='warning'>You try to pat out [src]'s flames! Hot!</span>")
if(do_mob(M, src, 15)) if(do_mob(M, src, 15))
if (prob(10) && (M.fire_stacks <= 0)) if (prob(10) && (M.fire_stacks <= 0))
src.fire_stacks -= 2 M.fire_stacks -= 0.5
M.fire_stacks += 1 M.fire_stacks += 1
M.IgniteMob() M.IgniteMob()
if (M.on_fire) if (M.on_fire)
M.visible_message("<span class='danger'>The fire spreads from [src] to [M]!</span>", \ M.visible_message("<span class='danger'>The fire spreads from [src] to [M]!</span>",
"<span class='danger'>The fire spreads to you as well!</span>") "<span class='danger'>The fire spreads to you as well!</span>")
else else
src.fire_stacks -= 3 //Less effective than stop, drop, and roll src.fire_stacks -= 1 //Less effective than stop, drop, and roll
if (src.fire_stacks <= 0) if (src.fire_stacks <= 0)
M.visible_message("<span class='warning'>[M] successfully pats out [src]'s flames.</span>", \ M.visible_message("<span class='warning'>[M] successfully pats out [src]'s flames.</span>",
"<span class='warning'>You successfully pat out [src]'s flames.</span>") "<span class='warning'>You successfully pat out [src]'s flames.</span>")
src.ExtinguishMob() src.ExtinguishMob()
src.fire_stacks = 0 src.fire_stacks = 0