Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

2020-09-25 01:03:15 -07:00
parent 15d04caa43 d18e47d9e1
commit 57c4a3416a
24 changed files with 256 additions and 206 deletions
@@ -122,6 +122,7 @@
 #define FIRE_PRIORITY_PROJECTILES	200
 #define FIRE_PRIORITY_TICKER		200
 #define FIRE_PRIORITY_ATMOS_ADJACENCY	300
+#define FIRE_PRIORITY_STATPANEL		390
 #define FIRE_PRIORITY_CHAT			400
 #define FIRE_PRIORITY_OVERLAYS		500
 #define FIRE_PRIORITY_INPUT			1000 // This must always always be the max highest priority. Player input must never be lost.