(143d158cb) Merge branch 'dev' into human-ai

2019-05-16 05:25:02 +03:00
parent 9fab69663b
commit e4f41789b0
18 changed files with 594 additions and 814 deletions
@@ -128,7 +128,7 @@ namespace Barotrauma
        protected Color flashColor;
        protected float flashDuration = 1.5f;
        private bool useRectangleFlash;
-        public float FlashTimer
+        public virtual float FlashTimer
        {
            get { return flashTimer; }
        }