shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes chem heater trying to heat up empty beakers.

Browse Source
This commit is contained in:
AnturK
2018-06-13 04:25:28 -05:00
committed by letterjay
parent 496a1d1165
commit 549d6f0ab8
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_heater.dm
+5
View File
@@ -46,6 +46,7 @@
if(stat & NOPOWER) if(stat & NOPOWER)
return return
if(on) if(on)
<<<<<<< HEAD
if(beaker) if(beaker)
if(beaker.reagents.chem_temp > target_temperature) if(beaker.reagents.chem_temp > target_temperature)
beaker.reagents.chem_temp += min(-1, (target_temperature - beaker.reagents.chem_temp) * heater_coefficient) 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 += max(1, (target_temperature - beaker.reagents.chem_temp) * heater_coefficient)
beaker.reagents.chem_temp = round(beaker.reagents.chem_temp) 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() beaker.reagents.handle_reactions()
/obj/machinery/chem_heater/attackby(obj/item/I, mob/user, params) /obj/machinery/chem_heater/attackby(obj/item/I, mob/user, params)