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

SharedItemComponent (#3513)

Browse Source 
* StorableComponent refactor

* ItemComponent refactor

* conflict fixes

* removes redundant null check

* removes redundant item throwing code

* fix conflicts

* ExplosionLaunchedComponent

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
collinlunn
2021-04-02 04:01:03 -06:00
committed by GitHub
parent d9781c6f1c
commit f7aba5f701
21 changed files with 284 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,7 +209,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
continue;
// only items that can be stored in an inventory, or a mob, can be eaten by a locker
if (!entity.HasComponent<StorableComponent>() &&
if (!entity.HasComponent<SharedItemComponent>() &&
!entity.HasComponent<IBody>())
continue;