Merge pull request #6 from Regalis11/master

Thunder Under The Ice repo update
This commit is contained in:
Evil Factory
2021-06-17 12:35:28 -03:00
committed by GitHub
346 changed files with 13150 additions and 4263 deletions
@@ -191,16 +191,12 @@ namespace Barotrauma.Networking
if (updateReturnTimer > 1.0f)
{
updateReturnTimer = 0.0f;
if (shuttleSteering != null)
{
shuttleSteering.SetDestinationLevelStart();
}
UpdateReturningProjSpecific();
shuttleSteering?.SetDestinationLevelStart();
UpdateReturningProjSpecific(deltaTime);
}
}
partial void UpdateReturningProjSpecific();
partial void UpdateReturningProjSpecific(float deltaTime);
private IEnumerable<object> ForceShuttleToPos(Vector2 position, float speed)
{
@@ -291,6 +287,7 @@ namespace Barotrauma.Networking
if (hull.Submarine != RespawnShuttle) { continue; }
hull.OxygenPercentage = 100.0f;
hull.WaterVolume = 0.0f;
hull.BallastFlora?.Kill();
}
foreach (Character c in Character.CharacterList)