Merge branch 'master' into FERMICHEMCurTweaks

code/modules/reagents/chemistry/holder.dm

@@ -746,11 +746,13 @@
 	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(total_volume <= 0)
+	if(!reagent_list)
 		pH = 7
 	return 0
 

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.9
 
 /datum/reagent/drying_agent
 	name = "Drying agent"