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

2019-04-03 16:27:56 +03:00
parent 095a51f620
commit 311a34da80
3 changed files with 11 additions and 15 deletions
@@ -26,10 +26,6 @@ namespace Barotrauma.Items.Components

        private float blinkTimer;
        
-        private bool itemLoaded;
-
-        private float blinkTimer;
-        
        public PhysicsBody ParentBody;

        [Editable(MinValueFloat = 0.0f, MaxValueFloat = 2048.0f), Serialize(100.0f, true)]