Unstable 0.1400.0.0

2021-05-11 15:47:47 +03:00
parent 3f324b14e8
commit 92f0264af2
247 changed files with 8238 additions and 1911 deletions
@@ -635,6 +635,13 @@ namespace Barotrauma.Networking
            set;
        }

+        [Serialize(false, true)]
+        public bool AllowLinkingWifiToChat
+        {
+            get;
+            set;
+        }
+
        [Serialize(true, true)]
        public bool AllowFriendlyFire
        {