From 87a33482f0054acb34e0d56bcb527dcddd9ab237 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Wed, 16 Apr 2025 19:49:49 -0500 Subject: [PATCH] Fax checks contents for blacklists (#90649) ## About The Pull Request Fixes #90638, Fixes #88726 When checking for "can we fax this item", the item (and all its contents (recursively)) are checked if they are fax-able as well ## Changelog :cl: Melbert fix: You can't fax unfaxable things by putting them in faxable things /:cl: --- code/modules/paperwork/fax.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index 62a269d477e..48aec4454c1 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -241,11 +241,11 @@ GLOBAL_VAR_INIT(fax_autoprinting, FALSE) * This list expands if you snip a particular wire. */ /obj/machinery/fax/proc/is_allowed_type(obj/item/item) - if (is_type_in_list(item, allowed_types)) - return TRUE - if (!allow_exotic_faxes) - return FALSE - return is_type_in_list(item, exotic_types) + var/list/checked_list = allow_exotic_faxes ? (allowed_types | exotic_types) : allowed_types + for(var/atom/movable/thing in item.get_all_contents()) + if(!is_type_in_list(thing, checked_list)) + return FALSE + return TRUE /obj/machinery/fax/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui)