- sonar shows the outlines of docked subs (instead of normal sonar blips)

- fixed lights not being removed if the same explosion is triggered again before the previous one is finished
- fixed electrical shocks from junction boxes stunning nearby players (and not just the player using the jb)
- showing restart timer as mins + secs
- more server settings

Subsurface/Source/Utils/ToolBox.cs

@@ -411,6 +411,23 @@ namespace Barotrauma
             return wrappedText.ToString();
         }
 
+        public static string SecondsToReadableTime(float seconds)
+        {
+            if (seconds <= 60.0f)
+            {
+                return (int)seconds + " s";
+            }
+            else
+            {
+                int m = (int)(seconds / 60.0f);
+                int s = (int)(seconds % 60.0f);
+
+                return s == 0 ?
+                    m + " m" :
+                    m + " m " + s + " s";
+            }
+        }
+
         public static string GetRandomLine(string filePath)
         {
             try