(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -11,5 +11,15 @@ namespace Barotrauma.Networking
                respawnTimer = Math.Max(0.0f, respawnTimer - deltaTime);
            }
        }
+
+        partial void UpdateTransportingProjSpecific(float deltaTime)
+        {
+            if (shuttleTransportTimer + deltaTime > 15.0f && shuttleTransportTimer <= 15.0f &&
+                GameMain.Client?.Character != null &&
+                GameMain.Client.Character.Submarine == respawnShuttle)
+            {
+                GameMain.Client.AddChatMessage("ServerMessage.ShuttleLeaving", ChatMessageType.Server);
+            }
+        }
    }
 }