From d876b20a0bf44e430ce34de729e4e95b37f99753 Mon Sep 17 00:00:00 2001 From: Fermi Date: Mon, 1 Jul 2019 22:32:42 +0100 Subject: [PATCH] Quickfix for botany and removed message_admins that I thought I pushed. --- code/modules/reagents/chemistry/holder.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index be2b4ccb57..809d0cee65 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -191,7 +191,6 @@ amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume) var/part = amount / src.total_volume var/trans_data = null - message_admins("transferring pH: [pH]") for(var/reagent in cached_reagents) var/datum/reagent/T = reagent var/transfer_amount = T.volume * part @@ -819,7 +818,7 @@ WARNING("[my_atom] attempted to add a reagent called '[reagent]' which doesn't exist. ([usr])") return FALSE - if (D.id == "water" && no_react == FALSE) //Do like an otter, add acid to water. + if (D.id == "water" && no_react == FALSE && !istype(my_atom, /obj/item/reagent_containers/food)) //Do like an otter, add acid to water, but also don't blow up botany. if (pH <= 2) SSblackbox.record_feedback("tally", "fermi_chem", 1, "water-acid explosions") var/datum/effect_system/smoke_spread/chem/s = new @@ -863,7 +862,6 @@ //cacluate reagent based pH shift. if(ignore_pH == TRUE) - message_admins("ignoring pH old pH: [pH], added pH [D.pH]") pH = ((cached_pH * cached_total)+(other_pH * amount))/(cached_total + amount)//should be right else pH = ((cached_pH * cached_total)+(D.pH * amount))/(cached_total + amount)//should be right