Merge pull request #101 from Crystalwarrior/moRags

Body shoulder-grab, better CPR anims, CPR and Crit overhaul!
2017-12-20 19:37:38 +02:00
parent ce37411a29 e56f5c4946
commit dde320b387
11 changed files with 370 additions and 64 deletions
@@ -133,6 +133,13 @@ namespace Barotrauma.Networking
            private set;
        }

+        [Serialize(true, true)]
+        public bool AllowRagdollButton
+        {
+            get;
+            private set;
+        }
+
        [Serialize(true, true)]
        public bool AllowFileTransfers
        {
@@ -213,6 +220,20 @@ namespace Barotrauma.Networking
            private set;
        }

+        [Serialize(true, true)]
+        public bool traitorUseRatio
+        {
+            get;
+            private set;
+        }
+
+        [Serialize(0.2f, true)]
+        public float traitorRatio
+        {
+            get;
+            private set;
+        }
+
        [Serialize(false,true)]
        public bool KarmaEnabled
        {