Merge remote-tracking branch 'origin/master' into hardsync-1.5

2021-02-23 11:01:42 +08:00
parent 2be4c76add d1475285b3
commit 5304029dd9
223 changed files with 1145 additions and 605 deletions
@@ -191,6 +191,7 @@
 #define TRAIT_MUSICIAN			"musician"
 #define TRAIT_PERMABONER		"permanent_arousal"
 #define TRAIT_NEVERBONER		"never_aroused"
+#define TRAIT_NYMPHO			"nymphomaniac"
 #define TRAIT_MASO              "masochism"
 #define	TRAIT_HIGH_BLOOD        "high_blood"
 #define TRAIT_PARA              "paraplegic"