Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master

2021-12-15 14:45:31 -03:00
parent 72f770d83b 7d43cb1e91
commit bb1631a21c
388 changed files with 12646 additions and 8136 deletions
@@ -201,7 +201,7 @@ namespace Barotrauma.Networking

        partial void UpdateReturningProjSpecific(float deltaTime);
        
-        private IEnumerable<object> ForceShuttleToPos(Vector2 position, float speed)
+        private IEnumerable<CoroutineStatus> ForceShuttleToPos(Vector2 position, float speed)
        {

 #if SERVER