From 811a7be362ab6dd6496e35d2f1d70130f00e25eb Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 12 Jul 2016 21:27:04 -0500 Subject: [PATCH 1/2] fire_stacks decrease over time --- code/modules/mob/living/living_defense.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 9c37468554..76be73da6d 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -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) From b08ddfefffcfbf76b616f9e8698b1eabb8920501 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 12 Jul 2016 22:13:04 -0500 Subject: [PATCH 2/2] Fixes lighters being able to ignite people while off. --- code/game/objects/items/weapons/cigs_lighters.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 4772063b4c..b2c9e82e27 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -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) if(!istype(M, /mob)) 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) var/obj/item/clothing/mask/smokable/cigarette/cig = M.wear_mask