From ae42cce94b9ed6a9daecc880c93e00f2b5a1f7fc Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 29 May 2025 14:22:32 -0500 Subject: [PATCH] [NO_GBP] Fix `map_export` admin verb not blacklisting `obj/effects` (#91335) Should have used `typecacheof()` instead of `typesof()` to properly configure the blacklist. Multi-z has `obj/effect/abstract` being applied to lots of turfs that need to be ignored. --- code/modules/admin/verbs/map_export.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/map_export.dm b/code/modules/admin/verbs/map_export.dm index 74af2d01025..12ffc42813f 100644 --- a/code/modules/admin/verbs/map_export.dm +++ b/code/modules/admin/verbs/map_export.dm @@ -202,7 +202,7 @@ GLOBAL_LIST_INIT(save_file_chars, list( maxz, save_flag = ALL, shuttle_area_flag = SAVE_SHUTTLEAREA_DONTCARE, - list/obj_blacklist = typesof(/obj/effect), + list/obj_blacklist = typecacheof(/obj/effect), ) var/width = maxx - minx var/height = maxy - miny @@ -212,9 +212,9 @@ GLOBAL_LIST_INIT(save_file_chars, list( CRASH("Non-list being used as object blacklist for map writing") // we want to keep crayon writings, blood splatters, cobwebs, etc. - obj_blacklist -= typesof(/obj/effect/decal) - obj_blacklist -= typesof(/obj/effect/turf_decal) - obj_blacklist -= typesof(/obj/effect/landmark) // most landmarks get deleted except for latejoin arrivals shuttle + obj_blacklist -= typecacheof(/obj/effect/decal) + obj_blacklist -= typecacheof(/obj/effect/turf_decal) + obj_blacklist -= typecacheof(/obj/effect/landmark) // most landmarks get deleted except for latejoin arrivals shuttle //Step 0: Calculate the amount of letters we need (26 ^ n > turf count) var/turfs_needed = width * height