cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Temperature Reagent Fix #2 (#5695)

Browse Source 
Fixes an issue caused by temperature reagents,
This commit is contained in:
BurgerLUA
2018-12-06 15:00:44 +01:00
committed by Werner
parent dd950c8659
commit a011ee90c5
2 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Holder.dm
+3 -3
View File
@@ -144,13 +144,13 @@
else
if(temperature <= 0)
temperature = R.default_temperature
R.set_temperature(temperature)
R.add_thermal_energy(temperature * R.specific_heat * amount)
if(!isnull(data)) // For all we know, it could be zero or empty string and meaningful
R.mix_data(data, amount)
update_holder(!safety)
return 1
var/datum/reagent/D = SSchemistry.chemical_reagents[id]
var/datum/reagent/D = SSchemistry.chemical_reagents[id] //New reagent
if(D)
var/datum/reagent/R = new D.type()
reagent_list += R
@@ -159,7 +159,7 @@
R.specific_heat = SSchemistry.check_specific_heat(R)
R.thermal_energy = 0
if(thermal_energy > 0 && old_amount > 0)
R.add_thermal_energy(thermal_energy * (amount/old_amount) )
R.set_thermal_energy(thermal_energy * (amount/old_amount) )
else
if(temperature <= 0)
temperature = R.default_temperature