Merge branch 'master' into A_Tailer's_art

2019-10-18 00:21:42 -04:00
parent 0b2c743f72 9fd95537bc
commit 18c9283d4a
735 changed files with 70862 additions and 61813 deletions
@@ -9,3 +9,4 @@
 	var/category = CAT_NONE //where it shows up in the crafting UI
 	var/subcategory = CAT_NONE
 	var/always_availible = TRUE //Set to FALSE if it needs to be learned first.
+