From 14128362014d209b1224dd79fbaf73c1ed0f7fbd Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 17 Dec 2017 17:51:20 -0600
Subject: [PATCH] Update orbit.dm

---
 code/controllers/subsystem/orbit.dm | 49 -----------------------------
 1 file changed, 49 deletions(-)

diff --git a/code/controllers/subsystem/orbit.dm b/code/controllers/subsystem/orbit.dm
index 9567fb95a2..581b7821b2 100644
--- a/code/controllers/subsystem/orbit.dm
+++ b/code/controllers/subsystem/orbit.dm
@@ -1,49 +1,3 @@
-<<<<<<< HEAD
-SUBSYSTEM_DEF(orbit)
-	name = "Orbits"
-	priority = 35
-	wait = 2
-	flags = SS_NO_INIT|SS_TICKER
-
-	var/list/currentrun = list()
-	var/list/processing = list()
-
-/datum/controller/subsystem/orbit/stat_entry()
-	..("P:[processing.len]")
-
-
-/datum/controller/subsystem/orbit/fire(resumed = 0)
-	if (!resumed)
-		src.currentrun = processing.Copy()
-
-	//cache for sanic speed (lists are references anyways)
-	var/list/currentrun = src.currentrun
-
-	while (currentrun.len)
-		var/datum/orbit/O = currentrun[currentrun.len]
-		currentrun.len--
-		if (!O)
-			processing -= O
-			if (MC_TICK_CHECK)
-				return
-			continue
-		if (!O.orbiter)
-			qdel(O)
-			if (MC_TICK_CHECK)
-				return
-			continue
-		if (O.lastprocess >= world.time) //we already checked recently
-			if (MC_TICK_CHECK)
-				return
-			continue
-		var/targetloc = get_turf(O.orbiting)
-		if (targetloc != O.lastloc || O.orbiter.loc != targetloc)
-			O.Check(targetloc)
-		if (MC_TICK_CHECK)
-			return
-
-
-=======
 SUBSYSTEM_DEF(orbit)
 	name = "Orbits"
 	priority = FIRE_PRIORITY_ORBIT
@@ -86,6 +40,3 @@ SUBSYSTEM_DEF(orbit)
 			O.Check(targetloc)
 		if (MC_TICK_CHECK)
 			return
-
-
->>>>>>> 0244b61... Merge pull request #33537 from ninjanomnom/priority-defines