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

2021-06-27 10:44:51 -07:00
parent c1928c9446 11ce23ae79
commit 08f251a88c
209 changed files with 13698 additions and 2095 deletions
@@ -518,6 +518,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S

 #define VOMIT_TOXIC 1
 #define VOMIT_PURPLE 2
+#define VOMIT_NANITE 3

 // possible bitflag return values of intercept_zImpact(atom/movable/AM, levels = 1) calls
 #define FALL_INTERCEPTED		(1<<0) //Stops the movable from falling further and crashing on the ground