From 233cc473fef49595fc377a96537590773449b5b6 Mon Sep 17 00:00:00 2001 From: JimKil3 <47290811+JimKil3@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:37:43 -0400 Subject: [PATCH] Toilet water changes (#23080) * hgcvhgfcjtfckhc * Update code/modules/reagents/chemistry/reagents/water.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * never make me balance team please --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --- code/modules/reagents/chemistry/reagents/water.dm | 5 ++++- code/modules/reagents/chemistry/recipes/pyrotechnics.dm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index 1298eafddad..4c894c64f67 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -215,18 +215,21 @@ reagent_state = LIQUID color = "#757547" taste_description = "puke" + harmless = FALSE /datum/reagent/fishwater/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) if(method == REAGENT_INGEST) to_chat(M, "Oh god, why did you drink that?") /datum/reagent/fishwater/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE if(prob(30)) // Nasty, you drank this stuff? 30% chance of the fakevomit (non-stunning version) if(prob(50)) // 50/50 chance of green vomit vs normal vomit M.fakevomit(1) else M.fakevomit(0) - return ..() + update_flags |= M.adjustToxLoss(1 * REAGENTS_EFFECT_MULTIPLIER, FALSE) + return ..() | update_flags /datum/reagent/fishwater/toiletwater name = "Toilet Water" diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index da5947ebb19..088904034d0 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -259,7 +259,7 @@ required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1) result_amount = 1 mix_message = "The mixture quickly turns into a pall of smoke!" - var/forbidden_reagents = list("sugar", "phosphorus", "potassium", "stimulants", "smoke_powder") //Do not transfer this stuff through smoke. + var/forbidden_reagents = list("sugar", "phosphorus", "potassium", "stimulants", "smoke_powder", "fishwater", "toiletwater") //Do not transfer this stuff through smoke. /datum/chemical_reaction/smoke/on_reaction(datum/reagents/holder, created_volume) for(var/f_reagent in forbidden_reagents)