Merge branch 'master' into kitchen

2020-05-05 11:35:20 +02:00
parent c8e2624390 fbaafa8366
commit fe23fdb620
112 changed files with 2184 additions and 408 deletions
--- a/Content.Shared/GameObjects/ContentNetIDs.cs
+++ b/Content.Shared/GameObjects/ContentNetIDs.cs
@@ -43,5 +43,6 @@
        public const uint REAGENT_INJECTOR = 1038;
        public const uint GHOST = 1039;
        public const uint MICROWAVE = 1040;
+        public const uint GRAVITY_GENERATOR = 1041;
    }
 }