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

2021-03-03 17:09:01 +08:00
parent 5304029dd9 c0d62c4969
commit 754c24748e
122 changed files with 2913 additions and 1722 deletions
@@ -132,6 +132,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NODROP" = TRAIT_NODROP,
 		"TRAIT_NO_TELEPORT" = TRAIT_NO_TELEPORT,
 		"TRAIT_SPOOKY_THROW" = TRAIT_SPOOKY_THROW
+		),
+	/datum/mind = list(
+		"TRAIT_CLOWN_MENTALITY" = TRAIT_CLOWN_MENTALITY
 		)
 	))