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

Fix cream pie bomb when eaten or sliced (#25928)

Browse Source 
* fix bomb activation when eaten

* no swap / no eject

* activate when sliced
This commit is contained in:
Vyacheslav Kovalevsky
2024-03-13 11:36:08 +03:00
committed by GitHub
parent 855def1fba
commit 0d0edbba4a
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
View File

@@ -1,12 +1,11 @@
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Server.Explosion.Components;
using Content.Server.Explosion.EntitySystems;
using Content.Server.Fluids.EntitySystems;
using Content.Server.Nutrition.Components;
using Content.Server.Popups;
using Content.Shared.Containers.ItemSlots;
using Content.Shared.Explosion.Components;
using Content.Shared.Interaction;
using Content.Shared.Nutrition;
using Content.Shared.Nutrition.Components;
using Content.Shared.Nutrition.EntitySystems;
using Content.Shared.Rejuvenate;
@@ -32,7 +31,10 @@ namespace Content.Server.Nutrition.EntitySystems
{
base.Initialize();
SubscribeLocalEvent<CreamPieComponent, InteractUsingEvent>(OnInteractUsing);
// activate BEFORE entity is deleted and trash is spawned
SubscribeLocalEvent<CreamPieComponent, ConsumeDoAfterEvent>(OnConsume, before: [typeof(FoodSystem)]);
SubscribeLocalEvent<CreamPieComponent, SliceFoodEvent>(OnSlice);
SubscribeLocalEvent<CreamPiedComponent, RejuvenateEvent>(OnRejuvenate);
}
@@ -56,7 +58,12 @@ namespace Content.Server.Nutrition.EntitySystems
EntityManager.QueueDeleteEntity(uid);
}
private void OnInteractUsing(Entity<CreamPieComponent> entity, ref InteractUsingEvent args)
private void OnConsume(Entity<CreamPieComponent> entity, ref ConsumeDoAfterEvent args)
{
ActivatePayload(entity);
}
private void OnSlice(Entity<CreamPieComponent> entity, ref SliceFoodEvent args)
{
ActivatePayload(entity);
}