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

15
Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
View File

@@ -63,7 +63,10 @@ namespace Content.Server.Shuttles.Systems
private void OnDestinationMessage(EntityUid uid, ShuttleConsoleComponent component, ShuttleConsoleDestinationMessage args)
{
if (!TryComp<FTLDestinationComponent>(args.Destination, out var dest)) return;
if (!TryComp<FTLDestinationComponent>(args.Destination, out var dest))
{
return;
}
if (!dest.Enabled) return;
@@ -77,10 +80,16 @@ namespace Content.Server.Shuttles.Systems
RaiseLocalEvent(entity.Value, ref getShuttleEv);
entity = getShuttleEv.Console;
if (entity == null || dest.Whitelist?.IsValid(entity.Value, EntityManager) == false) return;
if (entity == null || dest.Whitelist?.IsValid(entity.Value, EntityManager) == false)
{
return;
}
if (!TryComp<TransformComponent>(entity, out var xform) ||
!TryComp<ShuttleComponent>(xform.GridUid, out var shuttle)) return;
!TryComp<ShuttleComponent>(xform.GridUid, out var shuttle))
{
return;
}
if (HasComp<FTLComponent>(xform.GridUid))
{