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.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
+++ b/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
@@ -74,7 +74,7 @@ namespace Content.Server.GameObjects.Components.Movement
            }
        }

-        public void SetSprinting(ushort subTick, bool enabled)
+        public void SetSprinting(ushort subTick, bool walking)
        {
            // Shuttles can't sprint.
        }