(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -58,13 +58,6 @@ namespace Barotrauma.Items.Components
            set;
        }

-        [Serialize(true, true)]
-        public bool Aimable
-        {
-            get;
-            set;
-        }
-
        [Serialize(false, false)]
        public bool ControlPose
        {