WELCOME TO PH'S HELL RIDE

2019-06-30 01:56:10 +01:00
parent 696d879874
commit e09f189895
10 changed files with 35 additions and 18 deletions
@@ -126,10 +126,11 @@

 /datum/reagents/proc/remove_all(amount = 1)
 	var/list/cached_reagents = reagent_list
+	if((total_volume - amount) <= 0)//Because this can result in 0, I don't want it to crash.
+		pH = 7
 	if(total_volume > 0)
 		var/part = amount / total_volume
 		for(var/reagent in cached_reagents)
-			pH = 7
 			var/datum/reagent/R = reagent
 			remove_reagent(R.id, R.volume * part, ignore_pH = TRUE)

@@ -189,10 +189,12 @@
 		data["beakerCurrentVolume"] = beakerCurrentVolume
 		data["beakerMaxVolume"] = beaker.volume
 		data["beakerTransferAmounts"] = beaker.possible_transfer_amounts
+		data["beakerCurrentpH"] = beaker.reagents.pH
 	else
 		data["beakerCurrentVolume"] = null
 		data["beakerMaxVolume"] = null
 		data["beakerTransferAmounts"] = null
+		data["beakerCurrentpH"] = null

 	var/chemicals[0]
 	var/recipes[0]
@@ -97,6 +97,7 @@
 	data["isBeakerLoaded"] = beaker ? 1 : 0

 	data["currentTemp"] = beaker ? beaker.reagents.chem_temp : null
+	data["currentpH"] =  beaker ? beaker.reagents.pH : null
 	data["beakerCurrentVolume"] = beaker ? beaker.reagents.total_volume : null
 	data["beakerMaxVolume"] = beaker ? beaker.volume : null