cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-10 17:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports #6039 with Virgo Fixes

Browse Source
This commit is contained in:
Atermonera
2019-05-05 10:14:25 -08:00
committed by VirgoBot
parent 45e8f5e5b8
commit 1757c30075
3 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/reagents/Chemistry-Holder.dm
View File

@@ -88,8 +88,13 @@
reaction_occurred = FALSE
for(var/i in reagent_list)
var/datum/reagent/R = i
<<<<<<< HEAD
if(SSchemistry.chemical_reactions_by_reagent[R.id]) //VOREStation Edit: unruntiming chems
eligible_reactions |= SSchemistry.chemical_reactions_by_reagent[R.id] //VOREStation Edit: unruntiming chems
=======
if(SSchemistry.chemical_reactions_by_reagent[R.id])
eligible_reactions |= SSchemistry.chemical_reactions_by_reagent[R.id]
>>>>>>> 2358af9... Merge pull request #6151 from Novacat/nova-runtimes
for(var/i in eligible_reactions)
var/datum/chemical_reaction/C = i