Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27

2019-06-02 19:03:34 +02:00
parent da4ce71ba3 6e6a1f4615
commit 472d7ef8cd
57 changed files with 588 additions and 65 deletions
@@ -71,6 +71,7 @@
 #define	TRAIT_MUSICIAN			"musician"
 #define	TRAIT_CROCRIN_IMMUNE    "crocin_immune"
 #define TRAIT_NYMPHO			"nymphomania"
+#define TRAIT_MASO              "masochism"

 // common trait sources
 #define TRAIT_GENERIC "generic"