Merge branch 'master' into upstream-merge-10095

This commit is contained in:
Nadyr
2021-04-11 03:34:32 -04:00
committed by GitHub
88 changed files with 20382 additions and 20572 deletions
-1
View File
@@ -85,7 +85,6 @@
name = "welding mask"
path =/obj/item/clothing/head/welding
//TFF 24/12/19 - Let people print more spray bottles if needed.
/datum/category_item/autolathe/general/spraybottle
name = "spray bottle"
path = /obj/item/weapon/reagent_containers/spray