Merge pull request #16678 from Kashargul/fridge

fix a potential server crash
This commit is contained in:
Heroman3003
2024-12-08 08:32:41 +10:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
@@ -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
persistent = /datum/persistent/storage/smartfridge/sheet_storage/lossy
@@ -55,7 +55,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