Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2024-01-11 11:42:33 -03:00
parent 8b3d8ba027 27bceae853
commit 40beade15a
20 changed files with 263 additions and 137 deletions
@@ -3141,6 +3141,7 @@ namespace Barotrauma
            if (character.IsDead) { return; }
            if (!UseInHealthInterface) { return; }

+            GameAnalyticsManager.AddDesignEvent("ApplyTreatment:" + Prefab.Identifier);
 #if CLIENT
            if (user == Character.Controlled)
            {
@@ -834,7 +834,7 @@ namespace Barotrauma
        [Serialize(true, IsPropertySaveable.No)]
        public bool CanFlipY { get; private set; }

-        [Serialize(0.1f, IsPropertySaveable.No)]
+        [Serialize(0.01f, IsPropertySaveable.No)]
        public float MinScale { get; private set; }

        [Serialize(10.0f, IsPropertySaveable.No)]