Release 1.8.6.2 - Calm Before the Storm

Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs

@@ -2926,13 +2926,13 @@ namespace Barotrauma
                     Entity.Spawner.AddCharacterToSpawnQueue(CharacterPrefab.HumanSpeciesName, spawnPosition, humanPrefab.CreateCharacterInfo(), onSpawn: newCharacter =>
                     {
                         newCharacter.HumanPrefab = humanPrefab;
+                        AddToCrew(newCharacter);
                         humanPrefab.GiveItems(newCharacter, newCharacter.Submarine, spawnPoint);
                         humanPrefab.InitializeCharacter(newCharacter);
 #if SERVER
                         newCharacter.LoadTalents();
                         GameMain.NetworkMember.CreateEntityEvent(newCharacter, new Character.UpdateTalentsEventData());
 #endif
-                        PostSpawnHuman(newCharacter);
                     });
                 }
             }
@@ -2942,10 +2942,10 @@ namespace Barotrauma
                 CharacterInfo characterInfo = new CharacterInfo(CharacterPrefab.HumanSpeciesName, jobOrJobPrefab: job, variant: variant);
                 Entity.Spawner.AddCharacterToSpawnQueue(CharacterPrefab.HumanSpeciesName, spawnPosition, characterInfo, onSpawn: newCharacter =>
                 {
+                    AddToCrew(newCharacter);
                     newCharacter.GiveJobItems(isPvPMode: GameMain.GameSession?.GameMode is PvPMode, spawnPoint);
                     newCharacter.GiveIdCardTags(spawnPoint);
                     newCharacter.Info.StartItemsGiven = true;
-                    PostSpawnHuman(newCharacter);
                 });
             }
             else if (CharacterPrefab.FindBySpeciesName(args[0].ToIdentifier()) is { } prefab)
@@ -2953,7 +2953,7 @@ namespace Barotrauma
                 Entity.Spawner.AddCharacterToSpawnQueue(args[0].ToIdentifier(), spawnPosition, prefab.HasCharacterInfo ? new CharacterInfo(prefab.Identifier) : null);
             }
 
-            void PostSpawnHuman(Character newCharacter)
+            void AddToCrew(Character newCharacter)
             {
                 newCharacter.TeamID = teamType;
                 if (addToCrew)