From 607d70ca67e2331e8c7d4e6612c0a6e7439b9b7f Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Thu, 15 Dec 2022 15:25:00 -0500 Subject: [PATCH 1/2] Merge pull request #14203 from Heroman3003/material-fixes Fixes autolathe thing. --- code/datums/components/material_container.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 2b0c74e269..75aee4b7d9 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -140,7 +140,12 @@ return // Cache this since S may go away after use() - var/list/sheet_matter = S.matter + var/list/sheet_matter + if(istype(S, /obj/item/stack/material)) + var/obj/item/stack/material/MS = S + sheet_matter = list(MS.material.name = 2000) + else + sheet_matter = S.matter // Calculate total amount of material for one sheet var/matter_per_sheet = 0