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

Merge pull request #2119 from Anewbe/burning_bodies

Browse Source 
Burning bodies no longer burn forever
This commit is contained in:
Yoshax
2016-07-13 17:13:16 +01:00
committed by GitHub
parent 3df18c2870 b08ddfefff
commit cda6508001
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -481,7 +481,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/weapon/flame/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) /obj/item/weapon/flame/lighter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M, /mob)) if(!istype(M, /mob))
return return
M.IgniteMob()
if(lit == 1)
M.IgniteMob()
if(istype(M.wear_mask, /obj/item/clothing/mask/smokable/cigarette) && user.zone_sel.selecting == O_MOUTH && lit) if(istype(M.wear_mask, /obj/item/clothing/mask/smokable/cigarette) && user.zone_sel.selecting == O_MOUTH && lit)
var/obj/item/clothing/mask/smokable/cigarette/cig = M.wear_mask var/obj/item/clothing/mask/smokable/cigarette/cig = M.wear_mask

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. //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) /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 return 0
//Hulk modifier //Hulk modifier
@@ -300,6 +300,9 @@
if(fire_stacks < 0) if(fire_stacks < 0)
fire_stacks = min(0, ++fire_stacks) //If we've doused ourselves in water to avoid fire, dry off slowly 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) if(!on_fire)
return 1 return 1
else if(fire_stacks <= 0) else if(fire_stacks <= 0)