merge conflicts fixed finally

2020-02-05 18:42:16 +08:00
parent 7b6d595f22 af8d6c913d
commit ee7064840d
1239 changed files with 52279 additions and 12808 deletions
@@ -152,15 +152,18 @@
 #define ORGAN_SLOT_TESTICLES "testicles"
 #define ORGAN_SLOT_BREASTS "breasts"

-
 ////organ defines
 #define STANDARD_ORGAN_THRESHOLD 	100
 #define STANDARD_ORGAN_HEALING 		0.001
 #define STANDARD_ORGAN_DECAY		0.00222		//designed to fail organs when left to decay for ~15 minutes


-
 //used for the can_chromosome var on mutations
 #define CHROMOSOME_NEVER 0
 #define CHROMOSOME_NONE 1
-#define CHROMOSOME_USED 2
+#define CHROMOSOME_USED 2
+
+#define G_MALE 1
+#define G_FEMALE 2
+#define G_PLURAL 3
+#define G_NEUTER 4