diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index a870bd689b8..065e4b03e82 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -3,35 +3,31 @@ SUBSYSTEM_DEF(mapping) init_order = INIT_ORDER_MAPPING // 9 flags = SS_NO_FIRE -/datum/controller/subsystem/mapping/New() - NEW_SS_GLOBAL(SSmapping) - return ..() - /datum/controller/subsystem/mapping/Initialize(timeofday) - // Load all Z level templates - preloadTemplates() - // Pick a random away mission. - if(!config.disable_away_missions) - createRandomZlevel() - // Seed space ruins - if(!config.disable_space_ruins) - var/timer = start_watch() - log_startup_progress("Creating random space levels...") - 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.") + // Load all Z level templates + preloadTemplates() + // Pick a random away mission. + if(!config.disable_away_missions) + createRandomZlevel() + // Seed space ruins + if(!config.disable_space_ruins) + var/timer = start_watch() + log_startup_progress("Creating random space levels...") + 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.") - // load in extra levels of space ruins + // load in extra levels of space ruins - var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max) - 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 = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max) + 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) - // Setup the Z-level linkage - space_manager.do_transition_setup() - // Populate mining Z-level hidden rooms - for(var/i=0, i