Merge branch 'master' into upstream-merge-33470

code/modules/research/designs/autolathe_designs.dm

@@ -681,7 +681,7 @@
 	category = list("hacked", "Security")
 
 /datum/design/a357
-	name = "Ammo Box (.357)"
+	name = "Speed Loader (.357)"
 	id = "a357"
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 30000)

code/modules/research/protolathe.dm

@@ -93,7 +93,7 @@ Note: Must be placed west/left of and R&D console to function.
 		return FALSE
 
 	var/power = 1000
-	amount = Clamp(amount, 1, 10)
+	amount = CLAMP(amount, 1, 10)
 	for(var/M in D.materials)
 		power += round(D.materials[M] * amount / 5)
 	power = max(3000, power)

code/modules/research/xenobiology/xenobiology.dm

@@ -295,7 +295,7 @@
 		return ..()
 
 	to_chat(user, "<span class='notice'>You feed the slime the stabilizer. It is now less likely to mutate.</span>")
-	M.mutation_chance = Clamp(M.mutation_chance-15,0,100)
+	M.mutation_chance = CLAMP(M.mutation_chance-15,0,100)
 	qdel(src)
 
 /obj/item/slimepotion/mutator
@@ -319,7 +319,7 @@
 		return ..()
 
 	to_chat(user, "<span class='notice'>You feed the slime the mutator. It is now more likely to mutate.</span>")
-	M.mutation_chance = Clamp(M.mutation_chance+12,0,100)
+	M.mutation_chance = CLAMP(M.mutation_chance+12,0,100)
 	M.mutator_used = TRUE
 	qdel(src)