From 0cec8fad8c7702c07ec15cea3290dbc63578441d Mon Sep 17 00:00:00 2001
From: Lohikar <lohikar@protonmail.com>
Date: Fri, 11 Aug 2017 15:07:59 -0500
Subject: [PATCH] Maybe reduce ore magnet lag (#3248)

---
 code/modules/mining/mine_items.dm | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index f9ab9aa60ba..30d3adf7127 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -1082,7 +1082,6 @@ var/list/total_extraction_beacons = list()
 	force = 10
 	throwforce = 5
 	origin_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 3)
-	var/currently_pulling = FALSE
 
 /obj/item/weapon/oremagnet/attack_self(mob/user)
 	if (use_check(user))
@@ -1092,22 +1091,13 @@ var/list/total_extraction_beacons = list()
 	toggle_on(user)
 
 /obj/item/weapon/oremagnet/process()
-	set waitfor = FALSE
-
-	if (currently_pulling)
-		return
-
-	currently_pulling = TRUE
-
-	for(var/obj/item/weapon/ore/O in oview(7,src.loc))
+	for(var/obj/item/weapon/ore/O in oview(7, loc))
 		if(prob(80))
 			step_to(O, src.loc, 0)
 
-		if (TICK_CHECK && QDELING(src))
+		if (TICK_CHECK)
 			return
 
-	currently_pulling = FALSE
-
 /obj/item/weapon/oremagnet/proc/toggle_on(mob/user)
 	if (!isprocessing)
 		START_PROCESSING(SSprocessing, src)
@@ -1141,6 +1131,9 @@ var/list/total_extraction_beacons = list()
 		single_spark(O.loc)
 		do_teleport(O, user, 0)
 
+		if (TICK_CHECK)
+			return
+
 /******************************Sculpting*******************************/
 /obj/item/weapon/autochisel
 	name = "auto-chisel"