Merge branch 'master' into patch-28

This commit is contained in:
kappa-sama
2020-07-01 07:48:46 -04:00
committed by GitHub
11 changed files with 82 additions and 111 deletions
@@ -424,7 +424,6 @@
category = CAT_WEAPONRY
subcategory = CAT_PARTS
// MISC
/datum/crafting_recipe/trigger_assembly