From ff4baf138aad48b047b75682a6096d18886ce8a0 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Wed, 8 Apr 2015 17:41:16 -0400 Subject: [PATCH] Goon temps --- code/modules/reagents/Chemistry-Holder.dm | 2 +- code/modules/reagents/newchem/chem_heater.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 9bf48dc9aaa..26c1a7b81ba 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -325,7 +325,7 @@ datum if(C.result) feedback_add_details("chemical_reaction","[C.result]|[C.result_amount*multiplier]") multiplier = max(multiplier, 1) //this shouldnt happen ... - add_reagent(C.result, C.result_amount*multiplier, null, chem_temp) + add_reagent(C.result, C.result_amount*multiplier) set_data(C.result, preserved_data) //add secondary products diff --git a/code/modules/reagents/newchem/chem_heater.dm b/code/modules/reagents/newchem/chem_heater.dm index 98257d5ec96..78c5de3cc4d 100644 --- a/code/modules/reagents/newchem/chem_heater.dm +++ b/code/modules/reagents/newchem/chem_heater.dm @@ -32,9 +32,9 @@ if(on) if(beaker) if(beaker.reagents.chem_temp > desired_temp) - beaker.reagents.chem_temp += min(-1, (desired_temp - beaker.reagents.chem_temp) * heater_coefficient) + beaker.reagents.chem_temp += min(-1, max((desired_temp - beaker.reagents.chem_temp) * heater_coefficient, -15)) if(beaker.reagents.chem_temp < desired_temp) - beaker.reagents.chem_temp += max(1, (desired_temp - beaker.reagents.chem_temp) * heater_coefficient) + beaker.reagents.chem_temp += max(1, min((desired_temp - beaker.reagents.chem_temp) * heater_coefficient, 15)) beaker.reagents.chem_temp = round(beaker.reagents.chem_temp) //stops stuff like 456.12312312302 beaker.reagents.handle_reactions()