diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 4b4a4830a18..1ac67c363c9 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -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 diff --git a/html/changelogs/burgerbb-changelog.yml b/html/changelogs/burgerbb-changelog.yml new file mode 100644 index 00000000000..ebadda197d9 --- /dev/null +++ b/html/changelogs/burgerbb-changelog.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: BurgerBB + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes tempreature reagent issues caused by a previous fix."