tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add arrivals (#14755)

Browse Source 
* Arrivals

* More arrivals and shitty uhh preload

* cvar

* a

* clockin + maps

* shitter prevention

* Placement

* a

* cvar for tests and dev

* weh
This commit is contained in:
metalgearsloth
2023-03-22 20:29:55 +11:00
committed by GitHub
parent a26b284349
commit f3a06a0696
39 changed files with 9456 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
View File

@@ -1,5 +1,6 @@
using System.Linq;
using Content.Server.GameTicking;
using Content.Server.Shuttles.Components;
using Content.Server.Spawners.Components;
using Content.Server.Station.Systems;
using Robust.Shared.Random;
@@ -20,6 +21,9 @@ public sealed class SpawnPointSystem : EntitySystem
private void OnSpawnPlayer(PlayerSpawningEvent args)
{
if (args.SpawnResult != null)
return;
// TODO: Cache all this if it ends up important.
var points = EntityQuery<SpawnPointComponent>().ToList();
_random.Shuffle(points);
@@ -37,9 +41,11 @@ public sealed class SpawnPointSystem : EntitySystem
args.HumanoidCharacterProfile,
args.Station);
EnsureComp<ClockedInComponent>(args.SpawnResult.Value);
return;
}
else if (_gameTicker.RunLevel != GameRunLevel.InRound && spawnPoint.SpawnType == SpawnPointType.Job && (args.Job == null || spawnPoint.Job?.ID == args.Job.Prototype.ID))
if (_gameTicker.RunLevel != GameRunLevel.InRound && spawnPoint.SpawnType == SpawnPointType.Job && (args.Job == null || spawnPoint.Job?.ID == args.Job.Prototype.ID))
{
args.SpawnResult = _stationSpawning.SpawnPlayerMob(
xform.Coordinates,
@@ -47,6 +53,7 @@ public sealed class SpawnPointSystem : EntitySystem
args.HumanoidCharacterProfile,
args.Station);
EnsureComp<ClockedInComponent>(args.SpawnResult.Value);
return;
}
}
@@ -62,6 +69,7 @@ public sealed class SpawnPointSystem : EntitySystem
args.HumanoidCharacterProfile,
args.Station);
EnsureComp<ClockedInComponent>(args.SpawnResult.Value);
return;
}