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

Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE

Browse Source 
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
This commit is contained in:
kevinz000
2019-10-05 08:26:40 -07:00
committed by GitHub
parent 6465c3e019 7f74a98372
commit 356755d710
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+2 -2
View File
@@ -335,7 +335,7 @@
return ..()
data = datapH
if(LAZYLEN(holder.reagent_list) == 1)
return
return ..()
holder.pH = ((holder.pH * holder.total_volume)+(pH * (volume)))/(holder.total_volume + (volume))
var/list/seen = viewers(5, get_turf(holder))
for(var/mob/M in seen)
@@ -357,7 +357,7 @@
return ..()
data = datapH
if(LAZYLEN(holder.reagent_list) == 1)
return
return ..()
holder.pH = ((holder.pH * holder.total_volume)+(pH * (volume)))/(holder.total_volume + (volume))
var/list/seen = viewers(5, get_turf(holder))
for(var/mob/M in seen)
modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+5 -5
View File
@@ -434,8 +434,8 @@
OptimalTempMin = 250
OptimalTempMax = 500
ExplodeTemp = 9999 //check to see overflow doesn't happen!
OptimalpHMin = 2
OptimalpHMax = 6
OptimalpHMin = 0
OptimalpHMax = 14
ReactpHLim = 0
//CatalystFact = 0 //To do 1
CurveSharpT = 4
@@ -456,14 +456,14 @@
name = "Ethyl Ethanoate buffer"
id = "basic_buffer"
results = list("basic_buffer" = 1.5)
required_reagents = list("acidic_buffer" = 0.5, "ethanol" = 0.5, "water" = 0.5)
required_reagents = list("lye" = 0.3, "ethanol" = 0.6, "water" = 0.6)
required_catalysts = list("sacid" = 1) //vagely acetic
//FermiChem vars:x
OptimalTempMin = 250
OptimalTempMax = 500
ExplodeTemp = 9999 //check to see overflow doesn't happen!
OptimalpHMin = 5
OptimalpHMax = 12
OptimalpHMin = 0
OptimalpHMax = 14
ReactpHLim = 0
//CatalystFact = 0 //To do 1
CurveSharpT = 4