Merge branch 'master' into 2020-08-19-firelocks

2020-09-12 15:52:20 +02:00
parent ca7cffbc48 7cd98a4bce
commit c27ab9bf6a
20 changed files with 355 additions and 11 deletions
--- a/Content.Client/IgnoredComponents.cs
+++ b/Content.Client/IgnoredComponents.cs
@@ -177,7 +177,8 @@
            "ExtinguisherCabinetFilled",
            "FireExtinguisher",
            "Firelock",
-            "AtmosPlaque"
+            "AtmosPlaque",
+            "Spillable",
        };
    }
 }