Merge branch 'develop'

Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs

@@ -495,7 +495,7 @@ public class BotWeaponGenerator(
         // get ammo template from db
         var ubglAmmoDbTemplate = itemHelper.GetItem(generatedWeaponResult.ChosenUbglAmmoTemplate.Value).Value;
 
-        // Add greandes to bot inventory
+        // Add grenades to bot inventory
         var ubglAmmoGenModel = new InventoryMagGen(ubglMinMax, ubglDbTemplate, ubglDbTemplate, ubglAmmoDbTemplate, inventory, botId);
         InventoryMagGenComponents.FirstOrDefault(v => v.CanHandleInventoryMagGen(ubglAmmoGenModel)).Process(ubglAmmoGenModel);
 

Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs

@@ -28,7 +28,7 @@ public class UbglExternalMagGen(BotWeaponGeneratorHelper botWeaponGeneratorHelpe
             inventoryMagGen.GetAmmoTemplate().Id,
             (int)bulletCount,
             inventoryMagGen.GetPmcInventory(),
-            [EquipmentSlots.TacticalVest]
+            [EquipmentSlots.TacticalVest, EquipmentSlots.Pockets]
         );
     }
 }

Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs

@@ -140,7 +140,7 @@ public class BotWeaponGeneratorHelper(
             {
                 logger.Debug($"Unable to add ammo: {ammoItem.Template} to bot inventory, {result.ToString()}");
 
-                if (result == ItemAddedResult.NO_SPACE || result == ItemAddedResult.NO_CONTAINERS)
+                if (result is ItemAddedResult.NO_SPACE or ItemAddedResult.NO_CONTAINERS)
                 // If there's no space for 1 stack or no containers to hold item, there's no space for the others
                 {
                     break;