Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers

2019-09-16 18:06:36 -05:00
parent 6d1a4fce16 9d32611e64
commit 661c357aeb
76 changed files with 3276 additions and 3388 deletions
@@ -27,8 +27,10 @@
 							"human",
 							"lizard",
 							"fly",
-							"moth",
+							"insect",
 							"plasmaman",
+							"mammal",
+							"xeno",
 							"other"
 							)