From fcf3405c6beb1124261e7fe22f798a5516491e80 Mon Sep 17 00:00:00 2001 From: SconesC Date: Mon, 10 Aug 2015 17:09:34 -0700 Subject: [PATCH 1/2] Phlog nerf + negative firestack bug fix --- .../Chemistry-Reagents/Pyrotechnic-Reagents.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm index 56300fffd97..01a72726dff 100644 --- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm @@ -128,13 +128,16 @@ description = "Catches you on fire and makes you ignite." reagent_state = LIQUID color = "#FF9999" + +/datum/reagent/phlogiston/reaction_mob(mob/living/M, method=TOUCH, volume) + M.IgniteMob() + ..() /datum/reagent/phlogiston/on_mob_life(mob/living/M) - M.adjust_fire_stacks(1) - M.IgniteMob() - M.adjustFireLoss(0.2*M.fire_stacks) + M.adjust_fire_stacks(2) + var/burndmg = max(0.3*M.fire_stacks, 0.3) + M.adjustFireLoss(burndmg) ..() - return /datum/reagent/napalm name = "Napalm" From f80c92c5aa7bd133fb0fb88a1b44a396114916e0 Mon Sep 17 00:00:00 2001 From: SconesC Date: Mon, 10 Aug 2015 17:13:05 -0700 Subject: [PATCH 2/2] Corrects number mistake --- .../modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm index 01a72726dff..51b06d2774e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm @@ -134,7 +134,7 @@ ..() /datum/reagent/phlogiston/on_mob_life(mob/living/M) - M.adjust_fire_stacks(2) + M.adjust_fire_stacks(1) var/burndmg = max(0.3*M.fire_stacks, 0.3) M.adjustFireLoss(burndmg) ..()