Merge branch 'Fansana:master' into Plushie-Crate-Back

Fansana · Aug 30, 2024 · c8098c0 · c8098c0
2 parents b0f0079 + ef6331b
commit c8098c0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Devour;
@@ -15,6 +16,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<DevourerComponent, DevourDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<DevourerComponent, BeingGibbedEvent>(OnGibContents);
     }
 
     private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfterEvent args)
@@ -45,5 +47,15 @@ private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfter
 
         _audioSystem.PlayPvs(component.SoundDevour, uid);
     }
+
+    private void OnGibContents(EntityUid uid, DevourerComponent component, ref BeingGibbedEvent args)
+    {
+        if (!component.ShouldStoreDevoured)
+            return;
+
+        // For some reason we have two different systems that should handle gibbing,
+        // and for some another reason GibbingSystem, which should empty all containers, doesn't get involved in this process
+        ContainerSystem.EmptyContainer(component.Stomach);
+    }
 }
 
diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -735,3 +735,9 @@ Entries:
       message: Added two new physical traits - weakness and lightweight
   id: 100
   time: '2024-08-29T14:51:40.0000000+00:00'
+- author: cynical24
+  changes:
+    - type: Fix
+      message: space dragons will now drop bodies upon being butchered :3
+  id: 101
+  time: '2024-08-30T05:07:01.0000000+00:00'