From 6240222ed7b6b23e54fb7a5e3e977e5e72e73963 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 9 Jul 2019 21:58:22 -0400 Subject: [PATCH 1/4] Update other_reagents.dm --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 890403691e..92a91a89ce 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -280,7 +280,7 @@ M.AdjustStun(-40, 0) M.AdjustKnockdown(-40, 0) M.adjustStaminaLoss(-10, 0) - M.adjustToxLoss(-2, 0) + M.adjustToxLoss(-2, 0, healtoxinlover) M.adjustOxyLoss(-2, 0) M.adjustBruteLoss(-2, 0) M.adjustFireLoss(-2, 0) @@ -1879,4 +1879,4 @@ if(added_length >= 0.20) //Only add the length if it's greater than or equal to 0.2. This is to prevent people from smoking the reagents and causing the penis to update constantly. P.length += added_length P.update() - ..() \ No newline at end of file + ..() From b03c197d0ead98d533ac6542d15724f51bcb31f5 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 9 Jul 2019 22:58:13 -0400 Subject: [PATCH 2/4] forgot the var --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 92a91a89ce..a49bc6f041 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -195,6 +195,7 @@ glass_icon_state = "glass_clear" glass_name = "glass of holy water" glass_desc = "A glass of holy water." + healtoxinlover = TRUE /datum/reagent/water/holywater/on_mob_metabolize(mob/living/L) ..() From e1ed96f4194441ecc028524a805d0fa32b9b412a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 9 Jul 2019 23:08:11 -0400 Subject: [PATCH 3/4] Update other_reagents.dm --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index a49bc6f041..a1a43185e0 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -195,7 +195,6 @@ glass_icon_state = "glass_clear" glass_name = "glass of holy water" glass_desc = "A glass of holy water." - healtoxinlover = TRUE /datum/reagent/water/holywater/on_mob_metabolize(mob/living/L) ..() @@ -262,11 +261,12 @@ qdel(R) T.Bless() -/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke +/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke name = "Unholy Water" id = "unholywater" description = "Something that shouldn't exist on this plane of existence." taste_description = "suffering" + var/healtoxinlover = TRUE /datum/reagent/fuel/unholywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(method == TOUCH || method == VAPOR) From 48e15307c5577748ff089083d86afcdbb6363502 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 10 Jul 2019 19:14:57 -0400 Subject: [PATCH 4/4] Update other_reagents.dm --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index a1a43185e0..4ccd2e6b9f 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -266,7 +266,6 @@ id = "unholywater" description = "Something that shouldn't exist on this plane of existence." taste_description = "suffering" - var/healtoxinlover = TRUE /datum/reagent/fuel/unholywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(method == TOUCH || method == VAPOR) @@ -281,7 +280,7 @@ M.AdjustStun(-40, 0) M.AdjustKnockdown(-40, 0) M.adjustStaminaLoss(-10, 0) - M.adjustToxLoss(-2, 0, healtoxinlover) + M.adjustToxLoss(-2, 0, TRUE) M.adjustOxyLoss(-2, 0) M.adjustBruteLoss(-2, 0) M.adjustFireLoss(-2, 0)