Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Shuttle drone improvements (#16931)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-31 11:13:02 +10:00
committed by GitHub
parent 53d4e408aa
commit 57858f802f
35 changed files with 335 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/CCVar/CCVars.cs
View File

@@ -1096,17 +1096,11 @@ namespace Content.Shared.CCVar
public static readonly CVarDef<bool> ArrivalsReturns =
CVarDef.Create("shuttle.arrivals_returns", false, CVar.SERVERONLY);
/// <summary>
/// Whether cargo shuttles are enabled.
/// </summary>
public static readonly CVarDef<bool> CargoShuttles =
CVarDef.Create("shuttle.cargo", true, CVar.SERVERONLY);
/// <summary>
/// Whether to automatically spawn escape shuttles.
/// </summary>
public static readonly CVarDef<bool> DisableGridFill =
CVarDef.Create("shuttle.disable_grid_fill", false, CVar.SERVERONLY);
public static readonly CVarDef<bool> GridFill =
CVarDef.Create("shuttle.grid_fill", true, CVar.SERVERONLY);
/*
* Emergency

10
Content.Shared/Cargo/Components/CargoShuttleComponent.cs
View File

@@ -1,4 +1,4 @@
using Robust.Shared.Map;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -7,15 +7,9 @@ namespace Content.Shared.Cargo.Components;
/// <summary>
/// Present on cargo shuttles to provide metadata such as preventing spam calling.
/// </summary>
[RegisterComponent, Access(typeof(SharedCargoSystem))]
[RegisterComponent, NetworkedComponent, Access(typeof(SharedCargoSystem))]
public sealed class CargoShuttleComponent : Component
{
/// <summary>
/// The assigned station for this cargo shuttle.
/// </summary>
[DataField("station")]
public EntityUid? Station;
/// <summary>
/// The paper-type prototype to spawn with the order information.
/// </summary>

20
Content.Shared/Cargo/Prototypes/CargoShuttlePrototype.cs
View File

@@ -1,20 +0,0 @@
using Content.Shared.Dataset;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Utility;
namespace Content.Shared.Cargo.Prototypes;
[Prototype("cargoShuttle")]
public sealed class CargoShuttlePrototype : IPrototype
{
[ViewVariables]
[IdDataField]
public string ID { get; } = default!;
[DataField("path")]
public ResPath Path = default!;
[DataField("nameDataset", customTypeSerializer:typeof(PrototypeIdSerializer<DatasetPrototype>))]
public string NameDataset = "CargoShuttleNames";
}