Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs

@@ -69,6 +69,7 @@ namespace Barotrauma.Networking
         }
 
         public static readonly string PermissionPresetFile = "Data" + Path.DirectorySeparatorChar + "permissionpresets.xml";
+        public static readonly string PermissionPresetFileCustom = "Data" + Path.DirectorySeparatorChar + "permissionpresets_player.xml";
 
         public string Name
         {
@@ -285,7 +286,9 @@ namespace Barotrauma.Networking
 
             HiddenSubs = new HashSet<string>();
 
+            PermissionPreset.List.Clear();
             PermissionPreset.LoadAll(PermissionPresetFile);
+            PermissionPreset.LoadAll(PermissionPresetFileCustom);
             InitProjSpecific();
 
             ServerName = serverName;
@@ -615,6 +618,19 @@ namespace Barotrauma.Networking
             }
         }
 
+        private bool allowAFK;
+        [Serialize(true, IsPropertySaveable.Yes)]
+        public bool AllowAFK
+        {
+            get { return allowAFK; }
+            private set
+            {
+                if (allowAFK == value) { return; }
+                allowAFK = value;
+                ServerDetailsChanged = true;
+            }
+        }
+
         [Serialize(true, IsPropertySaveable.Yes)]
         public bool SaveServerLogs
         {
@@ -996,7 +1012,7 @@ namespace Barotrauma.Networking
         public float KillDisconnectedTime
         {
             get;
-            private set;
+            set;
         }
         
         /// <summary>