(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -122,6 +122,16 @@ namespace Barotrauma.Items.Components
            Update(deltaTime, cam);
        }

+        public void ResetDeterioration()
+        {
+            deteriorationTimer = Rand.Range(MinDeteriorationDelay, MaxDeteriorationDelay);
+            item.Condition = item.Prefab.Health;
+#if SERVER
+            //let the clients know the initial deterioration delay
+            item.CreateServerEvent(this);
+#endif
+        }
+
        public override void Update(float deltaTime, Camera cam)
        {
            UpdateProjSpecific(deltaTime);