Merge branch 'master' into master

2019-07-09 05:33:09 +01:00
parent 1b3de620f9 e56fc559ed
commit c418312cc6
109 changed files with 1451 additions and 965 deletions
@@ -17,6 +17,7 @@
 #define INVESTIGATE_NANITES			"nanites"
 #define INVESTIGATE_CIRCUIT			"circuit"
 #define INVESTIGATE_FERMICHEM       "fermichem"
+#define INVESTIGATE_RCD				"rcd"

 // Logging types for log_message()
 #define LOG_ATTACK		(1 << 0)