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

Add more centcomm spawning logs (#22726)

Browse Source
This commit is contained in:
Leon Friedrich
2023-12-18 20:35:31 -05:00
committed by GitHub
parent 59c1798835
commit ca90a2819f
5 changed files with 84 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
View File

@@ -166,19 +166,20 @@ public sealed partial class EmergencyShuttleSystem
continue;
}
if (Deleted(centcomm.Entity))
if (!Deleted(centcomm.Entity))
{
_shuttle.FTLTravel(comp.EmergencyShuttle.Value, shuttle,
centcomm.Entity.Value, _consoleAccumulator, TransitTime, true);
continue;
}
if (!Deleted(centcomm.MapEntity))
{
// TODO: Need to get non-overlapping positions.
_shuttle.FTLTravel(comp.EmergencyShuttle.Value, shuttle,
new EntityCoordinates(
_mapManager.GetMapEntityId(centcomm.MapId),
new EntityCoordinates(centcomm.MapEntity.Value,
_random.NextVector2(1000f)), _consoleAccumulator, TransitTime);
}
else
{
_shuttle.FTLTravel(comp.EmergencyShuttle.Value, shuttle,
centcomm.Entity, _consoleAccumulator, TransitTime, true);
}
}
var podQuery = AllEntityQuery<EscapePodComponent>();
@@ -205,7 +206,7 @@ public sealed partial class EmergencyShuttleSystem
}
// Don't dock them. If you do end up doing this then stagger launch.
_shuttle.FTLTravel(uid, shuttle, centcomm.Entity, hyperspaceTime: TransitTime);
_shuttle.FTLTravel(uid, shuttle, centcomm.Entity.Value, hyperspaceTime: TransitTime);
RemCompDeferred<EscapePodComponent>(uid);
}
@@ -229,7 +230,7 @@ public sealed partial class EmergencyShuttleSystem
if (Deleted(comp.Entity))
continue;
_shuttle.AddFTLDestination(comp.Entity, true);
_shuttle.AddFTLDestination(comp.Entity.Value, true);
}
}
}