Unstable 0.1500.8.0

Barotrauma/BarotraumaShared/SharedSource/Items/Components/EntitySpawnerComponent.cs

@@ -268,7 +268,7 @@ namespace Barotrauma.Items.Components
                 {
                     string[] allSpecies = SpeciesName.Split(',');
                     string species = allSpecies.GetRandom().Trim();
-                    Entity.Spawner.AddToSpawnQueue(species, pos);
+                    Entity.Spawner?.AddToSpawnQueue(species, pos);
                 }
                 else if (!string.IsNullOrWhiteSpace(ItemIdentifier))
                 {
@@ -282,7 +282,7 @@ namespace Barotrauma.Items.Components
                         pos -= sub.Position;
                     }
 
-                    Entity.Spawner.AddToSpawnQueue(prefab, pos, item.Submarine);
+                    Entity.Spawner?.AddToSpawnQueue(prefab, pos, item.Submarine);
                 }
             }
         }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs

@@ -642,10 +642,8 @@ namespace Barotrauma.Items.Components
                     item.Drop(character);
                     item.SetTransform(ConvertUnits.ToSimUnits(GetAttachPosition(character)), 0.0f, findNewHull: false);
                 }
+                AttachToWall();
             }
-
-            AttachToWall();           
-
             return true;
         }
 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs

@@ -291,13 +291,16 @@ namespace Barotrauma.Items.Components
             int index = Inventory.FindIndex(containedItem);
             if (index >= 0 && index < slotRestrictions.Length)
             {
-                RelatedItem ri = slotRestrictions[index].ContainableItems?.Find(ci => ci.MatchesItem(containedItem));
-                if (ri != null)
+                if (slotRestrictions[index].ContainableItems != null)
                 {
                     activeContainedItems.RemoveAll(i => i.Item == containedItem);
-                    foreach (StatusEffect effect in ri.statusEffects)
+                    foreach (var containableItem in slotRestrictions[index].ContainableItems)
                     {
-                        activeContainedItems.Add(new ActiveContainedItem(containedItem, effect, ri.ExcludeBroken));
+                        if (!containableItem.MatchesItem(containedItem)) { continue; }
+                        foreach (StatusEffect effect in containableItem.statusEffects)
+                        {
+                            activeContainedItems.Add(new ActiveContainedItem(containedItem, effect, containableItem.ExcludeBroken));
+                        }
                     }
                 }
             }            

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

@@ -34,6 +34,8 @@ namespace Barotrauma.Items.Components
         public OxygenGenerator(Item item, XElement element)
             : base(item, element)
         {
+            //randomize update timer so all oxygen generators don't update at the same time
+            ventUpdateTimer = Rand.Range(0.0f, VentUpdateInterval);
             IsActive = true;
         }
 
@@ -78,6 +80,7 @@ namespace Barotrauma.Items.Components
 
         private void GetVents()
         {
+            totalHullVolume = 0.0f;
             ventList ??= new List<(Vent vent, float hullVolume)>();
             ventList.Clear();
             foreach (MapEntity entity in item.linkedTo)
@@ -87,13 +90,14 @@ namespace Barotrauma.Items.Components
                 Vent vent = linkedItem.GetComponent<Vent>();
                 if (vent?.Item.CurrentHull == null) { continue; }
 
+                totalHullVolume += vent.Item.CurrentHull.Volume;
                 ventList.Add((vent, vent.Item.CurrentHull.Volume));
             }
 
             for (int i = 0; i < ventList.Count; i++)
             {
                 Vent vent = ventList[i].vent;
-                foreach (Hull connectedHull in vent.Item.CurrentHull.GetConnectedHulls(includingThis: false, searchDepth: 5, ignoreClosedGaps: true))
+                foreach (Hull connectedHull in vent.Item.CurrentHull.GetConnectedHulls(includingThis: false, searchDepth: 3, ignoreClosedGaps: true))
                 {
                     //another vent in the connected hull -> don't add it to this vent's total hull volume
                     if (ventList.Any(v => v.vent != vent && v.vent.Item.CurrentHull == connectedHull)) { continue; }