Merge remote-tracking branch 'origin/master' into rustsql

2021-02-23 11:36:05 +08:00
parent 0bb5ec3316 d1475285b3
commit 5c39381117
222 changed files with 1149 additions and 610 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"