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

Revert "[MIRROR] Fixes chem heater trying to heat up empty beakers."

Browse Source
This commit is contained in:
LetterJay
2018-06-16 16:18:50 -05:00
committed by GitHub
parent cc54931a66
commit 5ee2ee38b3
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/reagents/chemistry/machinery/chem_heater.dm
View File

@@ -46,7 +46,6 @@
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)
@@ -54,10 +53,6 @@
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)