Goodbye, superpH, you were too wild for our world.

2019-10-21 19:44:52 +01:00
parent 1d4b76e10a
commit 805079b62c
2 changed files with 14 additions and 8 deletions
@@ -156,6 +156,8 @@
 	if(beaker_weakness_bitflag & PH_WEAK)
 		if((reagents.pH < 1.5) || (reagents.pH > 12.5))
 			START_PROCESSING(SSobj, src)
+	else if((reagents.pH < -1) || (reagents.pH > 15))
+		START_PROCESSING(SSobj, src)


 /obj/item/reagent_containers/process()
@@ -163,16 +165,20 @@
 		cached_icon = icon_state
 	var/damage
 	var/cause
+	var/pHresistance = 3
 	if(beaker_weakness_bitflag & PH_WEAK)
-		if(reagents.pH < 2)
-			damage = (2 - reagents.pH)/20
-			cause = "from the extreme pH"
-			playsound(get_turf(src), 'sound/FermiChem/bufferadd.ogg', 50, 1)
+		pHresistance = 0 //if weak, pH 2, else -1

-		if(reagents.pH > 12)
-			damage = (reagents.pH - 12)/20
-			cause = "from the extreme pH"
-			playsound(get_turf(src), 'sound/FermiChem/bufferadd.ogg', 50, 1)
+	if(reagents.pH < (2-pHresistance)) //2 or -1
+		damage = ((2-pHresistance) - reagents.pH)/20 //2 - -3 = -1, -1 - -2 = 1 I think this is right?
+		cause = "from the extreme pH"
+		playsound(get_turf(src), 'sound/FermiChem/bufferadd.ogg', 50, 1)
+
+
+	if(reagents.pH > (12+pHresistance)) //12 or 15
+		damage = (reagents.pH - (12+pHresistance))/20
+		cause = "from the extreme pH"
+		playsound(get_turf(src), 'sound/FermiChem/bufferadd.ogg', 50, 1)

 	if(beaker_weakness_bitflag & TEMP_WEAK)
 		if(reagents.chem_temp >= 444)