Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/modules/mining/machine_redemption.dm

@@ -145,8 +145,11 @@
 			D.createmessage("Ore Redemption Machine", "New minerals available!", msg, 1, 0)
 
 /obj/machinery/mineral/ore_redemption/process()
-	if(!materials.mat_container || panel_open || !powered())
-		return
+	if(materials.mat_container && !panel_open && powered())
+		process_all_ores()
+
+/obj/machinery/mineral/ore_redemption/proc/process_all_ores()
+	set waitfor = FALSE
 	var/atom/input = get_step(src, input_dir)
 	var/obj/structure/ore_box/OB = locate() in input
 	if(OB)
@@ -165,6 +168,7 @@
 	else if(!message_sent)
 		send_console_message()
 
+
 /obj/machinery/mineral/ore_redemption/attackby(obj/item/W, mob/user, params)
 	if(default_unfasten_wrench(user, W))
 		return

code/modules/mining/machine_unloading.dm

@@ -10,22 +10,25 @@
 	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/stack/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)
+/obj/machinery/mineral/unloading_machine/proc/horrible_quadratic_monster(var/turf/T)
+	set waitfor = FALSE
+	var/limit = 0
+	for(var/obj/structure/ore_box/B in T)
+		for (var/obj/item/stack/ore/O in B)
+			B.contents -= O
+			unload_mineral(O)
 			limit++
 			if (limit>=10)
 				return
 			CHECK_TICK
+	for(var/obj/item/I in T)
+		unload_mineral(I)
+		limit++
+		if (limit>=10)
+			return
+		CHECK_TICK
+
+/obj/machinery/mineral/unloading_machine/process()
+	var/turf/T = get_step(src,input_dir)
+	if(T)
+		horrible_quadratic_monster(T)

code/modules/mining/mint.dm

@@ -64,8 +64,6 @@
 			if(materials.use_amount_mat(coin_mat, chosen))
 				for(var/coin_to_make in 1 to 5)
 					create_coins()
-					produced_coins++
-					CHECK_TICK
 			else
 				var/found_new = FALSE
 				for(var/datum/material/inserted_material in materials.materials)
@@ -131,6 +129,7 @@
 		return TRUE
 
 /obj/machinery/mineral/mint/proc/create_coins()
+	set waitfor = FALSE
 	var/turf/T = get_step(src,output_dir)
 	var/temp_list = list()
 	temp_list[chosen] = 400
@@ -143,3 +142,5 @@
 			O.forceMove(bag_to_use) //don't bother sending the signal, the new bag is empty and all that.
 
 		SSblackbox.record_feedback("amount", "coins_minted", 1)
+	produced_coins++
+	CHECK_TICK