Merge branch 'master' into upstream-merge-37665

2018-05-23 10:14:10 -05:00
parent 173d4fadae e4eb4939b4
commit de44ac926e
608 changed files with 10289 additions and 8565 deletions
@@ -82,6 +82,7 @@
 // Subsystem fire priority, from lowest to highest priority
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)

+#define FIRE_PRIORITY_PING			10
 #define FIRE_PRIORITY_IDLE_NPC		10
 #define FIRE_PRIORITY_SERVER_MAINT	10
 #define FIRE_PRIORITY_RESEARCH		10