Merge remote-tracking branch 'upstream/master' into TGUI_Updoot

code/modules/paperwork/photocopier.dm

@@ -187,12 +187,13 @@
  */
 /obj/machinery/photocopier/proc/do_copy_loop(datum/callback/copy_cb, mob/user)
 	busy = TRUE
-	var/i
-	for(i in 1 to num_copies)
+	var/num_loops
+	for(var/i in 1 to num_copies)
 		//if(attempt_charge(src, user) & COMPONENT_OBJ_CANCEL_CHARGE)
 		//	break
 		addtimer(copy_cb, i SECONDS)
-	addtimer(CALLBACK(src, .proc/reset_busy), i SECONDS)
+		num_loops++
+	addtimer(CALLBACK(src, .proc/reset_busy), num_loops SECONDS)
 
 /**
  * Sets busy to `FALSE`. Created as a proc so it can be used in callbacks.