Merge branch 'master' into Reagents_bitflats

2019-10-08 07:31:03 +01:00
parent 27c2c89766 1cfcfb8e2e
commit 564c1fde9f
132 changed files with 1927 additions and 479 deletions
@@ -192,4 +192,14 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"REACTION_CLEAR_IMPURE"  = REACTION_CLEAR_IMPURE,
 		"REACTION_CLEAR_INVERSE" = REACTION_CLEAR_INVERSE
 		),
-	))
+
+    ),
+    "organ_flags" = list(
+      "ORGAN_SYNTHETIC" = ORGAN_SYNTHETIC,
+      "ORGAN_FROZEN" = ORGAN_FROZEN,
+      "ORGAN_FAILING" = ORGAN_FAILING,
+      "ORGAN_EXTERNAL" = ORGAN_EXTERNAL,
+      "ORGAN_VITAL" = ORGAN_VITAL,
+      "ORGAN_NO_SPOIL" = ORGAN_NO_SPOIL
+    ),
+	  ))