diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index b0c16152a2..10756eefd7 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -20,15 +20,10 @@ if(original.stat == DEAD || original == null || !original) if((fermi_Clone && fermi_Clone.stat != DEAD) || (fermi_Clone == null)) if(originalmind) - owner.remove_status_effect(src) - /* - log_game("FERMICHEM: SGDF mind shift applied. [owner] is now playing as their clone and should not have memories after their clone split (look up SGDF status applied). ID: [owner.key]") - owner.mind.transfer_to(fermi_Clone) - to_chat(owner, "Lucidity shoots to your previously blank mind as your mind suddenly finishes the cloning process. You marvel for a moment at yourself, as your mind subconciously recollects all your memories up until the point when you cloned yourself. curiously, you find that you memories are blank after you ingested the sythetic serum, leaving you to wonder where the other you is.") - to_chat(fermi_Clone, "Lucidity shoots to your previously blank mind as your mind suddenly finishes the cloning process. You marvel for a moment at yourself, as your mind subconciously recollects all your memories up until the point when you cloned yourself. curiously, you find that you memories are blank after you ingested the sythetic serum, leaving you to wonder where the other you is.") - fermi_Clone = null - owner.remove_status_effect(src) - */ + if(!originalmind.current) + owner.remove_status_effect(src) + else + original = originalmind.current //TEST THIS ..() /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 c056fec66e..ce64ee4cd9 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -353,7 +353,6 @@ //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)) @@ -373,7 +372,6 @@ 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 6b4df94b88..611b647c26 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -419,6 +419,7 @@ 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" @@ -447,6 +448,7 @@ 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!