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

fire_stacks decrease over time

Browse Source
This commit is contained in:
Anewbe
2016-07-12 21:27:04 -05:00
parent f7d8f2cb58
commit 811a7be362
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/living_defense.dm
View File

@@ -162,7 +162,7 @@
//returns 0 if the effects failed to apply for some reason, 1 otherwise.
/mob/living/proc/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/hit_zone)
if(!effective_force || blocked >= 100)
if(!effective_force || blocked >= 100)
return 0
//Hulk modifier
@@ -300,6 +300,9 @@
if(fire_stacks < 0)
fire_stacks = min(0, ++fire_stacks) //If we've doused ourselves in water to avoid fire, dry off slowly
if(fire_stacks > 0)
fire_stacks = max(0, (fire_stacks-0.1)) //Should slowly burn out
if(!on_fire)
return 1
else if(fire_stacks <= 0)