Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00
parent aa1cb22edc 7433293a3e
commit 6b9becce71
506 changed files with 10079 additions and 6600 deletions
@@ -2,6 +2,7 @@
 #define LIQUID			2
 #define GAS				3

+//reagents reaction var defines
 #define REAGENT_NORMAL_PH 7.000
 #define REAGENT_PH_ACCURACY 0.001
 #define REAGENT_PURITY_ACCURACY 0.001
@@ -16,6 +17,7 @@

 #define TRANSPARENT		(1<<4)	// Used on containers which you want to be able to see the reagents off.
 #define AMOUNT_VISIBLE	(1<<5)	// For non-transparent containers that still have the general amount of reagents in them visible.
+#define NO_REACT        (1<<6)  // Applied to a reagent holder, the contents will not react with each other.

 // Is an open container for all intents and purposes.
 #define OPENCONTAINER 	(REFILLABLE | DRAINABLE | TRANSPARENT)