Unstable 1.1.14.0

This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -14,7 +14,7 @@ namespace Barotrauma.Networking
/// <summary>
/// How much skills drop towards the job's default skill levels when dying
/// </summary>
const float SkillReductionOnDeath = 0.75f;
public static float SkillLossPercentageOnDeath => GameMain.NetworkMember?.ServerSettings?.SkillLossPercentageOnDeath ?? 50.0f;
public enum State
{
@@ -26,7 +26,6 @@ namespace Barotrauma.Networking
private readonly NetworkMember networkMember;
private readonly Steering shuttleSteering;
private readonly List<Door> shuttleDoors;
private const string RespawnContainerTag = "respawncontainer";
private readonly ItemContainer respawnContainer;
//items created during respawn
@@ -109,7 +108,7 @@ namespace Barotrauma.Networking
{
if (item.Submarine != RespawnShuttle) { continue; }
if (item.HasTag(RespawnContainerTag))
if (item.HasTag(Tags.RespawnContainer))
{
respawnContainer = item.GetComponent<ItemContainer>();
}