Merge remote-tracking branch 'upstream/master' into robocoat

This commit is contained in:
necromanceranne
2021-01-09 19:02:38 +11:00
104 changed files with 1516 additions and 606 deletions
+1 -1
View File
@@ -375,7 +375,7 @@
/obj/item/paint/paint_remover = 2,
/obj/item/melee/flyswatter = 2,
/obj/item/flashlight = 2,
/obj/item/caution = 8,
/obj/item/clothing/suit/caution = 8,
/obj/item/holosign_creator = 2,
/obj/item/lightreplacer = 2,
/obj/item/soap = 2,