Merge branch 'master' into development

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)
 

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">

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.