Update subsystems.dm

2017-11-22 20:07:57 -05:00
parent c2c22d56c7
commit 5fb8856480
1 changed files with 5 additions and 17 deletions
@@ -46,27 +46,15 @@
 #define INIT_ORDER_DBCORE 18
 #define INIT_ORDER_BLACKBOX 17
 #define INIT_ORDER_SERVER_MAINT 16
-<<<<<<< HEAD
 #define INIT_ORDER_EVENTS 15
 #define INIT_ORDER_JOBS 14
 #define INIT_ORDER_TICKER 13
 #define INIT_ORDER_MAPPING 12
 #define INIT_ORDER_ATOMS 11
-#define INIT_ORDER_LANGUAGE 10
-#define INIT_ORDER_MACHINES 9
-#define INIT_ORDER_CIRCUIT 8
-=======
-#define INIT_ORDER_RESEARCH 15
-#define INIT_ORDER_EVENTS 14
-#define INIT_ORDER_JOBS 13
-#define INIT_ORDER_TICKER 12
-#define INIT_ORDER_MAPPING 11
-#define INIT_ORDER_ATOMS 10
-#define INIT_ORDER_NETWORKS 9
-#define INIT_ORDER_LANGUAGE 8
-#define INIT_ORDER_MACHINES 7
-#define INIT_ORDER_CIRCUIT 6
->>>>>>> 92632ec... Merge pull request #32914 from kevinz000/NTNet
+#define INIT_ORDER_NETWORKS 10
+#define INIT_ORDER_LANGUAGE 9
+#define INIT_ORDER_MACHINES 8
+#define INIT_ORDER_CIRCUIT 7
 #define INIT_ORDER_TIMER 1
 #define INIT_ORDER_DEFAULT 0
 #define INIT_ORDER_AIR -1
@@ -113,4 +101,4 @@
 			A.overlays.Cut();\
 		}\
 		A.flags_1 &= ~OVERLAY_QUEUED_1;\
-	}
+	}