Cherry-picked commit 0d0edbb from space-wizards/space-station-14/master

Simple-Station · Apr 21, 2024 · bf627a6 · bf627a6
1 parent 3bf08c7
commit bf627a6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -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 @@ public override void Initialize()
         {
             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 @@ protected override void SplattedCreamPie(EntityUid uid, CreamPieComponent creamP
             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);
         }

diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Nutrition; // DeltaV
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Examine;
@@ -67,6 +68,8 @@ private bool TrySliceFood(EntityUid uid, EntityUid user, EntityUid usedItem,
             FillSlice(sliceUid, lostSolution);
 
             _audio.PlayPvs(component.Sound, transform.Coordinates, AudioParams.Default.WithVolume(-2));
+            var ev = new SliceFoodEvent();
+            RaiseLocalEvent(uid, ref ev);
 
             // Decrease size of item based on count - Could implement in the future
             // Bug with this currently is the size in a container is not updated

diff --git a/Content.Shared/Nutrition/Events.cs b/Content.Shared/Nutrition/Events.cs
@@ -53,3 +53,9 @@ public VapeDoAfterEvent(Solution solution, bool forced)
 
     public override DoAfterEvent Clone() => this;
 }
+
+/// <summary>
+/// Raised before food is sliced
+/// </summary>
+[ByRefEvent]
+public record struct SliceFoodEvent();
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -156,6 +156,8 @@
           path: /Audio/Weapons/Guns/Empty/empty.ogg
         ejectSound:
           path: /Audio/Weapons/Guns/Empty/empty.ogg
+        swap: false
+        disableEject: true
   - type: Tag
     tags:
     - Fruit