From 3ebfc897eb3ad7a6919a273c3acb13134474e12c Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <zddm@outlook.es>
Date: Thu, 4 Mar 2021 16:15:40 +0100
Subject: [PATCH] Fix machine frames not taking material sheets correctly

---
 .../Components/Construction/MachineFrameComponent.cs       | 7 +++++--
 Resources/Changelog/Parts/machine_frame_fix.yml            | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Changelog/Parts/machine_frame_fix.yml

diff --git a/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs b/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs
index 7bcc0bf0a4..4517041af5 100644
--- a/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs
+++ b/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs
@@ -258,13 +258,16 @@ namespace Content.Server.GameObjects.Components.Construction
                     var needed = MaterialRequirements[type] - _materialProgress[type];
                     var count = stack.Count;
 
-                    if (count < needed && stack.Split(count, Owner.Transform.Coordinates, out var newStack))
+                    if (count < needed)
                     {
+                        if(!_partContainer.Insert(stack.Owner))
+                            return false;
+
                         _materialProgress[type] += count;
                         return true;
                     }
 
-                    if (!stack.Split(needed, Owner.Transform.Coordinates, out newStack))
+                    if (!stack.Split(needed, Owner.Transform.Coordinates, out var newStack))
                         return false;
 
                     if(!_partContainer.Insert(newStack))
diff --git a/Resources/Changelog/Parts/machine_frame_fix.yml b/Resources/Changelog/Parts/machine_frame_fix.yml
new file mode 100644
index 0000000000..68c3cd0b37
--- /dev/null
+++ b/Resources/Changelog/Parts/machine_frame_fix.yml
@@ -0,0 +1,4 @@
+author: Zumorica
+changes:
+  - type: Fix
+    message: Fixed machine frames not correctly taking material sheets.