Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513

[MIRROR] Adds traits for a character's preference towards pineapples.
2018-05-02 01:25:04 +00:00
parent ea5725cc4e 43d29006dc
commit d26ba53e91
5 changed files with 39 additions and 4 deletions
@@ -10,3 +10,4 @@
 #define SUGAR 		(1<<9)
 #define GROSS 		(1<<10)
 #define TOXIC 		(1<<11)
+#define PINEAPPLE	(1<<12)