Testmerge Conflict fix?

2020-01-22 20:17:42 +01:00
parent 8b21a60ac9
commit 255f2ce449
30 changed files with 1585 additions and 1588 deletions
@@ -108,7 +108,10 @@
 #define NUKE_ON_TIMING		2
 #define NUKE_ON_EXPLODING	3

+#define MACHINE_NOT_ELECTRIFIED 0
+#define MACHINE_ELECTRIFIED_PERMANENT -1
+#define MACHINE_DEFAULT_ELECTRIFY_TIME 30

 //these flags are used to tell the DNA modifier if a plant gene cannot be extracted or modified.
 #define PLANT_GENE_REMOVABLE	(1<<0)
-#define PLANT_GENE_EXTRACTABLE	(1<<1)
+#define PLANT_GENE_EXTRACTABLE	(1<<1)