Defines math, take 2

code/game/objects/effects/anomalies.dm

@@ -27,8 +27,13 @@
 	aSignal.name = "[name] core"
 	aSignal.code = rand(1,100)
 
+<<<<<<< HEAD
 	aSignal.frequency = rand(1200, 1599)
 	if(IsMultiple(aSignal.frequency, 2))//signaller frequencies are always uneven!
+=======
+	aSignal.frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ)
+	if(ISMULTIPLE(aSignal.frequency, 2))//signaller frequencies are always uneven!
+>>>>>>> 25080ff... defines math (#33498)
 		aSignal.frequency++
 
 	if(new_lifespan)

code/game/objects/items/chrono_eraser.dm

@@ -187,7 +187,7 @@
 
 /obj/effect/chrono_field/update_icon()
 	var/ttk_frame = 1 - (tickstokill / initial(tickstokill))
-	ttk_frame = Clamp(Ceiling(ttk_frame * CHRONO_FRAME_COUNT), 1, CHRONO_FRAME_COUNT)
+	ttk_frame = CLAMP(CEILING(ttk_frame * CHRONO_FRAME_COUNT, 1), 1, CHRONO_FRAME_COUNT)
 	if(ttk_frame != RPpos)
 		RPpos = ttk_frame
 		mob_underlay.icon_state = "frame[RPpos]"

code/game/objects/items/defib.dm

@@ -69,7 +69,7 @@
 	if(powered) //so it doesn't show charge if it's unpowered
 		if(cell)
 			var/ratio = cell.charge / cell.maxcharge
-			ratio = Ceiling(ratio*4) * 25
+			ratio = CEILING(ratio*4, 1) * 25
 			add_overlay("[initial(icon_state)]-charge[ratio]")
 
 /obj/item/defibrillator/CheckParts(list/parts_list)

code/game/objects/items/devices/lightreplacer.dm

@@ -169,7 +169,7 @@
 
 // Negative numbers will subtract
 /obj/item/device/lightreplacer/proc/AddUses(amount = 1)
-	uses = Clamp(uses + amount, 0, max_uses)
+	uses = CLAMP(uses + amount, 0, max_uses)
 
 /obj/item/device/lightreplacer/proc/AddShards(amount = 1, user)
 	bulb_shards += amount

code/game/objects/items/devices/traitordevices.dm

@@ -228,7 +228,7 @@ effective or pretty fucking useless.
 			charge = max(0,charge - 25)//Quick decrease in light
 		else
 			charge = min(max_charge,charge + 50) //Charge in the dark
-		animate(user,alpha = Clamp(255 - charge,0,255),time = 10)
+		animate(user,alpha = CLAMP(255 - charge,0,255),time = 10)
 
 
 /obj/item/device/jammer

code/game/objects/items/dice.dm

@@ -166,7 +166,7 @@
 /obj/item/dice/proc/diceroll(mob/user)
 	result = rand(1, sides)
 	if(rigged && result != rigged)
-		if(prob(Clamp(1/(sides - 1) * 100, 25, 80)))
+		if(prob(CLAMP(1/(sides - 1) * 100, 25, 80)))
 			result = rigged
 	var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
 	var/comment = ""

code/game/objects/items/grenades/plastic.dm

@@ -87,7 +87,7 @@
 		return
 	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
 	if(user.get_active_held_item() == src)
-		newtime = Clamp(newtime, 10, 60000)
+		newtime = CLAMP(newtime, 10, 60000)
 		det_time = newtime
 		to_chat(user, "Timer set for [det_time] seconds.")
 
@@ -204,7 +204,7 @@
 /obj/item/grenade/plastic/c4/attack_self(mob/user)
 	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
 	if(user.get_active_held_item() == src)
-		newtime = Clamp(newtime, 10, 60000)
+		newtime = CLAMP(newtime, 10, 60000)
 		timer = newtime
 		to_chat(user, "Timer set for [timer] seconds.")
 

code/game/objects/items/his_grace.dm

@@ -75,7 +75,7 @@
 		drowse()
 		return
 	if(bloodthirst < HIS_GRACE_CONSUME_OWNER)
-		adjust_bloodthirst(1 + Floor(LAZYLEN(contents) * 0.5)) //Maybe adjust this?
+		adjust_bloodthirst(1 + FLOOR(LAZYLEN(contents) * 0.5, 1)) //Maybe adjust this?
 	else
 		adjust_bloodthirst(1) //don't cool off rapidly once we're at the point where His Grace consumes all.
 	var/mob/living/master = get_atom_on_turf(src, /mob/living)
@@ -164,9 +164,9 @@
 /obj/item/his_grace/proc/adjust_bloodthirst(amt)
 	prev_bloodthirst = bloodthirst
 	if(prev_bloodthirst < HIS_GRACE_CONSUME_OWNER)
-		bloodthirst = Clamp(bloodthirst + amt, HIS_GRACE_SATIATED, HIS_GRACE_CONSUME_OWNER)
+		bloodthirst = CLAMP(bloodthirst + amt, HIS_GRACE_SATIATED, HIS_GRACE_CONSUME_OWNER)
 	else
-		bloodthirst = Clamp(bloodthirst + amt, HIS_GRACE_CONSUME_OWNER, HIS_GRACE_FALL_ASLEEP)
+		bloodthirst = CLAMP(bloodthirst + amt, HIS_GRACE_CONSUME_OWNER, HIS_GRACE_FALL_ASLEEP)
 	update_stats()
 
 /obj/item/his_grace/proc/update_stats()

code/game/objects/items/pneumaticCannon.dm

@@ -198,8 +198,8 @@
 		return target
 	var/x_o = (target.x - starting.x)
 	var/y_o = (target.y - starting.y)
-	var/new_x = Clamp((starting.x + (x_o * range_multiplier)), 0, world.maxx)
-	var/new_y = Clamp((starting.y + (y_o * range_multiplier)), 0, world.maxy)
+	var/new_x = CLAMP((starting.x + (x_o * range_multiplier)), 0, world.maxx)
+	var/new_y = CLAMP((starting.y + (y_o * range_multiplier)), 0, world.maxy)
 	var/turf/newtarget = locate(new_x, new_y, starting.z)
 	return newtarget
 

code/game/objects/items/robot/robot_items.dm

@@ -616,7 +616,7 @@
 			continue
 		usage += projectile_tick_speed_ecost
 		usage += (tracked[I] * projectile_damage_tick_ecost_coefficient)
-	energy = Clamp(energy - usage, 0, maxenergy)
+	energy = CLAMP(energy - usage, 0, maxenergy)
 	if(energy <= 0)
 		deactivate_field()
 		visible_message("<span class='warning'>[src] blinks \"ENERGY DEPLETED\".</span>")
@@ -626,7 +626,7 @@
 		if(iscyborg(host.loc))
 			host = host.loc
 		else
-			energy = Clamp(energy + energy_recharge, 0, maxenergy)
+			energy = CLAMP(energy + energy_recharge, 0, maxenergy)
 			return
 	if((host.cell.charge >= (host.cell.maxcharge * cyborg_cell_critical_percentage)) && (energy < maxenergy))
 		host.cell.use(energy_recharge*energy_recharge_cyborg_drain_coefficient)

code/game/objects/items/sharpener.dm

@@ -35,14 +35,14 @@
 		if(TH.force_wielded > initial(TH.force_wielded))
 			to_chat(user, "<span class='warning'>[TH] has already been refined before. It cannot be sharpened further!</span>")
 			return
-		TH.force_wielded = Clamp(TH.force_wielded + increment, 0, max)//wieldforce is increased since normal force wont stay
+		TH.force_wielded = CLAMP(TH.force_wielded + increment, 0, max)//wieldforce is increased since normal force wont stay
 	if(I.force > initial(I.force))
 		to_chat(user, "<span class='warning'>[I] has already been refined before. It cannot be sharpened further!</span>")
 		return
 	user.visible_message("<span class='notice'>[user] sharpens [I] with [src]!</span>", "<span class='notice'>You sharpen [I], making it much more deadly than before.</span>")
 	I.sharpness = IS_SHARP_ACCURATE
-	I.force = Clamp(I.force + increment, 0, max)
-	I.throwforce = Clamp(I.throwforce + increment, 0, max)
+	I.force = CLAMP(I.force + increment, 0, max)
+	I.throwforce = CLAMP(I.throwforce + increment, 0, max)
 	I.name = "[prefix] [I.name]"
 	name = "worn out [name]"
 	desc = "[desc] At least, it used to."

code/game/objects/items/stacks/stack.dm

@@ -37,9 +37,9 @@
 
 /obj/item/stack/proc/update_weight()
 	if(amount <= (max_amount * (1/3)))
-		w_class = Clamp(full_w_class-2, WEIGHT_CLASS_TINY, full_w_class)
+		w_class = CLAMP(full_w_class-2, WEIGHT_CLASS_TINY, full_w_class)
 	else if (amount <= (max_amount * (2/3)))
-		w_class = Clamp(full_w_class-1, WEIGHT_CLASS_TINY, full_w_class)
+		w_class = CLAMP(full_w_class-1, WEIGHT_CLASS_TINY, full_w_class)
 	else
 		w_class = full_w_class
 

code/game/objects/items/tanks/tanks.dm

@@ -194,7 +194,7 @@
 				pressure = text2num(pressure)
 				. = TRUE
 			if(.)
-				distribute_pressure = Clamp(round(pressure), TANK_MIN_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE)
+				distribute_pressure = CLAMP(round(pressure), TANK_MIN_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE)
 
 /obj/item/tank/remove_air(amount)
 	return air_contents.remove(amount)

code/game/objects/items/tools/weldingtool.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #define WELDER_FUEL_BURN_INTERVAL 13
 /obj/item/weldingtool
 	name = "welding tool"
@@ -336,4 +337,350 @@
 	item_state = "brasswelder"
 
 
+/obj/item/weldingtool/experimental/process()
+	..()
+	if(get_fuel() < max_fuel && nextrefueltick < world.time)
+		nextrefueltick = world.time + 10
+		reagents.add_reagent("welding_fuel", 1)
+=======
+#define WELDER_FUEL_BURN_INTERVAL 13
+/obj/item/weldingtool
+	name = "welding tool"
+	desc = "A standard edition welder provided by Nanotrasen."
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "welder"
+	item_state = "welder"
+	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+	flags_1 = CONDUCT_1
+	slot_flags = SLOT_BELT
+	force = 3
+	throwforce = 5
+	hitsound = "swing_hit"
+	usesound = 'sound/items/welder.ogg'
+	var/acti_sound = 'sound/items/welderactivate.ogg'
+	var/deac_sound = 'sound/items/welderdeactivate.ogg'
+	throw_speed = 3
+	throw_range = 5
+	w_class = WEIGHT_CLASS_SMALL
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
+	resistance_flags = FIRE_PROOF
+
+	materials = list(MAT_METAL=70, MAT_GLASS=30)
+	var/welding = 0 	//Whether or not the welding tool is off(0), on(1) or currently welding(2)
+	var/status = TRUE 		//Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
+	var/max_fuel = 20 	//The max amount of fuel the welder can hold
+	var/change_icons = 1
+	var/can_off_process = 0
+	var/light_intensity = 2 //how powerful the emitted light is when used.
+	var/burned_fuel_for = 0	//when fuel was last removed
+	heat = 3800
+	toolspeed = 1
+
+/obj/item/weldingtool/Initialize()
+	. = ..()
+	create_reagents(max_fuel)
+	reagents.add_reagent("welding_fuel", max_fuel)
+	update_icon()
+
+
+/obj/item/weldingtool/proc/update_torch()
+	if(welding)
+		add_overlay("[initial(icon_state)]-on")
+		item_state = "[initial(item_state)]1"
+	else
+		item_state = "[initial(item_state)]"
+
+
+/obj/item/weldingtool/update_icon()
+	cut_overlays()
+	if(change_icons)
+		var/ratio = get_fuel() / max_fuel
+		ratio = CEILING(ratio*4, 1) * 25
+		add_overlay("[initial(icon_state)][ratio]")
+	update_torch()
+	return
+
+
+/obj/item/weldingtool/process()
+	switch(welding)
+		if(0)
+			force = 3
+			damtype = "brute"
+			update_icon()
+			if(!can_off_process)
+				STOP_PROCESSING(SSobj, src)
+			return
+	//Welders left on now use up fuel, but lets not have them run out quite that fast
+		if(1)
+			force = 15
+			damtype = "fire"
+			++burned_fuel_for
+			if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL)
+				remove_fuel(1)
+			update_icon()
+
+	//This is to start fires. process() is only called if the welder is on.
+	open_flame()
+
+
+/obj/item/weldingtool/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return (FIRELOSS)
+
+
+/obj/item/weldingtool/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/screwdriver))
+		flamethrower_screwdriver(I, user)
+	else if(istype(I, /obj/item/stack/rods))
+		flamethrower_rods(I, user)
+	else
+		. = ..()
+	update_icon()
+
+/obj/item/weldingtool/proc/explode()
+	var/turf/T = get_turf(loc)
+	var/plasmaAmount = reagents.get_reagent_amount("plasma")
+	dyn_explosion(T, plasmaAmount/5)//20 plasma in a standard welder has a 4 power explosion. no breaches, but enough to kill/dismember holder
+	qdel(src)
+
+/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user)
+	if(!istype(H))
+		return ..()
+
+	var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected))
+
+	if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM)
+		if(src.remove_fuel(1))
+			playsound(loc, usesound, 50, 1)
+			if(user == H)
+				user.visible_message("<span class='notice'>[user] starts to fix some of the dents on [H]'s [affecting.name].</span>", "<span class='notice'>You start fixing some of the dents on [H]'s [affecting.name].</span>")
+				if(!do_mob(user, H, 50))
+					return
+			item_heal_robotic(H, user, 15, 0)
+	else
+		return ..()
+
+
+/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity)
+	if(!proximity)
+		return
+	if(!status && istype(O, /obj/item/reagent_containers) && O.is_open_container())
+		reagents.trans_to(O, reagents.total_volume)
+		to_chat(user, "<span class='notice'>You empty [src]'s fuel tank into [O].</span>")
+		update_icon()
+	if(welding)
+		remove_fuel(1)
+		var/turf/location = get_turf(user)
+		location.hotspot_expose(700, 50, 1)
+		if(get_fuel() <= 0)
+			set_light(0)
+
+		if(isliving(O))
+			var/mob/living/L = O
+			if(L.IgniteMob())
+				message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire")
+				log_game("[key_name(user)] set [key_name(L)] on fire")
+
+
+/obj/item/weldingtool/attack_self(mob/user)
+	if(src.reagents.has_reagent("plasma"))
+		message_admins("[key_name_admin(user)] activated a rigged welder.")
+		explode()
+	switched_on(user)
+	if(welding)
+		set_light(light_intensity)
+
+	update_icon()
+
+
+//Returns the amount of fuel in the welder
+/obj/item/weldingtool/proc/get_fuel()
+	return reagents.get_reagent_amount("welding_fuel")
+
+
+//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use()
+/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null)
+	if(!welding || !check_fuel())
+		return 0
+	if(amount)
+		burned_fuel_for = 0
+	if(get_fuel() >= amount)
+		reagents.remove_reagent("welding_fuel", amount)
+		check_fuel()
+		if(M)
+			M.flash_act(light_intensity)
+		return TRUE
+	else
+		if(M)
+			to_chat(M, "<span class='warning'>You need more welding fuel to complete this task!</span>")
+		return FALSE
+
+
+//Turns off the welder if there is no more fuel (does this really need to be its own proc?)
+/obj/item/weldingtool/proc/check_fuel(mob/user)
+	if(get_fuel() <= 0 && welding)
+		switched_on(user)
+		update_icon()
+		//mob icon update
+		if(ismob(loc))
+			var/mob/M = loc
+			M.update_inv_hands(0)
+
+		return 0
+	return 1
+
+//Switches the welder on
+/obj/item/weldingtool/proc/switched_on(mob/user)
+	if(!status)
+		to_chat(user, "<span class='warning'>[src] can't be turned on while unsecured!</span>")
+		return
+	welding = !welding
+	if(welding)
+		if(get_fuel() >= 1)
+			to_chat(user, "<span class='notice'>You switch [src] on.</span>")
+			playsound(loc, acti_sound, 50, 1)
+			force = 15
+			damtype = "fire"
+			hitsound = 'sound/items/welder.ogg'
+			update_icon()
+			START_PROCESSING(SSobj, src)
+		else
+			to_chat(user, "<span class='warning'>You need more fuel!</span>")
+			switched_off(user)
+	else
+		to_chat(user, "<span class='notice'>You switch [src] off.</span>")
+		playsound(loc, deac_sound, 50, 1)
+		switched_off(user)
+
+//Switches the welder off
+/obj/item/weldingtool/proc/switched_off(mob/user)
+	welding = 0
+	set_light(0)
+
+	force = 3
+	damtype = "brute"
+	hitsound = "swing_hit"
+	update_icon()
+
+
+/obj/item/weldingtool/examine(mob/user)
+	..()
+	to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].")
+
+/obj/item/weldingtool/is_hot()
+	return welding * heat
+
+//Returns whether or not the welding tool is currently on.
+/obj/item/weldingtool/proc/isOn()
+	return welding
+
+
+/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user)
+	if(welding)
+		to_chat(user, "<span class='warning'>Turn it off first!</span>")
+		return
+	status = !status
+	if(status)
+		to_chat(user, "<span class='notice'>You resecure [src] and close the fuel tank.</span>")
+		container_type = NONE
+	else
+		to_chat(user, "<span class='notice'>[src] can now be attached, modified, and refuelled.</span>")
+		container_type = OPENCONTAINER_1
+	add_fingerprint(user)
+
+/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)
+	if(!status)
+		var/obj/item/stack/rods/R = I
+		if (R.use(1))
+			var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc)
+			if(!remove_item_from_storage(F))
+				user.transferItemToLoc(src, F, TRUE)
+			F.weldtool = src
+			add_fingerprint(user)
+			to_chat(user, "<span class='notice'>You add a rod to a welder, starting to build a flamethrower.</span>")
+			user.put_in_hands(F)
+		else
+			to_chat(user, "<span class='warning'>You need one rod to start building a flamethrower!</span>")
+
+/obj/item/weldingtool/ignition_effect(atom/A, mob/user)
+	if(welding && remove_fuel(1, user))
+		. = "<span class='notice'>[user] casually lights [A] with [src], what a badass.</span>"
+	else
+		. = ""
+
+/obj/item/weldingtool/largetank
+	name = "industrial welding tool"
+	desc = "A slightly larger welder with a larger tank."
+	icon_state = "indwelder"
+	max_fuel = 40
+	materials = list(MAT_GLASS=60)
+
+/obj/item/weldingtool/largetank/cyborg
+	name = "integrated welding tool"
+	desc = "An advanced welder designed to be used in robotic systems."
+	toolspeed = 0.5
+
+/obj/item/weldingtool/largetank/flamethrower_screwdriver()
+	return
+
+
+/obj/item/weldingtool/mini
+	name = "emergency welding tool"
+	desc = "A miniature welder used during emergencies."
+	icon_state = "miniwelder"
+	max_fuel = 10
+	w_class = WEIGHT_CLASS_TINY
+	materials = list(MAT_METAL=30, MAT_GLASS=10)
+	change_icons = 0
+
+/obj/item/weldingtool/mini/flamethrower_screwdriver()
+	return
+
+/obj/item/weldingtool/abductor
+	name = "alien welding tool"
+	desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "welder"
+	toolspeed = 0.1
+	light_intensity = 0
+	change_icons = 0
+
+/obj/item/weldingtool/abductor/process()
+	if(get_fuel() <= max_fuel)
+		reagents.add_reagent("welding_fuel", 1)
+	..()
+
+/obj/item/weldingtool/hugetank
+	name = "upgraded industrial welding tool"
+	desc = "An upgraded welder based of the industrial welder."
+	icon_state = "upindwelder"
+	item_state = "upindwelder"
+	max_fuel = 80
+	materials = list(MAT_METAL=70, MAT_GLASS=120)
+
+/obj/item/weldingtool/experimental
+	name = "experimental welding tool"
+	desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
+	icon_state = "exwelder"
+	item_state = "exwelder"
+	max_fuel = 40
+	materials = list(MAT_METAL=70, MAT_GLASS=120)
+	var/last_gen = 0
+	change_icons = 0
+	can_off_process = 1
+	light_intensity = 1
+	toolspeed = 0.5
+	var/nextrefueltick = 0
+
+/obj/item/weldingtool/experimental/brass
+	name = "brass welding tool"
+	desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch."
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+	icon_state = "brasswelder"
+	item_state = "brasswelder"
+
+
+/obj/item/weldingtool/experimental/process()
+	..()
 	if(get_fuel() < max_fuel && nextrefueltick < world.time)

