Defines math, take 2

code/game/gamemodes/blob/blobs/blob_mobs.dm

@@ -42,7 +42,7 @@
 /mob/living/simple_animal/hostile/blob/fire_act(exposed_temperature, exposed_volume)
 	..()
 	if(exposed_temperature)
-		adjustFireLoss(Clamp(0.01 * exposed_temperature, 1, 5))
+		adjustFireLoss(CLAMP(0.01 * exposed_temperature, 1, 5))
 	else
 		adjustFireLoss(5)
 

code/game/gamemodes/blob/overmind.dm

@@ -153,7 +153,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 				B.hud_used.blobpwrdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#82ed00'>[round(blob_core.obj_integrity)]</font></div>"
 
 /mob/camera/blob/proc/add_points(points)
-	blob_points = Clamp(blob_points + points, 0, max_blob_points)
+	blob_points = CLAMP(blob_points + points, 0, max_blob_points)
 	hud_used.blobpwrdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#82ed00'>[round(blob_points)]</font></div>"
 
 /mob/camera/blob/say(message)

code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm

@@ -207,7 +207,7 @@
 	to_chat(cyborg, "<span class='brass'>You start to charge from the [sigil_name]...</span>")
 	if(!do_after(cyborg, 50, target = src, extra_checks = CALLBACK(src, .proc/cyborg_checks, cyborg, TRUE)))
 		return
-	var/giving_power = min(Floor(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), get_clockwork_power()) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER
+	var/giving_power = min(FLOOR(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), get_clockwork_power()) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER
 	if(adjust_clockwork_power(-giving_power))
 		cyborg.visible_message("<span class='warning'>[cyborg] glows a brilliant orange!</span>")
 		var/previous_color = cyborg.color

code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm

@@ -90,7 +90,7 @@
 	if(amount_temp < 2)
 		to_chat(user, "<span class='warning'>You need at least <b>2</b> floor tiles to convert into power.</span>")
 		return TRUE
-	if(IsOdd(amount_temp))
+	if(ISODD(amount_temp))
 		amount_temp--
 		no_delete = TRUE
 		use(amount_temp)
@@ -239,7 +239,7 @@
 		if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \
 			extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricator_repair_checks, repair_values, src, user, TRUE)))
 			break
-		obj_integrity = Clamp(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity)
+		obj_integrity = CLAMP(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity)
 		adjust_clockwork_power(-repair_values["power_required"])
 		playsound(src, 'sound/machines/click.ogg', 50, 1)
 

code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm

@@ -97,7 +97,7 @@
 		if(ishuman(M.current))
 			human_servants++
 	construct_limit = human_servants / 4 //1 per 4 human servants, and a maximum of 3 marauders
-	construct_limit = Clamp(construct_limit, 1, 3)
+	construct_limit = CLAMP(construct_limit, 1, 3)
 
 /datum/clockwork_scripture/create_object/construct/clockwork_marauder/pre_recital()
 	channel_time = initial(channel_time)

code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm

@@ -60,4 +60,4 @@
 				break
 		if(!M)
 			M = H.apply_status_effect(STATUS_EFFECT_MANIAMOTOR, src)
-		M.severity = Clamp(M.severity + ((11 - get_dist(src, H)) * efficiency * efficiency), 0, MAX_MANIA_SEVERITY)
+		M.severity = CLAMP(M.severity + ((11 - get_dist(src, H)) * efficiency * efficiency), 0, MAX_MANIA_SEVERITY)

code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm

@@ -57,5 +57,5 @@
 			L.confused = min(L.confused + 15, 50)
 			L.dizziness = min(L.dizziness + 15, 50)
 			if(L.confused >= 25)
-				L.Knockdown(Floor(L.confused * 0.8))
+				L.Knockdown(FLOOR(L.confused * 0.8, 1))
 		take_damage(max_integrity)

code/game/gamemodes/meteor/meteor.dm

@@ -25,7 +25,7 @@
 	if (prob(meteorminutes/2))
 		wavetype = GLOB.meteors_catastrophic
 
-	var/ramp_up_final = Clamp(round(meteorminutes/rampupdelta), 1, 10)
+	var/ramp_up_final = CLAMP(round(meteorminutes/rampupdelta), 1, 10)
 
 	spawn_meteors(ramp_up_final, wavetype)
 

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -353,7 +353,7 @@
 					var/N = text2num(user_input)
 					if(!N)
 						return
-					timer_set = Clamp(N,minimum_timer_set,maximum_timer_set)
+					timer_set = CLAMP(N,minimum_timer_set,maximum_timer_set)
 				. = TRUE
 		if("safety")
 			if(auth && yes_code)