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

Merge pull request #7112 from Citadel-Station-13/upstream-merge-38511

Browse Source 
[MIRROR] Heating chems now mix at the right temps
This commit is contained in:
LetterJay
2018-06-16 16:17:11 -05:00
committed by GitHub
parent 6061358f0e a8b6e4fa5a
commit 1a5021b9c5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/holder.dm
+2 -2
View File
@@ -406,10 +406,10 @@
for(var/V in possible_reactions)
var/datum/chemical_reaction/competitor = V
if(selected_reaction.is_cold_recipe) //if there are no recipe conflicts, everything in possible_reactions will have this same value for is_cold_reaction. warranty void if assumption not met.
if(competitor.required_temp < selected_reaction.required_temp)
if(competitor.required_temp <= selected_reaction.required_temp)
selected_reaction = competitor
else
if(competitor.required_temp > selected_reaction.required_temp)
if(competitor.required_temp >= selected_reaction.required_temp)
selected_reaction = competitor
var/list/cached_required_reagents = selected_reaction.required_reagents
var/list/cached_results = selected_reaction.results