code/game/objects/obj_defense.dm

@@ -198,7 +198,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
 		if(T.intact && level == 1) //fire can't damage things hidden below the floor.
 			return
 	if(exposed_temperature && !(resistance_flags & FIRE_PROOF))
-		take_damage(Clamp(0.02 * exposed_temperature, 0, 20), BURN, "fire", 0)
+		take_damage(CLAMP(0.02 * exposed_temperature, 0, 20), BURN, "fire", 0)
 	if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE))
 		resistance_flags |= ON_FIRE
 		SSfire_burning.processing[src] = src

code/game/objects/structures/fireplace.dm

@@ -129,7 +129,7 @@
 		if(burn_time_remaining() < MAXIMUM_BURN_TIMER)
 			flame_expiry_timer = world.time + MAXIMUM_BURN_TIMER
 	else
-		fuel_added = Clamp(fuel_added + amount, 0, MAXIMUM_BURN_TIMER)
+		fuel_added = CLAMP(fuel_added + amount, 0, MAXIMUM_BURN_TIMER)
 
 /obj/structure/fireplace/proc/burn_time_remaining()
 	if(lit)

code/game/objects/structures/grille.dm

@@ -30,7 +30,7 @@
 		return
 
 	var/ratio = obj_integrity / max_integrity
-	ratio = Ceiling(ratio*4) * 25
+	ratio = CEILING(ratio*4, 1) * 25
 
 	if(smooth)
 		queue_smooth(src)

