From 549d6f0ab8e84df745b2aacebeb6057d627af191 Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 13 Jun 2018 11:24:57 +0200 Subject: [PATCH] Fixes chem heater trying to heat up empty beakers. --- code/modules/reagents/chemistry/machinery/chem_heater.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 465f9a165b..4a28b61eac 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -46,6 +46,7 @@ if(stat & NOPOWER) return if(on) +<<<<<<< HEAD if(beaker) if(beaker.reagents.chem_temp > target_temperature) beaker.reagents.chem_temp += min(-1, (target_temperature - beaker.reagents.chem_temp) * heater_coefficient) @@ -53,6 +54,10 @@ beaker.reagents.chem_temp += max(1, (target_temperature - beaker.reagents.chem_temp) * heater_coefficient) beaker.reagents.chem_temp = round(beaker.reagents.chem_temp) +======= + if(beaker && beaker.reagents.total_volume) + beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * heater_coefficient * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume) +>>>>>>> 80d8289... Fixes chem heater trying to heat up empty beakers. (#38434) beaker.reagents.handle_reactions() /obj/machinery/chem_heater/attackby(obj/item/I, mob/user, params)