From 10f5fc3b47a3a704accfc503aed7c9de9d63bc78 Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 4 Oct 2019 03:22:53 +0100 Subject: [PATCH 1/5] Buffer fix --- code/modules/reagents/chemistry/holder.dm | 4 ++++ .../reagents/chemistry/reagents/fermi_reagents.dm | 6 ++++-- .../code/modules/reagents/chemistry/recipes/fermi.dm | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index ce7819ed7a..56cb02293e 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -746,10 +746,14 @@ total_volume = 0 for(var/reagent in cached_reagents) var/datum/reagent/R = reagent + if(R.volume == 0) + del_reagent(R.id) if((R.volume < 0.01) && !fermiIsReacting) del_reagent(R.id) else total_volume += R.volume + if(!reagent_list) + pH = 7 return 0 /datum/reagents/proc/clear_reagents() diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index 031b105468..b127c42233 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -328,6 +328,7 @@ color = "#fbc314" pH = 0 can_synth = TRUE + addProc = TRUE //Consumes self on addition and shifts pH /datum/reagent/fermi/acidic_buffer/on_new(datapH) @@ -335,7 +336,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) @@ -351,13 +352,14 @@ color = "#3853a4" pH = 14 can_synth = TRUE + addProc = TRUE /datum/reagent/fermi/basic_buffer/on_new(datapH) if(holder.has_reagent("stabilizing_agent")) 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) diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 367093ea6f..cdac155499 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -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.2, "ethanol" = 0.5, "water" = 0.5, "lithium" = 0.5) 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 From d1c381cad327aaf27acba90f0abbe9fd0ec37360 Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 4 Oct 2019 03:27:30 +0100 Subject: [PATCH 2/5] lye down --- .../code/modules/reagents/chemistry/recipes/fermi.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index cdac155499..43fda5e948 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -456,7 +456,7 @@ name = "Ethyl Ethanoate buffer" id = "basic_buffer" results = list("basic_buffer" = 1.5) - required_reagents = list("lye" = 0.2, "ethanol" = 0.5, "water" = 0.5, "lithium" = 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 From 2abd15c7e7d6eb1417d1a28035b6dbc1c970c233 Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 4 Oct 2019 04:48:34 +0100 Subject: [PATCH 3/5] Incase someone speedmerges --- .../code/modules/reagents/chemistry/reagents/fermi_reagents.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index b127c42233..722c1e786d 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -328,7 +328,6 @@ color = "#fbc314" pH = 0 can_synth = TRUE - addProc = TRUE //Consumes self on addition and shifts pH /datum/reagent/fermi/acidic_buffer/on_new(datapH) @@ -352,7 +351,6 @@ color = "#3853a4" pH = 14 can_synth = TRUE - addProc = TRUE /datum/reagent/fermi/basic_buffer/on_new(datapH) if(holder.has_reagent("stabilizing_agent")) From 62737884f0fbf57b7959d682858672da83eb36bc Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 4 Oct 2019 04:55:16 +0100 Subject: [PATCH 4/5] lye was 13 oops --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 2f7a8652ba..057e46fb6b 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1665,7 +1665,7 @@ reagent_state = LIQUID color = "#FFFFD6" // very very light yellow taste_description = "alkali" //who put ACID for NaOH ???? - pH = 13 + pH = 11 /datum/reagent/drying_agent name = "Drying agent" From 7f74a98372aa6c674a4f60659e1a934fbb472896 Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 4 Oct 2019 04:55:36 +0100 Subject: [PATCH 5/5] .9 --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 057e46fb6b..a6bec66cfc 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1665,7 +1665,7 @@ reagent_state = LIQUID color = "#FFFFD6" // very very light yellow taste_description = "alkali" //who put ACID for NaOH ???? - pH = 11 + pH = 11.9 /datum/reagent/drying_agent name = "Drying agent"