code/game/objects/structures/lattice.dm

@@ -67,7 +67,7 @@
 		resistance_flags |= INDESTRUCTIBLE
 
 /obj/structure/lattice/clockwork/ratvar_act()
-	if(IsOdd(x+y))
+	if(ISODD(x+y))
 		icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
 		pixel_x = -9
 		pixel_y = -9
@@ -124,7 +124,7 @@
 		resistance_flags |= INDESTRUCTIBLE
 
 /obj/structure/lattice/catwalk/clockwork/ratvar_act()
-	if(IsOdd(x+y))
+	if(ISODD(x+y))
 		icon = 'icons/obj/smooth_structures/catwalk_clockwork_large.dmi'
 		pixel_x = -9
 		pixel_y = -9

code/game/objects/structures/musician.dm

@@ -119,7 +119,7 @@
 						else
 							cur_oct[cur_note] = text2num(ni)
 					if(user.dizziness > 0 && prob(user.dizziness / 2))
-						cur_note = Clamp(cur_note + rand(round(-user.dizziness / 10), round(user.dizziness / 10)), 1, 7)
+						cur_note = CLAMP(cur_note + rand(round(-user.dizziness / 10), round(user.dizziness / 10)), 1, 7)
 					if(user.dizziness > 0 && prob(user.dizziness / 5))
 						if(prob(30))
 							cur_acc[cur_note] = "#"

