Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

2021-05-21 18:52:16 -07:00
parent 62279e449e 310dd7129e
commit e580c504fa
188 changed files with 6486 additions and 2384 deletions
@@ -180,6 +180,7 @@
 #define FIRE_PRIORITY_PROJECTILES	200
 #define FIRE_PRIORITY_TICKER		200
 #define FIRE_PRIORITY_ATMOS_ADJACENCY	300
+#define FIRE_PRIORITY_EXPLOSIONS	350
 #define FIRE_PRIORITY_STATPANEL		390
 #define FIRE_PRIORITY_CHAT			400
 #define FIRE_PRIORITY_RUNECHAT		410
@@ -234,7 +235,6 @@
 		A.flags_1 &= ~OVERLAY_QUEUED_1;\
 	} while(FALSE)

-
 /**
 	Create a new timer and add it to the queue.
 	* Arguments: