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

2021-10-27 14:41:47 -03:00
parent 8ef6ec90ca 234fb6bc06
commit bae2390eb1
450 changed files with 26043 additions and 10457 deletions
@@ -185,7 +185,10 @@ namespace Barotrauma
                    {
                        existingItems.Add(item);
                    }
-                    Entity.Spawner.AddToSpawnQueue(targetPrefab, targetContainer.OwnInventory);
+                    Entity.Spawner.AddToSpawnQueue(targetPrefab, targetContainer.OwnInventory, null, item =>
+                    {
+                        item.AddTag("traitormissionitem");
+                    });
                    target = null;
                }
                else if (allowExisting)