diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index a18c716ab0..7ac01a4072 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -926,10 +926,9 @@ if (R.id == reagent) if((total_volume - amount) <= 0)//Because this can result in 0, I don't want it to crash. pH = 7 - /*In practice this is really confusing and players feel like it randomly melts their beakers. + //In practice this is really confusing and players feel like it randomly melts their beakers, but I'm not sure how else to handle it. We'll see how it goes and I can remove this if it confuses people. else pH = (((pH - R.pH) / total_volume) * amount) + pH - */ if(istype(my_atom, /obj/item/reagent_containers/)) var/obj/item/reagent_containers/RC = my_atom RC.pH_check()//checks beaker resilience) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm index 40c5e31fa3..be82130c7c 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm @@ -21,6 +21,7 @@ addiction_stage2_end = 30 addiction_stage3_end = 41 addiction_stage4_end = 44 //Incase it's too long + data = list("location_created" = null) var/turf/location_created var/turf/open/location_return = null var/addictCyc3 = 0 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 af2a8d043f..2f35397ba0 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -183,7 +183,7 @@ /datum/reagent/fermi/nanite_b_gone name = "Naninte bain" id = "nanite_b_gone" - description = "A rather simple toxin to small nano machines that will kill them off at a rapid rate well in system." + description = "A stablised EMP that is highly volatile, shocking small nano machines that will kill them off at a rapid rate in a patient's system." color = "#5a7267" overdose_threshold = 15 ImpureChem = "nanite_b_goneTox" //If you make an inpure chem, it stalls growth @@ -216,7 +216,6 @@ N.nanite_volume = -2 ..() -//Unobtainable, used if SDGF is impure but not too impure /datum/reagent/fermi/nanite_b_goneTox name = "Naninte bain" id = "nanite_b_goneTox" diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 7835769215..8993e2b51d 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -90,8 +90,7 @@ var/turf/open/location = get_turf(my_atom) var/datum/reagent/fermi/eigenstate/E = locate(/datum/reagent/fermi/eigenstate) in my_atom.reagents.reagent_list E.location_created = location - if(!E.data) - E.data.["location_created"] = location + E.data.["location_created"] = location //serum