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

Fix disposal container names (#10646)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-17 14:17:32 +12:00
committed by GitHub
parent 46cb3c477c
commit 6cb7bbaf73
10 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Disposal.Unit.Components;
using Content.Server.Disposal.Unit.Components;
namespace Content.Server.Disposal.Tube.Components
{
@@ -7,6 +7,8 @@ namespace Content.Server.Disposal.Tube.Components
[ComponentReference(typeof(DisposalTubeComponent))]
public sealed class DisposalBendComponent : DisposalTubeComponent
{
public override string ContainerId => "DisposalBend";
[DataField("sideDegrees")]
private int _sideDegrees = -90;

1
Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
View File

@@ -13,6 +13,7 @@ namespace Content.Server.Disposal.Tube.Components
[Dependency] private readonly IEntityManager _entMan = default!;
private const string HolderPrototypeId = "DisposalHolder";
public override string ContainerId => "DisposalEntry";
public bool TryInsert(DisposalUnitComponent from, IEnumerable<string>? tags = default)
{

4
Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Content.Server.Disposal.Unit.Components;
using Robust.Shared.Random;
@@ -10,6 +10,8 @@ namespace Content.Server.Disposal.Tube.Components
[ComponentReference(typeof(DisposalTubeComponent))]
public class DisposalJunctionComponent : DisposalTubeComponent
{
public override string ContainerId => "DisposalJunction";
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IRobustRandom _random = default!;

2
Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
View File

@@ -14,6 +14,8 @@ namespace Content.Server.Disposal.Tube.Components
[ComponentReference(typeof(DisposalTubeComponent))]
public sealed class DisposalRouterComponent : DisposalJunctionComponent
{
public override string ContainerId => "DisposalRouter";
[Dependency] private readonly IEntityManager _entMan = default!;
[ViewVariables]

2
Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
View File

@@ -15,6 +15,8 @@ namespace Content.Server.Disposal.Tube.Components
{
[Dependency] private readonly IEntityManager _entMan = default!;
public override string ContainerId => "DisposalTagger";
[ViewVariables(VVAccess.ReadWrite)]
private string _tag = "";

4
Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Disposal.Unit.Components;
using Content.Server.Disposal.Unit.Components;
namespace Content.Server.Disposal.Tube.Components
{
@@ -9,6 +9,8 @@ namespace Content.Server.Disposal.Tube.Components
[ComponentReference(typeof(DisposalTubeComponent))]
public class DisposalTransitComponent : DisposalTubeComponent
{
public override string ContainerId => "DisposalTransit";
protected override Direction[] ConnectableDirections()
{
var rotation = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).LocalRotation;

2
Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.Disposal.Tube.Components
{
public abstract class DisposalTubeComponent : Component, IDisposalTubeComponent
{
public const string ContainerId = "disposal-tube";
public virtual string ContainerId => "DisposalTube";
[Dependency] private readonly IEntityManager _entMan = default!;