Merge remote-tracking branch 'upstream/master' into wounds-part-2

This commit is contained in:
Timothy Teakettle
2020-08-02 18:11:07 +01:00
84 changed files with 5111 additions and 4076 deletions
+1 -1
View File
@@ -120,7 +120,7 @@
new /obj/item/wrench/brass(src)
new /obj/item/crowbar/brass(src)
new /obj/item/weldingtool/experimental/brass(src)
new /obj/item/multitool(src)
new /obj/item/multitool/advanced/brass(src)
new /obj/item/stack/cable_coil(src, 30, "yellow")
/obj/item/storage/belt/medical