Merge remote-tracking branch 'upstream/dev' into develop

2022-12-09 17:33:44 -03:00
parent 83c9c25164 6f788fb8b4
commit 90c3cef977
416 changed files with 12674 additions and 5862 deletions
@@ -65,7 +65,7 @@ namespace Barotrauma.Networking

        public State CurrentState { get; private set; }

-        public bool UseRespawnPrompt
+        public static bool UseRespawnPrompt
        {
            get
            {
@@ -199,6 +199,7 @@ namespace Barotrauma.Networking
        public void ForceRespawn()
        {
            ResetShuttle();
+            RespawnCountdownStarted = true;
            RespawnTime = DateTime.Now;
            CurrentState = State.Waiting;
        }
@@ -274,7 +275,7 @@ namespace Barotrauma.Networking
                var powerContainer = item.GetComponent<PowerContainer>();
                if (powerContainer != null)
                {
-                    powerContainer.Charge = powerContainer.Capacity;
+                    powerContainer.Charge = powerContainer.GetCapacity();
                }

                var door = item.GetComponent<Door>();