NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove spawn point component references (#15222)

Browse source
This commit is contained in:
DrSmugleaf 2023-04-08 16:52:52 -07:00 • committed by GitHub
parent 34bcd042d1
commit cf19015086
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Client/Entry/EntryPoint.cs
View file

@ -23,7 +23,6 @@ using Content.Shared.Administration;
using Content.Shared.AME;
using Content.Shared.Gravity;
using Content.Shared.Localizations;
using Content.Shared.Markers;
using Robust.Client;
using Robust.Client.Graphics;
using Robust.Client.Input;
@ -85,7 +84,6 @@ namespace Content.Client.Entry
_componentFactory.IgnoreMissingComponents();
// Do not add to these, they are legacy.
_componentFactory.RegisterClass<SharedSpawnPointComponent>();
_componentFactory.RegisterClass<SharedGravityGeneratorComponent>();
_componentFactory.RegisterClass<SharedAMEControllerComponent>();
// Do not add to the above, they are legacy

43
Content.Server/Spawners/Components/SpawnPointComponent.cs
View file

@ -1,31 +1,28 @@
using Content.Shared.Markers;
using Content.Shared.Roles;
using Robust.Shared.Prototypes;
namespace Content.Server.Spawners.Components
namespace Content.Server.Spawners.Components;
[RegisterComponent]
public sealed class SpawnPointComponent : Component
{
[RegisterComponent]
[ComponentReference(typeof(SharedSpawnPointComponent))]
public sealed class SpawnPointComponent : SharedSpawnPointComponent
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("job_id")]
private string? _jobId;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("job_id")]
private string? _jobId;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("spawn_type")]
public SpawnPointType SpawnType { get; } = SpawnPointType.Unset;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("spawn_type")]
public SpawnPointType SpawnType { get; } = SpawnPointType.Unset;
public JobPrototype? Job => string.IsNullOrEmpty(_jobId) ? null : _prototypeManager.Index<JobPrototype>(_jobId);
}
public enum SpawnPointType
{
Unset = 0,
LateJoin,
Job,
Observer,
}
public JobPrototype? Job => string.IsNullOrEmpty(_jobId) ? null : _prototypeManager.Index<JobPrototype>(_jobId);
}
public enum SpawnPointType
{
Unset = 0,
LateJoin,
Job,
Observer,
}

7
Content.Shared/Markers/SharedSpawnPointComponent.cs
View file

@ -1,7 +0,0 @@
namespace Content.Shared.Markers
{
[Virtual]
public class SharedSpawnPointComponent : Component
{
}
}