From 478f1add60596d7e68ff7f5d73522a831d6dafbd Mon Sep 17 00:00:00 2001 From: Fira Date: Fri, 8 Dec 2023 13:25:11 +0000 Subject: [PATCH] revert mass screenshot boundaries --- code/modules/admin/verbs/debug.dm | 11 +++++++++-- code/modules/mapping/map_template.dm | 1 - code/modules/mapping/space_management/space_level.dm | 8 ++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 718fd77e90e6..c776a12eb330 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -126,8 +126,15 @@ var/cur_x = half_chunk_size var/cur_y = half_chunk_size var/cur_z = mob.z - var/width = world.maxx - half_chunk_size + 2 - var/height = world.maxy - half_chunk_size + 2 + var/width + var/height + if(istype(SSmapping.z_list[cur_z], /datum/space_level)) + var/datum/space_level/cur_level = SSmapping.z_list[cur_z] + width = cur_level.x_bounds - half_chunk_size + 2 + height = cur_level.y_bounds - half_chunk_size + 2 + else + width = world.maxx - half_chunk_size + 2 + height = world.maxy - half_chunk_size + 2 var/width_inside = width - 1 var/height_inside = height - 1 diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index fc2d9faea3b5..6024b1ddfa90 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -6,7 +6,6 @@ var/loaded = 0 // Times loaded this round var/datum/parsed_map/cached_map var/keep_cached_map = FALSE - var/station_id = null // used to override the root id when generating ///Default area associated with the map template var/default_area diff --git a/code/modules/mapping/space_management/space_level.dm b/code/modules/mapping/space_management/space_level.dm index 56c9c7221bc8..3e7f79c6fde9 100644 --- a/code/modules/mapping/space_management/space_level.dm +++ b/code/modules/mapping/space_management/space_level.dm @@ -4,8 +4,8 @@ var/list/traits var/z_value = 1 //actual z placement var/linkage = SELFLOOPING - var/xi - var/yi + var/x_bounds + var/y_bounds /datum/space_level/New(new_z, new_name, list/new_traits = list()) z_value = new_z @@ -17,6 +17,6 @@ SSmapping.z_trait_levels[trait] += list(new_z) else // in case a single trait is passed in SSmapping.z_trait_levels[new_traits] += list(new_z) - - //set_linkage(new_traits[ZTRAIT_LINKAGE]) + x_bounds = world.maxx + y_bounds = world.maxy