From 37573a4339629d4c7a2d52da45319fa382036cd4 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 3 Feb 2017 17:05:37 -0500 Subject: [PATCH 1/3] Bugfix --- code/modules/reagents/chemistry/reagents/water.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index f5e409a1cb4..938ec634153 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -355,7 +355,12 @@ M.AdjustParalysis(-2) M.AdjustStunned(-2) M.AdjustWeakened(-2) + M.adjustToxLoss(-2) + M.adjustFireLoss(-2) + M.adjustOxyLoss(-2) + M.adjustBruteLoss(-2) else + M.adjustBrainLoss(3) M.adjustToxLoss(2) M.adjustFireLoss(2) M.adjustOxyLoss(2) From 391976f7ed9d7135d53dcaf694a0e8aeed462a6f Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 3 Feb 2017 17:14:44 -0500 Subject: [PATCH 2/3] I thought i deleted you.... --- code/modules/reagents/chemistry/reagents/water.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index 938ec634153..9d4cca4f365 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -348,7 +348,6 @@ metabolization_rate = 1 /datum/reagent/fuel/unholywater/on_mob_life(mob/living/M) - M.adjustBrainLoss(3) if(iscultist(M)) M.status_flags |= GOTTAGOFAST M.AdjustDrowsy(-5) From 1943f059c52da2e3fbd8035166a54c9623dd2fc1 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 3 Feb 2017 23:41:04 -0500 Subject: [PATCH 3/3] Requested changes --- code/modules/reagents/chemistry/reagents/water.dm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index 9d4cca4f365..3e5ea81ddf9 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -349,9 +349,8 @@ /datum/reagent/fuel/unholywater/on_mob_life(mob/living/M) if(iscultist(M)) - M.status_flags |= GOTTAGOFAST M.AdjustDrowsy(-5) - M.AdjustParalysis(-2) + M.AdjustParalysis(-1) M.AdjustStunned(-2) M.AdjustWeakened(-2) M.adjustToxLoss(-2) @@ -360,17 +359,13 @@ M.adjustBruteLoss(-2) else M.adjustBrainLoss(3) - M.adjustToxLoss(2) + M.adjustToxLoss(1) M.adjustFireLoss(2) M.adjustOxyLoss(2) M.adjustBruteLoss(2) M.AdjustCultSlur(10)//CUASE WHY THE HELL NOT ..() -/datum/reagent/fuel/unholywater/on_mob_delete(mob/living/M) - M.status_flags &= ~GOTTAGOFAST - ..() - /datum/reagent/hellwater name = "Hell Water" id = "hell_water"