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

2019-04-04 11:09:45 +03:00
parent 1966bcb4ab
commit 41da4e24a9
17 changed files with 590 additions and 71 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)]