0.1500.3.0 (🗿 edition)

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Deconstructor.cs

@@ -256,6 +256,17 @@ namespace Barotrauma.Items.Components
                 }
             }
 
+            if (user != null && !user.Removed)
+            {
+                var deconstructItemRetainProbability = new AbilityValueItem(0f, targetItem.Prefab);
+                user.CheckTalents(AbilityEffectType.OnItemDeconstructedRetainProbability, deconstructItemRetainProbability);
+
+                if (deconstructItemRetainProbability.Value > Rand.Range(0f, 1f, Rand.RandSync.Unsynced))
+                {
+                    allowRemove = false;
+                }
+            }
+
             if (targetItem.AllowDeconstruct && allowRemove)
             {
                 //drop all items that are inside the deconstructed item

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Fabricator.cs

@@ -24,12 +24,6 @@ namespace Barotrauma.Items.Components
 
         private Character user;
 
-        public float FabricationSpeedMultiplier
-        {
-            get;
-            set;
-        }
-
         private ItemContainer inputContainer, outputContainer;
         
         [Serialize(1.0f, true)]
@@ -249,7 +243,6 @@ namespace Barotrauma.Items.Components
             var availableIngredients = GetAvailableIngredients();
             if (fabricatedItem == null || !CanBeFabricated(fabricatedItem, availableIngredients, user))
             {
-                FabricationSpeedMultiplier = 1f;
                 CancelFabricating();
                 return;
             }
@@ -286,8 +279,7 @@ namespace Barotrauma.Items.Components
 
             if (powerConsumption <= 0) { Voltage = 1.0f; }
 
-            timeUntilReady -= deltaTime * Math.Min(Voltage, 1.0f) * FabricationSpeedMultiplier;
-            FabricationSpeedMultiplier = 1f;
+            timeUntilReady -= deltaTime * Math.Min(Voltage, 1.0f);
 
             UpdateRequiredTimeProjSpecific();
 
@@ -328,13 +320,21 @@ namespace Barotrauma.Items.Components
 
                 var fabricationValueItem = new AbilityValueItem(fabricatedItem.Amount, fabricatedItem.TargetItem);
 
-                if (user != null)
+                int quality = 0;
+                if (user?.Info != null)
                 {
                     foreach (Character character in Character.CharacterList.Where(c => c.TeamID == user.TeamID))
                     {
                         character.CheckTalents(AbilityEffectType.OnAllyItemFabricatedAmount, fabricationValueItem);
                     }
                     user.CheckTalents(AbilityEffectType.OnItemFabricatedAmount, fabricationValueItem);
+
+                    float floatQuality = 0.0f;
+                    foreach (string tag in fabricatedItem.TargetItem.Tags)
+                    {
+                        floatQuality += user.Info.GetSavedStatValue(StatTypes.IncreaseFabricationQuality, tag);
+                    }
+                    quality = (int)floatQuality;
                 }
 
                 var tempUser = user;
@@ -343,12 +343,20 @@ namespace Barotrauma.Items.Components
                     if (i < amountFittingContainer)
                     {
                         Entity.Spawner.AddToSpawnQueue(fabricatedItem.TargetItem, outputContainer.Inventory, fabricatedItem.TargetItem.Health * fabricatedItem.OutCondition,
-                            onSpawned: (Item spawnedItem) => { onItemSpawned(spawnedItem, tempUser); });
+                            onSpawned: (Item spawnedItem) => 
+                            { 
+                                onItemSpawned(spawnedItem, tempUser);
+                                spawnedItem.Quality = quality;
+                            });
                     }
                     else
                     {
                         Entity.Spawner.AddToSpawnQueue(fabricatedItem.TargetItem, item.Position, item.Submarine, fabricatedItem.TargetItem.Health * fabricatedItem.OutCondition,
-                            onSpawned: (Item spawnedItem) => { onItemSpawned(spawnedItem, tempUser); });
+                            onSpawned: (Item spawnedItem) => 
+                            { 
+                                onItemSpawned(spawnedItem, tempUser);
+                                spawnedItem.Quality = quality;
+                            });
                     }
                 }
 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Pump.cs

@@ -116,6 +116,8 @@ namespace Barotrauma.Items.Components
 
             item.CurrentHull.WaterVolume += currFlow;
             if (item.CurrentHull.WaterVolume > item.CurrentHull.Volume) { item.CurrentHull.Pressure += 0.5f; }
+
+            Voltage -= deltaTime;
         }
 
         public void InfectBallast(string identifier, bool allowMultiplePerShip = false)