code/game/objects/structures/reflector.dm

@@ -165,7 +165,7 @@
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
 	if(!isnull(new_angle))
-		setAngle(NORM_ROT(new_angle))
+		setAngle(SIMPLIFY_DEGREES(new_angle))
 	return TRUE
 
 /obj/structure/reflector/AltClick(mob/user)
@@ -197,16 +197,12 @@
 	anchored = TRUE
 
 /obj/structure/reflector/single/auto_reflect(obj/item/projectile/P, pdir, turf/ploc, pangle)
-	var/incidence = get_angle_of_incidence(rotation_angle, P.Angle)
-	var/incidence_norm = get_angle_of_incidence(rotation_angle, P.Angle, FALSE)
-	if((incidence_norm > -90) && (incidence_norm < 90))
+	var/incidence = GET_ANGLE_OF_INCIDENCE(rotation_angle, P.Angle)
+	var/norm_inc = WRAP(incidence, -90, 90)
+	var/new_angle = WRAP(rotation_angle + norm_inc, 180, -180)
+	if(ISINRANGE_EX(norm_inc, -90, 90))
 		return FALSE
-	var/new_angle_s = rotation_angle + incidence
-	while(new_angle_s > 180)	// Translate to regular projectile degrees
-		new_angle_s -= 360
-	while(new_angle_s < -180)
-		new_angle_s += 360
-	P.Angle = new_angle_s
+	P.Angle = new_angle
 	return ..()
 
 //DOUBLE
