diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 286bcee1f8..baa31f7f27 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -119,10 +119,9 @@ Class Procs:
 	var/critical_machine = FALSE //If this machine is critical to station operation and should have the area be excempted from power failures.
 	var/list/occupant_typecache //if set, turned into typecache in Initialize, other wise, defaults to mob/living typecache
 	var/atom/movable/occupant = null
-	var/unsecuring_tool = /obj/item/wrench
 	var/interact_open = FALSE // Can the machine be interacted with when in maint/when the panel is open.
 	var/interact_offline = 0 // Can the machine be interacted with while de-powered.
-	var/speed_process = 0 // Process as fast as possible?
+	var/speed_process = FALSE // Process as fast as possible?
 	var/obj/item/circuitboard/circuit // Circuit to be created and inserted when the machinery is created
 
 /obj/machinery/Initialize()
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index 75c0f94ac4..dc0341f853 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -10,7 +10,7 @@
 	anchored = TRUE
 	var/obj/machinery/mineral/processing_unit/machine = null
 	var/machinedir = EAST
-	speed_process = 1
+	speed_process = TRUE
 
 /obj/machinery/mineral/processing_unit_console/Initialize()
 	. = ..()
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 437073a1fc..0b1a988fc2 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -11,7 +11,7 @@
 	input_dir = NORTH
 	output_dir = SOUTH
 	req_access = list(ACCESS_MINERAL_STOREROOM)
-	speed_process = 1
+	speed_process = TRUE
 	circuit = /obj/item/circuitboard/machine/ore_redemption
 	var/req_access_reclaim = ACCESS_MINING_STATION
 	var/obj/item/card/id/inserted_id
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index c2bf0849bb..af3a720494 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -9,7 +9,7 @@
 	anchored = TRUE
 	var/obj/machinery/mineral/stacking_machine/machine = null
 	var/machinedir = SOUTHEAST
-	speed_process = 1
+	speed_process = TRUE
 
 /obj/machinery/mineral/stacking_unit_console/Initialize()
 	. = ..()
diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm
index 8192b0fc6a..b0035a4700 100644
--- a/code/modules/mining/machine_unloading.dm
+++ b/code/modules/mining/machine_unloading.dm
@@ -7,6 +7,7 @@
 	icon_state = "unloader"
 	density = TRUE
 	anchored = TRUE
+<<<<<<< HEAD
 	input_dir = WEST
 	output_dir = EAST
 	speed_process = 1
@@ -29,4 +30,28 @@
 			limit++
 			if (limit>=10)
 				return
+=======
+	input_dir = WEST
+	output_dir = EAST
+	speed_process = TRUE
+
+/obj/machinery/mineral/unloading_machine/process()
+	var/turf/T = get_step(src,input_dir)
+	if(T)
+		var/limit
+		for(var/obj/structure/ore_box/B in T)
+			for (var/obj/item/ore/O in B)
+				B.contents -= O
+				unload_mineral(O)
+				limit++
+				if (limit>=10)
+					return
+				CHECK_TICK
+			CHECK_TICK
+		for(var/obj/item/I in T)
+			unload_mineral(I)
+			limit++
+			if (limit>=10)
+				return
+>>>>>>> 8ccaba1... Merge pull request #32453 from Jalleo/machinery_refactor
 			CHECK_TICK
\ No newline at end of file
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index 1a4e4c5ed1..ccd3a00e7b 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -11,7 +11,7 @@
 	var/processing = FALSE
 	var/chosen = MAT_METAL //which material will be used to make coins
 	var/coinsToProduce = 10
-	speed_process = 1
+	speed_process = TRUE
 
 
 /obj/machinery/mineral/mint/Initialize()
@@ -22,7 +22,7 @@
 	var/turf/T = get_step(src, input_dir)
 	if(!T)
 		return
-	
+
 	GET_COMPONENT(materials, /datum/component/material_container)
 	for(var/obj/item/stack/sheet/O in T)
 		materials.insert_stack(O, O.amount)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 1ab1a46723..6d541dad1a 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -17,7 +17,7 @@
 	var/list/affecting	// the list of all items that will be moved this ptick
 	var/id = ""			// the control ID	- must match controller ID
 	var/verted = 1		// set to -1 to have the conveyour belt be inverted, so you can use the other corner icons
-	speed_process = 1
+	speed_process = TRUE
 
 /obj/machinery/conveyor/centcom_auto
 	id = "round_end_belt"
@@ -208,7 +208,7 @@
 
 	var/list/conveyors		// the list of converyors that are controlled by this switch
 	anchored = TRUE
-	speed_process = 1
+	speed_process = TRUE
 
 
 
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index d13ab3f329..1fbdfb6fb8 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -126,7 +126,6 @@
 	desc = "Long range bluespace artillery."
 	icon = 'icons/obj/lavaland/cannon.dmi'
 	icon_state = "orbital_cannon1"
-	unsecuring_tool = null
 	var/static/mutable_appearance/top_layer
 	var/ex_power = 3
 	var/power_used_per_shot = 2000000 //enough to kil standard apc - todo : make this use wires instead and scale explosion power with it