Merge branch 'master' into cargocleanupv2boogaloo

This commit is contained in:
Winter Flare
2019-12-06 01:27:44 -05:00
178 changed files with 9182 additions and 6523 deletions
+1 -1
View File
@@ -133,7 +133,7 @@
name = "Loom"
desc = "A large pre-made loom."
cost = 1000
contains = list(/obj/structure/loom)
contains = list(/obj/structure/loom/unanchored)
crate_name = "loom crate"
crate_type = /obj/structure/closet/crate/large