Merge remote-tracking branch 'origin/master' into TGUI-3.0

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -259,9 +259,9 @@
 			var/amount = text2num(params["amount"])
 			if(amount == null)
 				amount = text2num(input(usr,
-					"Max 10. Buffer content will be split evenly.",
+					"Max 20. Buffer content will be split evenly.",
 					"How many to make?", 1))
-			amount = clamp(round(amount), 0, 10)
+			amount = clamp(round(amount), 0, 20)
 			if (amount <= 0)
 				return FALSE
 			// Get units per item

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -132,8 +132,8 @@
 			"<span class='userdanger'>You're covered in boiling oil!</span>")
 			M.emote("scream")
 			playsound(M, 'sound/machines/fryer/deep_fryer_emerge.ogg', 25, TRUE)
-			var/oil_damage = (holder.chem_temp / fry_temperature) * 0.33 //Damage taken per unit
-			M.adjustFireLoss(min(35, oil_damage * reac_volume)) //Damage caps at 35
+			var/oil_damage = max((holder.chem_temp / fry_temperature) * 0.33,1) //Damage taken per unit
+			M.adjustFireLoss(oil_damage * max(reac_volume,20)) //Damage caps at 20
 	else
 		..()
 	return TRUE
@@ -866,4 +866,4 @@
 	taste_mult = 2
 	taste_description = "fizzy sweetness"
 	value = REAGENT_VALUE_COMMON
-	
+