Defines math, take 2

code/modules/reagents/chemistry/holder.dm

@@ -580,7 +580,7 @@
 		if (R.id == reagent)
 			//clamp the removal amount to be between current reagent amount
 			//and zero, to prevent removing more than the holder has stored
-			amount = Clamp(amount, 0, R.volume)
+			amount = CLAMP(amount, 0, R.volume)
 			R.volume -= amount
 			update_total()
 			if(!safety)//So it does not handle reactions when it need not to

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

@@ -211,7 +211,7 @@
 
 /obj/machinery/chem_dispenser/emp_act(severity)
 	var/list/datum/reagents/R = list()
-	var/total = min(rand(7,15), Floor(cell.charge*powerefficiency))
+	var/total = min(rand(7,15), FLOOR(cell.charge*powerefficiency, 1))
 	var/datum/reagents/Q = new(total*10)
 	if(beaker && beaker.reagents)
 		R += beaker.reagents

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

@@ -126,7 +126,7 @@
 				target = text2num(target)
 				. = TRUE
 			if(.)
-				target_temperature = Clamp(target, 0, 1000)
+				target_temperature = CLAMP(target, 0, 1000)
 		if("eject")
 			on = FALSE
 			eject_beaker()

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

@@ -215,7 +215,7 @@
 				var/amount = 1
 				var/vol_each = min(reagents.total_volume, 50)
 				if(text2num(many))
-					amount = Clamp(round(input(usr, "Max 10. Buffer content will be split evenly.", "How many pills?", amount) as num|null), 0, 10)
+					amount = CLAMP(round(input(usr, "Max 10. Buffer content will be split evenly.", "How many pills?", amount) as num|null), 0, 10)
 					if(!amount)
 						return
 					vol_each = min(reagents.total_volume / amount, 50)
@@ -251,7 +251,7 @@
 			var/amount = 1
 			var/vol_each = min(reagents.total_volume, 40)
 			if(text2num(many))
-				amount = Clamp(round(input(usr, "Max 10. Buffer content will be split evenly.", "How many patches?", amount) as num|null), 0, 10)
+				amount = CLAMP(round(input(usr, "Max 10. Buffer content will be split evenly.", "How many patches?", amount) as num|null), 0, 10)
 				if(!amount)
 					return
 				vol_each = min(reagents.total_volume / amount, 40)

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

@@ -484,7 +484,7 @@
 /obj/machinery/reagentgrinder/proc/mix_complete()
 	if(beaker && beaker.reagents.total_volume)
 		//Recipe to make Butter
-		var/butter_amt = Floor(beaker.reagents.get_reagent_amount("milk") / MILK_TO_BUTTER_COEFF)
+		var/butter_amt = FLOOR(beaker.reagents.get_reagent_amount("milk") / MILK_TO_BUTTER_COEFF, 1)
 		beaker.reagents.remove_reagent("milk", MILK_TO_BUTTER_COEFF * butter_amt)
 		for(var/i in 1 to butter_amt)
 			new /obj/item/reagent_containers/food/snacks/butter(drop_location())

code/modules/reagents/chemistry/reagents.dm

@@ -41,7 +41,7 @@
 		return 0
 	if(method == VAPOR) //smoke, foam, spray
 		if(M.reagents)
-			var/modifier = Clamp((1 - touch_protection), 0, 1)
+			var/modifier = CLAMP((1 - touch_protection), 0, 1)
 			var/amount = round(reac_volume*modifier, 0.1)
 			if(amount >= 0.5)
 				M.reagents.add_reagent(id, amount)

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -961,7 +961,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 		var/datum/antagonist/changeling/changeling = M.mind.has_antag_datum(/datum/antagonist/changeling)
 		if(changeling)
 			changeling.chem_charges += metabolization_rate
-			changeling.chem_charges = Clamp(changeling.chem_charges, 0, changeling.chem_storage)
+			changeling.chem_charges = CLAMP(changeling.chem_charges, 0, changeling.chem_storage)
 	return ..()
 
 /datum/reagent/consumable/ethanol/irishcarbomb

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -850,9 +850,9 @@
 
 /datum/reagent/toxin/peaceborg/confuse/on_mob_life(mob/living/M)
 	if(M.confused < 6)
-		M.confused = Clamp(M.confused + 3, 0, 5)
+		M.confused = CLAMP(M.confused + 3, 0, 5)
 	if(M.dizziness < 6)
-		M.dizziness = Clamp(M.dizziness + 3, 0, 5)
+		M.dizziness = CLAMP(M.dizziness + 3, 0, 5)
 	if(prob(20))
 		to_chat(M, "You feel confused and disorientated.")
 	..()

code/modules/reagents/chemistry/recipes/pyrotechnics.dm

@@ -168,7 +168,7 @@
 		return
 	holder.remove_reagent("sorium", created_volume*4)
 	var/turf/T = get_turf(holder.my_atom)
-	var/range = Clamp(sqrt(created_volume*4), 1, 6)
+	var/range = CLAMP(sqrt(created_volume*4), 1, 6)
 	goonchem_vortex(T, 1, range)
 
 /datum/chemical_reaction/sorium_vortex
@@ -179,7 +179,7 @@
 
 /datum/chemical_reaction/sorium_vortex/on_reaction(datum/reagents/holder, created_volume)
 	var/turf/T = get_turf(holder.my_atom)
-	var/range = Clamp(sqrt(created_volume), 1, 6)
+	var/range = CLAMP(sqrt(created_volume), 1, 6)
 	goonchem_vortex(T, 1, range)
 
 /datum/chemical_reaction/liquid_dark_matter
@@ -193,7 +193,7 @@
 		return
 	holder.remove_reagent("liquid_dark_matter", created_volume*3)
 	var/turf/T = get_turf(holder.my_atom)
-	var/range = Clamp(sqrt(created_volume*3), 1, 6)
+	var/range = CLAMP(sqrt(created_volume*3), 1, 6)
 	goonchem_vortex(T, 0, range)
 
 /datum/chemical_reaction/ldm_vortex
@@ -204,7 +204,7 @@
 
 /datum/chemical_reaction/ldm_vortex/on_reaction(datum/reagents/holder, created_volume)
 	var/turf/T = get_turf(holder.my_atom)
-	var/range = Clamp(sqrt(created_volume/2), 1, 6)
+	var/range = CLAMP(sqrt(created_volume/2), 1, 6)
 	goonchem_vortex(T, 0, range)
 
 /datum/chemical_reaction/flash_powder

code/modules/reagents/reagent_containers/syringes.dm

@@ -157,7 +157,7 @@
 
 
 /obj/item/reagent_containers/syringe/update_icon()
-	var/rounded_vol = Clamp(round((reagents.total_volume / volume * 15),5), 0, 15)
+	var/rounded_vol = CLAMP(round((reagents.total_volume / volume * 15),5), 0, 15)
 	cut_overlays()
 	if(ismob(loc))
 		var/injoverlay