tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'component-tweaks' into 20-06-24-submodule

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-06-24 12:00:58 +02:00
parent 78085855db 27aefeb35d
commit d73f9d3721
7 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
View File

@@ -60,7 +60,7 @@ namespace Content.Server.GameObjects
base.ExposeData(serializer);
serializer.DataField(ref StorageCapacityMax, "Capacity", 10000);
serializer.DataField(ref StorageUsed, "used", 0);
//serializer.DataField(ref StorageUsed, "used", 0);
}
/// <summary>
@@ -348,7 +348,7 @@ namespace Content.Server.GameObjects
foreach (var entity in storage.ContainedEntities)
{
var item = entity.GetComponent<ItemComponent>();
var item = entity.GetComponent<StoreableComponent>();
StorageUsed += item.ObjectSize;
}