Merge branch 'master' into donut

2019-12-17 15:12:51 -05:00
parent 285833c8d3 8b61c07713
commit 0f5c8db456
700 changed files with 12811 additions and 3750 deletions
@@ -55,6 +55,9 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \
 /obj/item/stack/sheet/mineral/sandstone/thirty
 	amount = 30

+/obj/item/stack/sheet/mineral/sandstone/twelve
+	amount = 12
+
 /*
 * Sandbags
 */