From 4257ad7ab5f09763fd55770bf4838d8665967b02 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sat, 7 Dec 2024 16:14:03 -0700 Subject: [PATCH] [MIRROR] fix a potential server crash (#9598) Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> --- code/modules/food/kitchen/smartfridge/engineering.dm | 4 ++-- code/modules/persistence/storage/smartfridge.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/food/kitchen/smartfridge/engineering.dm b/code/modules/food/kitchen/smartfridge/engineering.dm index 30646bb96a..b0bf103f7b 100644 --- a/code/modules/food/kitchen/smartfridge/engineering.dm +++ b/code/modules/food/kitchen/smartfridge/engineering.dm @@ -16,7 +16,7 @@ persistent = /datum/persistent/storage/smartfridge/sheet_storage/lossy /obj/machinery/smartfridge/sheets/accept_check(var/obj/item/O) - return istype(O, /obj/item/stack/material) + return istype(O, /obj/item/stack/material) && !istype(O, /obj/item/stack/material/cyborg) /obj/machinery/smartfridge/sheets/vend(datum/stored_item/stack/I, var/count) var/amount = I.get_amount() @@ -48,4 +48,4 @@ /obj/machinery/smartfridge/sheets/mining/persistent persistent = /datum/persistent/storage/smartfridge/sheet_storage /obj/machinery/smartfridge/sheets/mining/persistent_lossy - persistent = /datum/persistent/storage/smartfridge/sheet_storage/lossy \ No newline at end of file + persistent = /datum/persistent/storage/smartfridge/sheet_storage/lossy diff --git a/code/modules/persistence/storage/smartfridge.dm b/code/modules/persistence/storage/smartfridge.dm index 7195be5cac..af3eebd64f 100644 --- a/code/modules/persistence/storage/smartfridge.dm +++ b/code/modules/persistence/storage/smartfridge.dm @@ -57,7 +57,7 @@ . = list() for(var/obj/item/stack/material/S as anything in L) var/real_path = istext(S) ? text2path(S) : S - if(!ispath(real_path, /obj/item/stack/material)) + if(!ispath(real_path, /obj/item/stack/material) || ispath(real_path, /obj/item/stack/material/cyborg)) log_debug("Warning: Sheet_storage persistent datum tried to create [S]") continue