Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00
parent cfeea088e8 2609dc109f
commit ac5503d338
687 changed files with 9555 additions and 5558 deletions
@@ -33,6 +33,7 @@
 #define GENETICS_SPELL "genetics_spell"
 #define TRAUMA_DISABILITY "trauma"

+
 // bitflags for machine stat variable
 #define BROKEN		1
 #define NOPOWER		2