Merge remote-tracking branch 'upstream/master' into develop

2026-04-09 09:12:16 -03:00
parent ef66d27ffe a4607dffad
commit 790378d2a5
198 changed files with 5587 additions and 3462 deletions
@@ -3022,7 +3022,10 @@ namespace Barotrauma
                    switch (args[argIndex].ToLowerInvariant())
                    {
                        case "inside":
-                            spawnPoint = WayPoint.GetRandom(SpawnType.Human, job, Submarine.MainSub);
+                            spawnPoint = 
+                                WayPoint.GetRandom(SpawnType.Human, job, Submarine.MainSub) ??
+                                //try a non-job-specific spawnpoint if a job-specific one can't be found
+                                WayPoint.GetRandom(SpawnType.Human, assignedJob: null, Submarine.MainSub);
                            break;
                        case "outside":
                            spawnPoint = WayPoint.GetRandom(SpawnType.Enemy);