We're done here.
This commit is contained in:
@@ -1,11 +1,13 @@
|
|||||||
using Content.Server.Shuttles.Components;
|
using Content.Server.Shuttles.Components;
|
||||||
using Content.Server.Shuttles.Events;
|
using Content.Server.Shuttles.Events;
|
||||||
using Content.Server.Shuttles.Systems;
|
using Content.Server.Shuttles.Systems;
|
||||||
|
using Content.Server.Station.Systems;
|
||||||
using Content.Shared.DeltaV.Shuttles;
|
using Content.Shared.DeltaV.Shuttles;
|
||||||
using Content.Shared.DeltaV.Shuttles.Components;
|
using Content.Shared.DeltaV.Shuttles.Components;
|
||||||
using Content.Shared.DeltaV.Shuttles.Systems;
|
using Content.Shared.DeltaV.Shuttles.Systems;
|
||||||
using Content.Shared.Shuttles.Components;
|
using Content.Shared.Shuttles.Components;
|
||||||
using Content.Shared.Shuttles.Systems;
|
using Content.Shared.Shuttles.Systems;
|
||||||
|
using Content.Shared.Station.Components;
|
||||||
using Content.Shared.Timing;
|
using Content.Shared.Timing;
|
||||||
using Content.Shared.Whitelist;
|
using Content.Shared.Whitelist;
|
||||||
using Robust.Shared.Map;
|
using Robust.Shared.Map;
|
||||||
@@ -16,8 +18,10 @@ namespace Content.Server.DeltaV.Shuttles.Systems;
|
|||||||
public sealed class DockingConsoleSystem : SharedDockingConsoleSystem
|
public sealed class DockingConsoleSystem : SharedDockingConsoleSystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
|
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
|
||||||
|
[Dependency] private readonly SharedMapSystem _map = default!;
|
||||||
[Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
|
[Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
|
||||||
[Dependency] private readonly ShuttleSystem _shuttle = default!;
|
[Dependency] private readonly ShuttleSystem _shuttle = default!;
|
||||||
|
[Dependency] private readonly StationSystem _station = default!;
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
@@ -114,7 +118,10 @@ public sealed class DockingConsoleSystem : SharedDockingConsoleSystem
|
|||||||
if (FindLargestGrid(map) is not {} grid)
|
if (FindLargestGrid(map) is not {} grid)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Log.Debug($"{ToPrettyString(args.Actor):user} is FTL-docking {ToPrettyString(shuttle):shuttle} to {ToPrettyString(grid):grid}");
|
||||||
|
|
||||||
_shuttle.FTLToDock(shuttle, Comp<ShuttleComponent>(shuttle), grid, priorityTag: ent.Comp.DockTag);
|
_shuttle.FTLToDock(shuttle, Comp<ShuttleComponent>(shuttle), grid, priorityTag: ent.Comp.DockTag);
|
||||||
|
UpdateUI(ent);
|
||||||
}
|
}
|
||||||
|
|
||||||
private EntityUid? FindLargestGrid(MapId map)
|
private EntityUid? FindLargestGrid(MapId map)
|
||||||
@@ -122,6 +129,12 @@ public sealed class DockingConsoleSystem : SharedDockingConsoleSystem
|
|||||||
EntityUid? largestGrid = null;
|
EntityUid? largestGrid = null;
|
||||||
var largestSize = 0f;
|
var largestSize = 0f;
|
||||||
|
|
||||||
|
if (_station.GetStationInMap(map) is {} station)
|
||||||
|
{
|
||||||
|
// prevent picking vgroid and stuff
|
||||||
|
return _station.GetLargestGrid(station); // May need to get the StationDataComponent if this doesn't work
|
||||||
|
}
|
||||||
|
|
||||||
var query = EntityQueryEnumerator<MapGridComponent, TransformComponent>();
|
var query = EntityQueryEnumerator<MapGridComponent, TransformComponent>();
|
||||||
while (query.MoveNext(out var gridUid, out var grid, out var xform))
|
while (query.MoveNext(out var gridUid, out var grid, out var xform))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
using Content.Shared.DeltaV.Shuttles.Components;
|
using Content.Shared.DeltaV.Shuttles.Components;
|
||||||
using Content.Shared.Shuttles.Systems;
|
using Content.Shared.Shuttles.Systems;
|
||||||
using Content.Shared.Timing;
|
using Content.Shared.Timing;
|
||||||
@@ -24,3 +25,6 @@ public sealed class DockingConsoleFTLMessage(int index) : BoundUserInterfaceMess
|
|||||||
{
|
{
|
||||||
public int Index = index;
|
public int Index = index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Serializable, NetSerializable]
|
||||||
|
public sealed class DockingConsoleShuttleCheckMessage : BoundUserInterfaceMessage;
|
||||||
10847
Resources/Maps/Nonstations/_TBD/lavaland_base.yml
Normal file
10847
Resources/Maps/Nonstations/_TBD/lavaland_base.yml
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -4,8 +4,8 @@ meta:
|
|||||||
engineVersion: 268.0.0
|
engineVersion: 268.0.0
|
||||||
forkId: ""
|
forkId: ""
|
||||||
forkVersion: ""
|
forkVersion: ""
|
||||||
time: 11/24/2025 21:47:10
|
time: 11/27/2025 18:20:30
|
||||||
entityCount: 2899
|
entityCount: 2900
|
||||||
maps:
|
maps:
|
||||||
- 1
|
- 1
|
||||||
grids:
|
grids:
|
||||||
@@ -107,7 +107,7 @@ entities:
|
|||||||
version: 7
|
version: 7
|
||||||
-1,1:
|
-1,1:
|
||||||
ind: -1,1
|
ind: -1,1
|
||||||
tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAG0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
|
tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAG0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
|
||||||
version: 7
|
version: 7
|
||||||
-1,-2:
|
-1,-2:
|
||||||
ind: -1,-2
|
ind: -1,-2
|
||||||
@@ -1069,7 +1069,7 @@ entities:
|
|||||||
-2,4:
|
-2,4:
|
||||||
0: 14
|
0: 14
|
||||||
-1,4:
|
-1,4:
|
||||||
1: 175
|
1: 47
|
||||||
0,-5:
|
0,-5:
|
||||||
1: 24576
|
1: 24576
|
||||||
0: 3584
|
0: 3584
|
||||||
@@ -1582,14 +1582,8 @@ entities:
|
|||||||
rot: 1.5707963267948966 rad
|
rot: 1.5707963267948966 rad
|
||||||
pos: 13.5,13.5
|
pos: 13.5,13.5
|
||||||
parent: 2
|
parent: 2
|
||||||
- proto: AirlockExternalGlassShuttleLocked
|
- proto: AirlockExternalGlassShuttleMining
|
||||||
entities:
|
entities:
|
||||||
- uid: 44
|
|
||||||
components:
|
|
||||||
- type: Transform
|
|
||||||
rot: 3.141592653589793 rad
|
|
||||||
pos: -0.5,17.5
|
|
||||||
parent: 2
|
|
||||||
- uid: 45
|
- uid: 45
|
||||||
components:
|
components:
|
||||||
- type: Transform
|
- type: Transform
|
||||||
@@ -1977,12 +1971,6 @@ entities:
|
|||||||
rot: 3.141592653589793 rad
|
rot: 3.141592653589793 rad
|
||||||
pos: -2.5,17.5
|
pos: -2.5,17.5
|
||||||
parent: 2
|
parent: 2
|
||||||
- uid: 100
|
|
||||||
components:
|
|
||||||
- type: Transform
|
|
||||||
rot: 3.141592653589793 rad
|
|
||||||
pos: -0.5,17.5
|
|
||||||
parent: 2
|
|
||||||
- uid: 101
|
- uid: 101
|
||||||
components:
|
components:
|
||||||
- type: Transform
|
- type: Transform
|
||||||
@@ -4402,6 +4390,11 @@ entities:
|
|||||||
- type: Transform
|
- type: Transform
|
||||||
pos: -4.5,-14.5
|
pos: -4.5,-14.5
|
||||||
parent: 2
|
parent: 2
|
||||||
|
- uid: 2900
|
||||||
|
components:
|
||||||
|
- type: Transform
|
||||||
|
pos: -5.5,10.5
|
||||||
|
parent: 2
|
||||||
- proto: CableHV
|
- proto: CableHV
|
||||||
entities:
|
entities:
|
||||||
- uid: 571
|
- uid: 571
|
||||||
@@ -6857,11 +6850,6 @@ entities:
|
|||||||
- type: Transform
|
- type: Transform
|
||||||
pos: -0.5,15.5
|
pos: -0.5,15.5
|
||||||
parent: 2
|
parent: 2
|
||||||
- uid: 1053
|
|
||||||
components:
|
|
||||||
- type: Transform
|
|
||||||
pos: -0.5,16.5
|
|
||||||
parent: 2
|
|
||||||
- uid: 1054
|
- uid: 1054
|
||||||
components:
|
components:
|
||||||
- type: Transform
|
- type: Transform
|
||||||
@@ -7790,6 +7778,13 @@ entities:
|
|||||||
- type: Transform
|
- type: Transform
|
||||||
pos: 2.5,13.5
|
pos: 2.5,13.5
|
||||||
parent: 2
|
parent: 2
|
||||||
|
- proto: ComputerShuttleMining
|
||||||
|
entities:
|
||||||
|
- uid: 1053
|
||||||
|
components:
|
||||||
|
- type: Transform
|
||||||
|
pos: -0.5,16.5
|
||||||
|
parent: 2
|
||||||
- proto: ComputerSurveillanceCameraMonitor
|
- proto: ComputerSurveillanceCameraMonitor
|
||||||
entities:
|
entities:
|
||||||
- uid: 1200
|
- uid: 1200
|
||||||
@@ -12183,6 +12178,11 @@ entities:
|
|||||||
radius: 175.75
|
radius: 175.75
|
||||||
- proto: Grille
|
- proto: Grille
|
||||||
entities:
|
entities:
|
||||||
|
- uid: 44
|
||||||
|
components:
|
||||||
|
- type: Transform
|
||||||
|
pos: -0.5,17.5
|
||||||
|
parent: 2
|
||||||
- uid: 1812
|
- uid: 1812
|
||||||
components:
|
components:
|
||||||
- type: Transform
|
- type: Transform
|
||||||
@@ -14758,6 +14758,11 @@ entities:
|
|||||||
parent: 2
|
parent: 2
|
||||||
- proto: ShuttleWindow
|
- proto: ShuttleWindow
|
||||||
entities:
|
entities:
|
||||||
|
- uid: 100
|
||||||
|
components:
|
||||||
|
- type: Transform
|
||||||
|
pos: -0.5,17.5
|
||||||
|
parent: 2
|
||||||
- uid: 2183
|
- uid: 2183
|
||||||
components:
|
components:
|
||||||
- type: Transform
|
- type: Transform
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -4,4 +4,4 @@
|
|||||||
components:
|
components:
|
||||||
- type: StationPlanetSpawner
|
- type: StationPlanetSpawner
|
||||||
planet: Lavaland
|
planet: Lavaland
|
||||||
gridPath: /Maps/Nonstations/DeltaV/lavaland_mining_base.yml
|
gridPath: /Maps/Nonstations/_TBD/lavaland_base.yml
|
||||||
@@ -53,6 +53,14 @@
|
|||||||
path: /Maps/Shuttles/cargo.yml
|
path: /Maps/Shuttles/cargo.yml
|
||||||
- type: GridSpawn
|
- type: GridSpawn
|
||||||
groups:
|
groups:
|
||||||
|
mining: !type:GridSpawnGroup
|
||||||
|
addComponents:
|
||||||
|
- type: ProtectedGrid
|
||||||
|
paths:
|
||||||
|
- /Maps/Shuttles/DeltaV/mining.yml
|
||||||
|
reclaimer: !type:GridSpawnGroup
|
||||||
|
paths:
|
||||||
|
- /Maps/Shuttles/mining.yml
|
||||||
trade: !type:GridSpawnGroup
|
trade: !type:GridSpawnGroup
|
||||||
addComponents:
|
addComponents:
|
||||||
- type: ProtectedGrid
|
- type: ProtectedGrid
|
||||||
|
|||||||
Reference in New Issue
Block a user