From 5fb8856480f82d3ed8bc9b26a9537798eff8b16a Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 22 Nov 2017 20:07:57 -0500 Subject: [PATCH] Update subsystems.dm --- code/__DEFINES/subsystems.dm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 1252e167c2..7e49a437bb 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -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;\ - } \ No newline at end of file + }