From b163f56eb3957a69941511a5bcf866c60f0ae92a Mon Sep 17 00:00:00 2001 From: Fermi Date: Sun, 7 Jul 2019 16:16:02 +0100 Subject: [PATCH] Guess what it didn't work. --- modular_citadel/code/datums/status_effects/chems.dm | 5 +---- .../modules/reagents/chemistry/reagents/fermi_reagents.dm | 2 ++ .../code/modules/reagents/chemistry/recipes/fermi.dm | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 10756eefd7..23ae8e54ea 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -20,10 +20,7 @@ if(original.stat == DEAD || original == null || !original) if((fermi_Clone && fermi_Clone.stat != DEAD) || (fermi_Clone == null)) if(originalmind) - if(!originalmind.current) - owner.remove_status_effect(src) - else - original = originalmind.current //TEST THIS + owner.remove_status_effect(src) ..() /datum/status_effect/chem/SGDF/on_remove(mob/living/carbon/M) 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 ce64ee4cd9..c056fec66e 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -353,6 +353,7 @@ //Consumes self on addition and shifts pH /datum/reagent/fermi/acidic_buffer/on_new(datapH) + data = datapH if(LAZYLEN(holder.reagent_list) == 1) return holder.pH = ((holder.pH * holder.total_volume)+(pH * (volume)))/(holder.total_volume + (volume)) @@ -372,6 +373,7 @@ can_synth = TRUE /datum/reagent/fermi/basic_buffer/on_new(datapH) + data = datapH if(LAZYLEN(holder.reagent_list) == 1) return holder.pH = ((holder.pH * holder.total_volume)+(pH * (volume)))/(holder.total_volume + (volume)) diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 611b647c26..6b4df94b88 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -419,7 +419,6 @@ return var/datum/reagent/fermi/acidic_buffer/Fa = locate(/datum/reagent/fermi/acidic_buffer) in my_atom.reagents.reagent_list Fa.data = 0 - Fa.addProc = TRUE /datum/chemical_reaction/fermi/basic_buffer//done test name = "Ethyl Ethanoate buffer" @@ -448,7 +447,6 @@ return var/datum/reagent/fermi/basic_buffer/Fb = locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list Fb.data = 14 - Fb.addProc = TRUE //secretcatchemcode, shh!! Of couse I hide it amongst cats. Though, I moved it with your requests. //I'm not trying to be sneaky, I'm trying to keep it a secret!