v1.0.20.1 (summer patch)

2023-06-15 16:46:54 +03:00
parent 6acac1d143
commit 83de72e3d2
209 changed files with 4497 additions and 2488 deletions
@@ -23,9 +23,12 @@ namespace Barotrauma
        private float votingTime = 100f;
        private float timer;
        private VoteType currentVoteType;
-        private Color SubmarineColor => GUIStyle.Orange;
+        private static Color SubmarineColor => GUIStyle.Orange;
        private Point createdForResolution;

+        //timer ran out but server still hasn't notified of the result of the vote        
+        public bool TimedOut => VoteRunning && timer - votingTime > 10.0f;
+
        public static VotingInterface CreateSubmarineVotingInterface(Client starter, SubmarineInfo info, VoteType type, bool transferItems, float votingTime)
        {
            if (starter == null || info == null) { return null; }