Merge remote-tracking branch 'upstream/master'

2019-06-01 03:12:38 +01:00
parent 01c3f66f7c c390c3e58f
commit e58a94bcc7
100 changed files with 1729 additions and 1245 deletions
@@ -73,8 +73,11 @@
 #define	TRAIT_MUSICIAN			"musician"
 #define	TRAIT_CROCRIN_IMMUNE    "crocin_immune"
 #define TRAIT_NYMPHO			"nymphomania"
+#define TRAIT_MASO              "masochism"
 #define	TRAIT_HIGH_BLOOD        "high_blood"

+
+
 // common trait sources
 #define TRAIT_GENERIC "generic"
 #define EYE_DAMAGE "eye_damage"