From c11d7ac148abddb7318565be3ef1c1565da58637 Mon Sep 17 00:00:00 2001
From: BurgerLUA <BurgerLUA@users.noreply.github.com>
Date: Sun, 6 May 2018 07:21:05 -0700
Subject: [PATCH 1/2] Fixed the Stack Machine from eating Materials (#4688)

The stacker was coded to accept 1 sheet at a time, meaning that if you insert a stack of 50 sheets into the stacker, it will count that as only 1 sheet because people don't know how to code.
---
 code/modules/mining/machine_stacking.dm | 7 ++++---
 html/changelogs/burgerbb-holy_fuck.yml  | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/burgerbb-holy_fuck.yml

diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index a2172d44498..69abf00fdde 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -123,9 +123,10 @@
 		var/turf/T = get_turf(input)
 		for(var/obj/item/O in T)
 			if(!O) return
-			if(istype(O, /obj/item/stack) && stack_storage[O.type] != null)
-				stack_storage[O.type]++
-				qdel(O)
+			var/obj/item/stack/S = O
+			if(istype(S) && stack_storage[S.type] != null)
+				stack_storage[S.type] += S.amount
+				qdel(S)
 			else
 				O.forceMove(output.loc)
 
diff --git a/html/changelogs/burgerbb-holy_fuck.yml b/html/changelogs/burgerbb-holy_fuck.yml
new file mode 100644
index 00000000000..ca156e2c31a
--- /dev/null
+++ b/html/changelogs/burgerbb-holy_fuck.yml
@@ -0,0 +1,6 @@
+author: BurgerBB
+
+delete-after: True
+
+changes: 
+  - rscadd: "Fixes the stacking machine from eating materials due to an oversight."
\ No newline at end of file

From 896844b27afdb92f484bd9dec4091130124a3359 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Mon, 7 May 2018 18:14:36 +0300
Subject: [PATCH 2/2] Changelogs, 07MAY2018

---
 html/changelog.html                    | 6 ++++++
 html/changelogs/.all_changelog.yml     | 3 +++
 html/changelogs/burgerbb-holy_fuck.yml | 6 ------
 3 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 html/changelogs/burgerbb-holy_fuck.yml

diff --git a/html/changelog.html b/html/changelog.html
index b36d3cbd115..8fb36595855 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">07 May 2018</h2>
+			<h3 class="author">BurgerBB updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Fixes the stacking machine from eating materials due to an oversight.</li>
+			</ul>
+
 			<h2 class="date">25 April 2018</h2>
 			<h3 class="author">Alberyk updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9a7bb7e623d..88b8d04487c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -5390,3 +5390,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Vaurca should have proper natural insulation once more.
   Arrow768:
   - bugfix: You can now see if someone opens a sodacan that has been shaken.
+2018-05-07:
+  BurgerBB:
+  - rscadd: Fixes the stacking machine from eating materials due to an oversight.
diff --git a/html/changelogs/burgerbb-holy_fuck.yml b/html/changelogs/burgerbb-holy_fuck.yml
deleted file mode 100644
index ca156e2c31a..00000000000
--- a/html/changelogs/burgerbb-holy_fuck.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: BurgerBB
-
-delete-after: True
-
-changes: 
-  - rscadd: "Fixes the stacking machine from eating materials due to an oversight."
\ No newline at end of file