@@ -228,17 +224,12 @@
 	anchored = TRUE
 
 /obj/structure/reflector/double/auto_reflect(obj/item/projectile/P, pdir, turf/ploc, pangle)
-	var/incidence = get_angle_of_incidence(rotation_angle, P.Angle)
-	var/incidence_norm = get_angle_of_incidence(rotation_angle, P.Angle, FALSE)
-	var/invert = ((incidence_norm > -90) && (incidence_norm < 90))
-	var/new_angle_s = rotation_angle + incidence
-	if(invert)
-		new_angle_s += 180
-	while(new_angle_s > 180)	// Translate to regular projectile degrees
-		new_angle_s -= 360
-	while(new_angle_s < -180)
-		new_angle_s += 360
-	P.Angle = new_angle_s
+	var/incidence = GET_ANGLE_OF_INCIDENCE(rotation_angle, P.Angle)
+	var/norm_inc = WRAP(incidence, -90, 90)
+	var/new_angle = WRAP(rotation_angle + norm_inc, 180, -180)
+	if(ISINRANGE_EX(norm_inc, -90, 90))
+		new_angle += 180
+	P.Angle = new_angle
 	return ..()
 
 //BOX

code/game/objects/structures/tables_racks.dm

@@ -134,8 +134,8 @@
 			if(!click_params || !click_params["icon-x"] || !click_params["icon-y"])
 				return
 			//Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
-			I.pixel_x = Clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
-			I.pixel_y = Clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
+			I.pixel_x = CLAMP(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
+			I.pixel_y = CLAMP(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
 			return 1
 	else
 		return ..()

code/game/objects/structures/window.dm

@@ -380,7 +380,7 @@
 			return
 
 		var/ratio = obj_integrity / max_integrity
-		ratio = Ceiling(ratio*4) * 25
+		ratio = CEILING(ratio*4, 1) * 25
 
 		if(smooth)
 			queue_smooth(src)