Merge branch 'master' into 2020-04-28-tool-component

2020-05-11 12:24:43 +02:00
parent 2c4354c95a 63b0df5ba2
commit 6ae5e36a18
114 changed files with 3532 additions and 531 deletions
--- a/Content.Shared/GameObjects/ContentNetIDs.cs
+++ b/Content.Shared/GameObjects/ContentNetIDs.cs
@@ -42,5 +42,7 @@
        public const uint PAPER = 1037;
        public const uint REAGENT_INJECTOR = 1038;
        public const uint GHOST = 1039;
+        public const uint MICROWAVE = 1040;
+        public const uint GRAVITY_GENERATOR = 1041;
    }
 }