From 5232e9cd2de21e8977906e00341db3367e2ffe3b Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 30 Oct 2022 11:25:23 -0400 Subject: [PATCH] Merge pull request #14009 from Heroman3003/material-runtime Fixes inserting sheets with no defined material (like tiles) into machines --- code/datums/components/material_container.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index fbad2752ee..2b0c74e269 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -152,6 +152,11 @@ to_chat(user, "[parent] cannot contain [material].") return + // Our sheet had no material. Whoops. + if(!matter_per_sheet) + to_chat(user, "[S] does not contain any matter acceptable by [parent].") + return + // If we can't fit the material for one sheet, we're full. if(!has_space(matter_per_sheet)) to_chat(user, "[parent] is full. Please remove materials from [parent] in order to insert more.")