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

Merge pull request #7096 from Citadel-Station-13/upstream-merge-38434

Browse Source 
[MIRROR] Fixes chem heater trying to heat up empty beakers.
This commit is contained in:
LetterJay
2018-06-16 16:18:42 -05:00
committed by GitHub
parent 4373f68e8d 549d6f0ab8
commit cc54931a66
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)
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)