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

2019-05-06 11:22:36 +03:00
parent b797d112b7
commit 65d627d57c
11 changed files with 237 additions and 132 deletions
@@ -86,17 +86,7 @@ namespace Barotrauma.Items.Components
        {
            get { return zoom; }
        }
-
-        //TODO: remove, only for testing
-#if DEBUG
-        [Serialize(false, false), Editable]
-        public bool DynamicDockingIndicator
-        {
-            get;
-            set;
-        }
-#endif
-
+        
        public override bool IsActive
        {
            get