Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real

2020-05-12 13:34:31 -07:00
parent 458c072cf6 ffc7211444
commit 8458f97692
260 changed files with 2810 additions and 1298 deletions
@@ -64,7 +64,8 @@
 #define INIT_ORDER_TICKER			55
 #define INIT_ORDER_INSTRUMENTS		53
 #define INIT_ORDER_MAPPING			50
-#define INIT_ORDER_NETWORKS			45
+#define INIT_ORDER_ECONOMY			45
+#define INIT_ORDER_NETWORKS			40
 #define INIT_ORDER_HOLODECK			35
 #define INIT_ORDER_ATOMS			30
 #define INIT_ORDER_LANGUAGE			25