Merge branch 'master' into pr/7

2019-05-10 02:20:19 +01:00
parent 49a012ea87 e473103597
commit 5287f3f9c7
17 changed files with 4877 additions and 78 deletions
@@ -2,6 +2,11 @@
 #define LIQUID			2
 #define GAS				3

+#define REAGENT_NORMAL_PH 7.000
+#define REAGENT_PH_ACCURACY 0.001
+#define REAGENT_PURITY_ACCURACY 0.001
+#define DEFAULT_SPECIFIC_HEAT 200
+
 // container_type defines
 #define INJECTABLE		(1<<0)	// Makes it possible to add reagents through droppers and syringes.
 #define DRAWABLE		(1<<1)	// Makes it possible to remove reagents through syringes.