Update machine_unloading.dm

code/modules/mining/machine_unloading.dm

@@ -1,36 +1,12 @@
-/**********************Unloading unit**************************/
-
-
-/obj/machinery/mineral/unloading_machine
-	name = "unloading machine"
-	icon = 'icons/obj/machines/mining_machines.dmi'
-	icon_state = "unloader"
+/**********************Unloading unit**************************/
+
+
+/obj/machinery/mineral/unloading_machine
+	name = "unloading machine"
+	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon_state = "unloader"
 	density = TRUE
 	anchored = TRUE
-<<<<<<< HEAD
-	input_dir = WEST
-	output_dir = EAST
-	speed_process = 1
-
-/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
-=======
 	input_dir = WEST
 	output_dir = EAST
 	speed_process = TRUE
@@ -53,5 +29,4 @@
 			limit++
 			if (limit>=10)
 				return
->>>>>>> 8ccaba1... Merge pull request #32453 from Jalleo/machinery_refactor
-			CHECK_TICK
+			CHECK_TICK