Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760

[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-14 12:28:41 -05:00
parent 5f25c8c5f7 c92a18f733
commit f9f42658e1
24 changed files with 171 additions and 227 deletions
@@ -171,8 +171,7 @@

 	else if(istype(O, /obj/item/stack/sheet/hairlesshide))
 		var/obj/item/stack/sheet/hairlesshide/HH = O
-		var/obj/item/stack/sheet/wetleather/WL = new(get_turf(HH))
-		WL.amount = HH.amount
+		new /obj/item/stack/sheet/wetleather(get_turf(HH), HH.amount)
 		qdel(HH)

 /*