juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More container pruning (#8576)

Browse Source
This commit is contained in:
metalgearsloth
2022-06-12 13:29:03 +10:00
committed by GitHub
parent 58ddb19cd2
commit a983b5e2f5
42 changed files with 2534 additions and 5536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Labels/Label/LabelSystem.cs
View File

@@ -17,6 +17,8 @@ namespace Content.Server.Labels
{
[Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
public const string ContainerName = "paper_label";
public override void Initialize()
{
base.Initialize();
@@ -31,7 +33,7 @@ namespace Content.Server.Labels
private void OnComponentInit(EntityUid uid, PaperLabelComponent component, ComponentInit args)
{
_itemSlotsSystem.AddItemSlot(uid, component.Name, component.LabelSlot);
_itemSlotsSystem.AddItemSlot(uid, ContainerName, component.LabelSlot);
if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
return;

2
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -114,7 +114,7 @@ namespace Content.Server.Storage.Components
protected override void Initialize()
{
base.Initialize();
Contents = Owner.EnsureContainer<Container>(nameof(EntityStorageComponent));
Contents = Owner.EnsureContainer<Container>(EntityStorageSystem.ContainerName);
Contents.ShowContents = _showContents;
Contents.OccludesLight = _occludesLight;

2
Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
View File

@@ -12,6 +12,8 @@ public sealed class EntityStorageSystem : EntitySystem
{
[Dependency] private readonly PopupSystem _popupSystem = default!;
public const string ContainerName = "entity_storage";
public override void Initialize()
{
base.Initialize();