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

Food trash is optional by default. Fix FoodBase not having a FoodComponent.

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-06-21 23:02:58 +02:00
parent b6966a9b7f
commit 8e23f8fd40
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
base.ExposeData(serializer); base.ExposeData(serializer);
serializer.DataField(ref _useSound, "useSound", "/Audio/items/eatfood.ogg"); serializer.DataField(ref _useSound, "useSound", "/Audio/items/eatfood.ogg");
serializer.DataField(ref _transferAmount, "transferAmount", ReagentUnit.New(5)); serializer.DataField(ref _transferAmount, "transferAmount", ReagentUnit.New(5));
serializer.DataField(ref _trashPrototype, "trash", "TrashPlate"); serializer.DataField(ref _trashPrototype, "trash", null);
if (serializer.Reading) if (serializer.Reading)
{ {
@@ -171,6 +171,12 @@ namespace Content.Server.GameObjects.Components.Nutrition
return true; return true;
} }
if (string.IsNullOrEmpty(_trashPrototype))
{
Owner.Delete();
return true;
}
//We're empty. Become trash. //We're empty. Become trash.
var position = Owner.Transform.GridPosition; var position = Owner.Transform.GridPosition;
var finisher = Owner.EntityManager.SpawnEntity(_trashPrototype, position); var finisher = Owner.EntityManager.SpawnEntity(_trashPrototype, position);

1
Resources/Prototypes/Entities/Items/Consumables/food.yml
View File

@@ -3,6 +3,7 @@
id: FoodBase id: FoodBase
abstract: true abstract: true
components: components:
- type: Food
- type: LoopingSound - type: LoopingSound
- type: Sprite - type: Sprite
state: icon state: icon