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

2019-04-03 16:24:20 +03:00
parent 516159fe43
commit 64bec6d3b9
7 changed files with 29 additions and 70 deletions
@@ -26,6 +26,10 @@ 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)]