From af64e7a8edd6c8c6ea96147a42adf24fb5e4d61a Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Sat, 4 Aug 2018 13:35:10 -0700 Subject: [PATCH] Space ruins no longer can fill the border of the level --- code/controllers/master_controller.dm | 11 +++++------ code/modules/awaymissions/zlevel.dm | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 7606149c39d..ee0d3c80b01 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -46,13 +46,12 @@ var/global/pipe_processing_killed = 0 seedRuins(level_name_to_num(EMPTY_AREA), rand(0, 3), /area/space, space_ruins_templates) log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.") - // We'll keep this around for the time when we finally expunge all - // code that checks on hard-defined z positions + // load in extra levels of space ruins - // var/num_extra_space = 6 - // for(var/i = 1, i <= num_extra_space, i++) - // var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED) - // seedRuins(zlev, rand(0, 3), /area/space, space_ruins_templates) + var/num_extra_space = 6 + for(var/i = 1, i <= num_extra_space, i++) + var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED) + seedRuins(zlev, rand(0, 3), /area/space, space_ruins_templates) space_manager.do_transition_setup() diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 65220b0b754..c0bc96489b4 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -156,7 +156,8 @@ var/global/list/potentialRandomZlevels = generateMapList(filename = "config/away while(sanity > 0) sanity-- - var/turf/T = locate(rand(25, world.maxx - 25), rand(25, world.maxy - 25), z_level) + // 8: 7 is the normal view distance of a client, +1 so that ruins don't suddenly appear + var/turf/T = locate(rand(TRANSITION_BORDER_WEST + (8 + ruin.width/2), TRANSITION_BORDER_EAST - (8 + ruin.width/2)), rand(TRANSITION_BORDER_SOUTH + (8 + ruin.height/2), TRANSITION_BORDER_NORTH - (8 + ruin.height/2)), z_level) var/valid = 1 for(var/turf/check in ruin.get_affected_turfs(T,1))