Merge branch 'master' into 20-06-24-movement-prediction

2020-06-24 04:04:43 +02:00
parent da45a52325 78085855db
commit f3a816321c
2259 changed files with 16436 additions and 11772 deletions
--- a/Content.Shared/GameObjects/ContentNetIDs.cs
+++ b/Content.Shared/GameObjects/ContentNetIDs.cs
@@ -5,7 +5,7 @@
    {
        public const uint DAMAGEABLE = 1000;
        public const uint DESTRUCTIBLE = 1001;
-        public const uint BALLISTIC_MAGAZINE_WEAPON = 1002;
+        public const uint MAGAZINE_BARREL = 1002;
        public const uint HANDS = 1003;
        public const uint SOLUTION = 1004;
        public const uint STORAGE = 1005;
@@ -55,6 +55,8 @@
        public const uint HUNGER = 1049;
        public const uint THIRST = 1050;

+        public const uint FLASHABLE = 1051;
+
        // Net IDs for integration tests.
        public const uint PREDICTION_TEST = 10001;
    }