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

More fixes.

Browse Source
This commit is contained in:
Fermi
2019-06-14 15:43:48 +01:00
parent d7cffadc13
commit b4beb006f9
10 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/holder.dm
+15 -5
View File
@@ -524,7 +524,10 @@
fermiIsReacting = FALSE
reactedVol = 0
targetVol = 0
holder.pH_check()
//pH check, handled at the end to reduce calls.
if(istype(my_atom, /obj/item/reagent_containers))
var/obj/item/reagent_containers/RC = my_atom
RC.pH_check()
C.FermiFinish(src, my_atom, multiplier)
handle_reactions()
update_total()
@@ -550,7 +553,10 @@
fermiIsReacting = FALSE
reactedVol = 0
targetVol = 0
holder.pH_check()
//pH check, handled at the end to reduce calls.
if(istype(my_atom, /obj/item/reagent_containers))
var/obj/item/reagent_containers/RC = my_atom
RC.pH_check()
C.FermiFinish(src, my_atom, multiplier)
handle_reactions()
update_total()
@@ -566,7 +572,10 @@
fermiIsReacting = FALSE
reactedVol = 0
targetVol = 0
holder.pH_check()
//pH check, handled at the end to reduce calls.
if(istype(my_atom, /obj/item/reagent_containers))
var/obj/item/reagent_containers/RC = my_atom
RC.pH_check()
C.FermiFinish(src, my_atom, multiplier)
handle_reactions()
update_total()
@@ -860,8 +869,9 @@
if(my_atom)
my_atom.on_reagent_change(ADD_REAGENT)
R.on_merge(data, amount, my_atom, other_purity)
if(R.OnMobMergeCheck == TRUE)//Forces on_mob_add proc when a chem is merged
R.on_mob_add(my_atom, amount)
if(isliving(my_atom))
if(R.OnMobMergeCheck == TRUE)//Forces on_mob_add proc when a chem is merged
R.on_mob_add(my_atom, amount)
if(!no_react)
handle_reactions()