From f26e4a03804e0a626ba0b9a7dcc323b3f954f023 Mon Sep 17 00:00:00 2001
From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Date: Sat, 27 Jul 2024 21:00:57 +0200
Subject: [PATCH] Collapse dmms (#19698)
Collapsed all the multi-z dmm maps into single-file dmms
Moved some of the map geometry into traits
---
aurorastation.dme | 1 +
code/__DEFINES/misc.dm | 6 -
code/__HELPERS/areas.dm | 3 -
code/__HELPERS/game.dm | 9 +-
code/__HELPERS/global_lists.dm | 2 +-
code/__HELPERS/level_traits.dm | 30 +
code/__HELPERS/turfs.dm | 2 +-
.../subsystems/evacuation/evacuation_pods.dm | 3 +-
.../subsystems/initialization/atlas.dm | 59 +-
code/controllers/subsystems/mapping.dm | 9 +-
.../controllers/subsystems/spatial_gridmap.dm | 2 +-
code/controllers/subsystems/ticker.dm | 9 +-
.../controllers/subsystems/virtual_reality.dm | 6 +-
code/datums/ruins.dm | 15 +-
code/defines/procs/announce.dm | 10 +-
code/game/antagonist/antagonist_print.dm | 4 +-
code/game/area/areas.dm | 2 +-
.../gamemodes/cult/runes/summon_narsie.dm | 2 +-
code/game/gamemodes/events/clang.dm | 6 +-
.../gamemodes/events/holidays/christmas.dm | 2 +-
code/game/gamemodes/events/power_failure.dm | 6 +-
code/game/gamemodes/events/wormholes.dm | 2 +-
code/game/gamemodes/game_mode.dm | 2 +-
.../newmalf_ability_trees/tree_networking.dm | 4 +-
code/game/gamemodes/meteor/meteor.dm | 2 +-
code/game/gamemodes/nuclear/nuclear.dm | 2 +-
code/game/gamemodes/objective.dm | 2 +-
code/game/machinery/camera/tracking.dm | 4 +-
code/game/machinery/computer/computer.dm | 2 +-
code/game/machinery/computer/law.dm | 4 +-
code/game/machinery/cryopod.dm | 2 +-
code/game/machinery/newscaster.dm | 4 +-
code/game/machinery/nuclear_bomb.dm | 2 +-
code/game/machinery/telecomms/broadcasting.dm | 4 +-
code/game/objects/items/blueprints.dm | 2 +-
.../devices/drop_targeter/_droptargeter.dm | 2 +-
code/game/objects/items/devices/spy_bug.dm | 2 +-
code/game/objects/items/weapons/RFD.dm | 2 +-
code/game/turfs/space/space.dm | 4 +-
code/game/turfs/turf.dm | 4 +-
.../admin/secrets/fun_secrets/ghost_mode.dm | 2 +-
code/modules/admin/verbs/diagnostics.dm | 2 +-
code/modules/alarm/alarm_handler.dm | 2 +-
code/modules/events/apc_damage.dm | 2 +-
code/modules/events/brand_intelligence.dm | 2 +-
code/modules/events/camera_damage.dm | 2 +-
code/modules/events/event.dm | 2 +-
code/modules/events/spider_infestation.dm | 2 +-
code/modules/events/vent_clog.dm | 2 +-
code/modules/events/wallrot.dm | 2 +-
code/modules/hallucinations/types/basic.dm | 4 +-
code/modules/mapping/map_template.dm | 107 +-
.../mapping/space_management/traits.dm | 39 +
code/modules/mining/mine_items.dm | 2 +-
code/modules/mining/mine_turfs.dm | 6 +-
code/modules/mining/minebot.dm | 2 +-
code/modules/mob/living/silicon/ai/malf.dm | 2 +-
.../silicon/robot/drone/drone_console.dm | 4 +-
code/modules/mob/living/silicon/robot/life.dm | 2 +-
.../hostile/hivebots/hivebot_beacon.dm | 6 +-
.../file_system/programs/generic/map.dm | 6 +-
.../programs/security/implant_tracker.dm | 6 +-
.../hardware/network_card.dm | 2 +-
code/modules/overmap/sectors.dm | 2 +-
code/modules/power/smes.dm | 2 +-
.../projectiles/guns/energy/special.dm | 2 +-
code/modules/projectiles/pins.dm | 2 +-
.../Chemistry-Reagents-Other.dm | 2 +-
code/modules/shuttles/departmental.dm | 2 +-
code/modules/shuttles/landmarks.dm | 2 +-
code/modules/shuttles/shuttle_autodock.dm | 2 +-
code/modules/supermatter/supermatter.dm | 2 +-
code/unit_tests/map_tests.dm | 10 +-
code/unit_tests/ruins_tests.dm | 38 +-
html/changelogs/fluffyghost-collapsedmms.yml | 59 +
maps/_common/mapsystem/map.dm | 11 +-
.../abandoned_diner/abandoned_diner.dm | 2 +-
.../abandoned_industrial_station_.dm | 2 +-
.../away/away_site/abandoned_mining/cursed.dm | 2 +-
.../abandoned_propellant_depot_.dm | 2 +-
.../away_site/big_derelict/bigderelict.dm | 2 +-
maps/away/away_site/blueriver/blueriver-1.dmm | 10420 -
maps/away/away_site/blueriver/blueriver-2.dmm | 11111 -
maps/away/away_site/blueriver/blueriver.dm | 9 +-
maps/away/away_site/blueriver/blueriver.dmm | 21527 +
.../crashed_elyran_tanker.dm | 2 +-
.../crystal_planet_outpost_.dm | 2 +-
maps/away/away_site/cult_base/cult_base_.dm | 2 +-
.../away_site/first_aurora/first_aurora.dm | 2 +-
.../away/away_site/hivebot_hub/hivebot_hub.dm | 3 +-
.../away/away_site/idris_wreck/idris_wreck.dm | 2 +-
.../konyang/point_verdant/point_verdant-1.dmm | 83122 ---
.../konyang/point_verdant/point_verdant-2.dmm | 85224 ---
.../konyang/point_verdant/point_verdant-3.dmm | 72349 ---
.../konyang/point_verdant/point_verdant.dm | 11 +-
.../konyang/point_verdant/point_verdant.dmm | 238832 ++++++++
maps/away/away_site/magshield/magshield.dm | 2 +-
.../orion/orion_automated_station.dm | 2 +-
.../overgrown_mining_station.dm | 2 +-
.../away/away_site/pirate_base/pirate_base.dm | 2 +-
maps/away/away_site/racers/racers.dm | 2 +-
.../away_site/romanovich/grand_romanovich.dm | 2 +-
.../hegemony_waypoint/hegemony_waypoint.dm | 2 +-
.../solarian_prewar/sensor_relay.dm | 2 +-
maps/away/away_site/shady/shady.dm | 2 +-
maps/away/away_site/sol_bunker/bunker.dm | 2 +-
.../tajara/mining_jack/mining_jack.dm | 2 +-
.../tajara/peoples_station/peoples_station.dm | 2 +-
.../tajara/pra_satellite/pra_satellite.dm | 2 +-
.../saniorios_outpost/saniorios_outpost.dm | 2 +-
.../away_site/tajara/scrapper/scrapper.dm | 2 +-
.../tajara/taj_safehouse/tajara_safehouse.dm | 2 +-
.../uueoaesa/omgolo/omgolo_smuggler.dm | 2 +-
.../uueoaesa/omgolo/omgolo_tourist.dm | 2 +-
.../uueoaesa/reclamation/ihss_reclamation.dm | 2 +-
.../uueoaesa/tret/tret_industrial_complex_.dm | 2 +-
.../wrecked_nt_ship/wrecked_nt_ship.dm | 2 +-
.../zavod_shuttle_destroyed.dm | 2 +-
maps/away/away_sites.dm | 1 +
.../biesel/tcaf_corvette/tcaf_corvette.dm | 2 +-
.../tcfl_patrol/tcfl_peacekeeper_ship.dm | 2 +-
maps/away/ships/casino/casino.dm | 2 +-
maps/away/ships/coc/coc_ranger/coc_ship.dm | 2 +-
maps/away/ships/coc/coc_scarab/coc_scarab.dm | 9 +-
maps/away/ships/coc/coc_scarab/coc_scarab.dmm | 144226 +++++
.../coc/coc_scarab/coc_scarab_deck_1.dmm | 68516 ---
.../coc/coc_scarab/coc_scarab_deck_2.dmm | 75841 ---
.../ships/coc/coc_surveyor/coc_surveyor.dm | 2 +-
.../coc/gadpathur_patrol/gadpathur_patrol.dm | 2 +-
.../dionae/diona_rokz_ship/diona_rokz_ship.dm | 2 +-
.../dionae/diona_serz_ship/diona_serz_ship.dm | 2 +-
.../dominian_corvette/dominian_corvette.dm | 2 +-
.../dominian_science_vessel.dm | 2 +-
.../dominian_unathi_privateer.dm | 2 +-
.../ships/dpra/hailstorm/hailstorm_ship.dm | 2 +-
maps/away/ships/einstein/ee_spy_ship.dm | 2 +-
.../elyra/elyra_corvette/elyra_corvette.dm | 2 +-
maps/away/ships/freebooter/freebooter_ship.dm | 2 +-
maps/away/ships/golden_deep/golden_deep.dm | 2 +-
.../fishing_trawler/fishing_league_trawler.dm | 2 +-
.../hegemony_corvette/hegemony_corvette.dm | 2 +-
.../merchants_guild/merchant_freighter.dm | 2 +-
.../miners_guild/miners_guild_station.dm | 2 +-
.../ships/heph/cyclops/cyclops_mining_ship.dm | 2 +-
.../ships/heph/heph_security/heph_security.dm | 2 +-
maps/away/ships/iac/iac_rescue_ship.dm | 2 +-
maps/away/ships/idris/idris_cruiser.dm | 2 +-
.../away/ships/kataphracts/kataphract_ship.dm | 2 +-
.../ships/konyang/air_konyang/air_konyang.dm | 2 +-
.../einstein_shuttle/einstein_shuttle.dm | 2 +-
.../konyang/ipc_refugee/ipc_refugee_ship.dm | 2 +-
.../away/ships/konyang/kasf_ship/kasf_ship.dm | 2 +-
.../konyang/konyang_wreck/konyang_wreck.dm | 2 +-
.../ships/konyang/water_barge/water_barge.dm | 2 +-
.../ships/nka/nka_merchant/nka_merchant.dm | 2 +-
maps/away/ships/orion/orion_express_ship.dm | 2 +-
.../database_freighter/database_freighter.dm | 2 +-
.../ships/pra/headmaster/headmaster_ship.dm | 2 +-
maps/away/ships/sadar_scout/sadar_scout.dm | 2 +-
maps/away/ships/scc/scc_scout_ship.dm | 2 +-
.../ships/sol/sol_merc/fsf_patrol_ship.dm | 2 +-
.../ships/sol/sol_pirate/sfa_patrol_ship.dm | 2 +-
maps/away/ships/sol/sol_ssmd/ssmd_ship.dm | 2 +-
.../ships/tajara/circus/adhomian_circus.dm | 2 +-
.../tajara/taj_smuggler/tajaran_smuggler.dm | 2 +-
.../tirakqi_smuggler/tirakqi_smuggler.dm | 2 +-
.../ships/tramp_freighter/tramp_freighter.dm | 2 +-
.../hiskyn/unathi_pirate_hiskyn.dm | 2 +-
.../izharshan/unathi_pirate_izharshan.dm | 2 +-
.../tarwa/unathi_pirate_tarwa.dm | 2 +-
.../ships/wildlands_militia/militia_ship.dm | 2 +-
maps/away/ships/xanu/xanu_frigate.dm | 2 +-
maps/away/ships/yacht/yacht.dm | 2 +-
maps/away/ships/yacht_civ/yacht_civ_.dm | 2 +-
maps/away_sites_testing/away_sites_testing.dm | 6 +-
maps/event/code/event.dm | 1 -
maps/event/generic_dock/code/generic_dock.dm | 1 -
maps/event/halloween/halloween.dm | 1 -
maps/event/idris_cruise/code/idris_cruise.dm | 1 -
maps/event/rooftop/code/rooftop.dm | 1 -
maps/exoplanet_testing/exoplanet_testing.dm | 6 +-
...et_testing-1.dmm => exoplanet_testing.dmm} | 0
.../adhomai/adhomai_abadoned_village.dm | 2 +-
.../adhomai/adhomai_abandoned_labor_camp.dm | 2 +-
.../exoplanets/adhomai/adhomai_amohdan.dm | 2 +-
.../exoplanets/adhomai/adhomai_archeology.dm | 2 +-
.../exoplanets/adhomai/adhomai_bar.dm | 2 +-
.../exoplanets/adhomai/adhomai_battlefield.dm | 2 +-
.../exoplanets/adhomai/adhomai_cavern.dm | 2 +-
.../adhomai/adhomai_cavern_geist.dm | 2 +-
.../adhomai/adhomai_chemical_testing.dm | 2 +-
.../exoplanets/adhomai/adhomai_deserter.dm | 2 +-
.../adhomai/adhomai_fallout_bunker.dm | 2 +-
.../exoplanets/adhomai/adhomai_hunting.dm | 2 +-
.../exoplanets/adhomai/adhomai_minefield.dm | 2 +-
.../adhomai/adhomai_nuclear_waste.dm | 2 +-
.../adhomai_nuclear_waste_makeshift.dm | 2 +-
.../adhomai/adhomai_president_hadii_statue.dm | 2 +-
.../adhomai_president_hadii_statue_toppled.dm | 2 +-
.../exoplanets/adhomai/adhomai_rafama_herd.dm | 2 +-
.../adhomai/adhomai_raskara_ritual.dm | 2 +-
.../adhomai/adhomai_raskariim_hideout.dm | 2 +-
.../adhomai/adhomai_rredouane_shrine.dm | 2 +-
.../adhomai/adhomai_schlorrgo_cage.dm | 2 +-
.../exoplanets/adhomai/adhomai_silo.dm | 2 +-
.../adhomai/adhomai_sole_rock_nomad.dm | 2 +-
.../adhomai/adhomai_tunneler_nest.dm | 2 +-
.../exoplanets/adhomai/adhomai_village.dm | 2 +-
.../adhomai/adhomai_war_memorial.dm | 2 +-
.../exoplanets/adhomai/ala_base.dm | 2 +-
.../exoplanets/adhomai/ala_cell.dm | 2 +-
.../exoplanets/adhomai/nka_base.dm | 2 +-
.../exoplanets/adhomai/north_pole_monolith.dm | 2 +-
.../adhomai/north_pole_nka_expedition.dm | 2 +-
.../exoplanets/adhomai/north_pole_worm.dm | 2 +-
.../exoplanets/adhomai/pra_base.dm | 2 +-
.../exoplanets/adhomai/pra_mining_camp.dm | 2 +-
.../exoplanets/adhomai/psis_outpost.dm | 2 +-
.../abandoned_prison/abandoned_prison.dm | 2 +-
.../exoplanets/asteroid/asteroid.dm | 28 +-
.../asteroid/coalition_base/coalition_base.dm | 2 +-
.../biesel/abandoned_warehouse_1.dm | 2 +-
.../biesel/abandoned_warehouse_2.dm | 2 +-
.../exoplanets/biesel/biesel_camp_site.dm | 2 +-
.../exoplanets/biesel/biesel_crash.dm | 2 +-
.../exoplanets/biesel/cargo_ruins_1.dm | 2 +-
.../exoplanets/biesel/cargo_ruins_2.dm | 2 +-
.../exoplanets/biesel/cargo_ruins_3.dm | 2 +-
.../exoplanets/biesel/pra_camp_site.dm | 2 +-
.../exoplanets/burzsia/burzsia_dead_ipc.dm | 2 +-
.../exoplanets/burzsia/burzsia_mining.dm | 2 +-
.../exoplanets/crashed_pod/crashed_pod.dm | 2 +-
.../exoplanets/delivery/delivery_site.dm | 2 +-
maps/random_ruins/exoplanets/desert/desert.dm | 2 +-
maps/random_ruins/exoplanets/grove/grove.dm | 4 +-
.../exoplanets/haneunim/haneunim_crash.dm | 2 +-
.../exoplanets/haneunim/haneunim_flag.dm | 2 +-
.../exoplanets/haneunim/haneunim_mining.dm | 2 +-
.../exoplanets/haneunim/haneunim_mystery.dm | 2 +-
.../exoplanets/haneunim/haneunim_refugees.dm | 2 +-
.../konyang/abandoned/abandoned_outpost.dm | 2 +-
.../konyang/abandoned/abandoned_village.dm | 2 +-
.../konyang/abandoned/factory_arms.dm | 2 +-
.../konyang/abandoned/factory_refinery.dm | 2 +-
.../konyang/abandoned/factory_robotics.dm | 2 +-
.../exoplanets/konyang/abandoned/garage.dm | 2 +-
.../konyang/abandoned/house _small.dm | 2 +-
.../konyang/abandoned/landing_zone.dm | 2 +-
.../exoplanets/konyang/abandoned/office.dm | 2 +-
.../konyang/abandoned/rural_clinic.dm | 2 +-
.../exoplanets/konyang/fireoutpost.dm | 2 +-
.../exoplanets/konyang/hivebot_burrows_1.dm | 2 +-
.../exoplanets/konyang/hivebot_burrows_2.dm | 2 +-
.../exoplanets/konyang/homestead.dm | 2 +-
.../exoplanets/konyang/jeweler_nest.dm | 2 +-
.../exoplanets/konyang/landing_zone.dm | 2 +-
.../konyang/ocean/naval_landing_zone.dm | 2 +-
.../exoplanets/konyang/ocean/reef.dm | 2 +-
.../exoplanets/konyang/pirate_moonshine.dm | 2 +-
.../exoplanets/konyang/pirate_outpost.dm | 2 +-
.../exoplanets/konyang/stranded_police.dm | 2 +-
.../exoplanets/konyang/swamp_1.dm | 2 +-
.../exoplanets/konyang/swamp_2.dm | 2 +-
.../exoplanets/konyang/swamp_3.dm | 2 +-
.../exoplanets/konyang/swamp_4.dm | 2 +-
.../exoplanets/konyang/telecomms_outpost.dm | 2 +-
.../exoplanets/konyang/tribute.dm | 2 +-
.../exoplanets/konyang/village.dm | 2 +-
maps/random_ruins/exoplanets/lava/lava.dm | 2 +-
.../exoplanets/moghes/moghes_bar.dm | 2 +-
.../exoplanets/moghes/moghes_dead_guwandi.dm | 2 +-
.../exoplanets/moghes/moghes_diona_traders.dm | 2 +-
.../exoplanets/moghes/moghes_fishing_spot.dm | 2 +-
.../moghes/moghes_gawgaryn_bikers.dm | 2 +-
.../moghes/moghes_gawgaryn_riders.dm | 2 +-
.../exoplanets/moghes/moghes_guild_mining.dm | 2 +-
.../exoplanets/moghes/moghes_guwandi.dm | 2 +-
.../exoplanets/moghes/moghes_hegemony_base.dm | 2 +-
.../exoplanets/moghes/moghes_heph_mining.dm | 2 +-
.../moghes/moghes_kataphract_wasteland.dm | 2 +-
.../exoplanets/moghes/moghes_kung_fu.dm | 2 +-
.../exoplanets/moghes/moghes_memorial.dm | 2 +-
.../exoplanets/moghes/moghes_otzek_herd.dm | 2 +-
.../exoplanets/moghes/moghes_ruined_base.dm | 2 +-
.../exoplanets/moghes/moghes_siakh.dm | 2 +-
.../exoplanets/moghes/moghes_skakh.dm | 2 +-
.../exoplanets/moghes/moghes_thakh.dm | 2 +-
.../moghes/moghes_threshbeast_herd.dm | 2 +-
.../moghes/moghes_untouched_tyrant.dm | 2 +-
.../moghes/moghes_untouched_village.dm | 2 +-
.../moghes/moghes_wasteland_battlefield.dm | 2 +-
.../moghes/moghes_wasteland_bomb.dm | 2 +-
.../moghes/moghes_wasteland_crash.dm | 2 +-
.../moghes/moghes_wasteland_crater.dm | 2 +-
.../moghes/moghes_wasteland_dorviza.dm | 2 +-
.../moghes/moghes_wasteland_izwesk.dm | 2 +-
.../moghes/moghes_wasteland_klax.dm | 2 +-
.../moghes/moghes_wasteland_mikuetz.dm | 2 +-
.../moghes/moghes_wasteland_oasis.dm | 2 +-
.../moghes/moghes_wasteland_ozeuoi.dm | 2 +-
.../moghes/moghes_wasteland_priests.dm | 2 +-
.../moghes/moghes_wasteland_queendom.dm | 2 +-
.../moghes/moghes_wasteland_reclaimer.dm | 2 +-
.../moghes/moghes_wasteland_tomb.dm | 2 +-
.../moghes/moghes_wasteland_tyrant.dm | 2 +-
.../moghes/moghes_wasteland_vihnmes.dm | 2 +-
.../moghes/moghes_wasteland_village.dm | 2 +-
.../exoplanets/new_gibson/gibson_mining.dm | 2 +-
.../exoplanets/new_gibson/gibson_resupply.dm | 2 +-
.../exoplanets/ouerea/ouerea_autakh.dm | 2 +-
.../exoplanets/ouerea/ouerea_bar.dm | 2 +-
.../exoplanets/ouerea/ouerea_battlefield.dm | 2 +-
.../exoplanets/ouerea/ouerea_farm.dm | 2 +-
.../exoplanets/ouerea/ouerea_fishing_spot.dm | 2 +-
.../exoplanets/ouerea/ouerea_freewater.dm | 2 +-
.../exoplanets/ouerea/ouerea_guild_mining.dm | 2 +-
.../exoplanets/ouerea/ouerea_hegemony_base.dm | 2 +-
.../exoplanets/ouerea/ouerea_heph_mining.dm | 2 +-
.../exoplanets/ouerea/ouerea_nt_ruin.dm | 2 +-
.../exoplanets/ouerea/ouerea_otzek_herd.dm | 2 +-
.../exoplanets/ouerea/ouerea_rev_memorial.dm | 2 +-
.../exoplanets/ouerea/ouerea_skrell_base.dm | 2 +-
.../exoplanets/ouerea/ouerea_sol_base.dm | 2 +-
.../ouerea/ouerea_threshbeast_herd.dm | 2 +-
.../exoplanets/ouerea/ouerea_village.dm | 2 +-
.../raskara/pra_exploration_drone.dm | 2 +-
.../exoplanets/raskara/raskara_okon.dm | 2 +-
.../exoplanets/raskara/raskara_ritual.dm | 2 +-
.../exoplanets/raskara/raskara_wreck.dm | 2 +-
.../uueoaesa/heph_mining_station.dm | 2 +-
.../exoplanets/uueoaesa/heph_survey_post.dm | 2 +-
.../exoplanets/uueoaesa/izweski_probe.dm | 2 +-
.../exoplanets/uueoaesa/kazhkz_crash.dm | 2 +-
.../uueoaesa/miners_guild_outpost.dm | 2 +-
.../uueoaesa/pid_crashed_shuttle.dm | 2 +-
.../exoplanets/uueoaesa/pid_kois_farm.dm | 2 +-
.../exoplanets/uueoaesa/sol_listening_post.dm | 2 +-
maps/random_ruins/space_ruins/space_ruins.dm | 4 +-
maps/runtime/code/runtime.dm | 12 +-
maps/runtime/runtime-1.dmm | 67904 ---
maps/runtime/runtime-2.dmm | 66779 ---
maps/runtime/runtime-3.dmm | 68192 ---
maps/runtime/runtime-9.dmm | 65551 ---
maps/runtime/runtime.dmm | 268386 +++++++++
maps/sccv_horizon/code/sccv_horizon.dm | 12 +-
maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 76312 ---
maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 93193 ----
maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 75870 ---
maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 105582 ----
maps/sccv_horizon/sccv_horizon.dmm | 425823 +++++++++++++++
...izon-1_deck_1.jsonc => sccv_horizon.jsonc} | 0
maps/templates/distress/distress_equipment.dm | 10 +-
maps/templates/orbital/orbital_templates.dm | 16 +-
353 files changed, 1099460 insertions(+), 1026492 deletions(-)
create mode 100644 code/__HELPERS/level_traits.dm
create mode 100644 html/changelogs/fluffyghost-collapsedmms.yml
delete mode 100644 maps/away/away_site/blueriver/blueriver-1.dmm
delete mode 100644 maps/away/away_site/blueriver/blueriver-2.dmm
create mode 100644 maps/away/away_site/blueriver/blueriver.dmm
delete mode 100644 maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm
delete mode 100644 maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm
delete mode 100644 maps/away/away_site/konyang/point_verdant/point_verdant-3.dmm
create mode 100644 maps/away/away_site/konyang/point_verdant/point_verdant.dmm
create mode 100644 maps/away/ships/coc/coc_scarab/coc_scarab.dmm
delete mode 100644 maps/away/ships/coc/coc_scarab/coc_scarab_deck_1.dmm
delete mode 100644 maps/away/ships/coc/coc_scarab/coc_scarab_deck_2.dmm
rename maps/exoplanet_testing/{exoplanet_testing-1.dmm => exoplanet_testing.dmm} (100%)
delete mode 100644 maps/runtime/runtime-1.dmm
delete mode 100644 maps/runtime/runtime-2.dmm
delete mode 100644 maps/runtime/runtime-3.dmm
delete mode 100644 maps/runtime/runtime-9.dmm
create mode 100644 maps/runtime/runtime.dmm
delete mode 100644 maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
delete mode 100644 maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
delete mode 100644 maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
delete mode 100644 maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
create mode 100644 maps/sccv_horizon/sccv_horizon.dmm
rename maps/sccv_horizon/{sccv_horizon-1_deck_1.jsonc => sccv_horizon.jsonc} (100%)
diff --git a/aurorastation.dme b/aurorastation.dme
index 2b81ad11af0..23bc20053f6 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -187,6 +187,7 @@
#include "code\__HELPERS\icon_smoothing.dm"
#include "code\__HELPERS\icons.dm"
#include "code\__HELPERS\images.dm"
+#include "code\__HELPERS\level_traits.dm"
#include "code\__HELPERS\lists.dm"
#include "code\__HELPERS\maths.dm"
#include "code\__HELPERS\matrices.dm"
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index d33e0b86fcf..97c1ed184c2 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -320,12 +320,6 @@
#define DEFAULT_SIGHT (SEE_SELF)
-#define isStationLevel(Z) ((Z) in SSatlas.current_map.station_levels)
-#define isNotStationLevel(Z) !isStationLevel(Z)
-
-#define isPlayerLevel(Z) ((Z) in SSatlas.current_map.player_levels)
-#define isNotPlayerLevel(Z) !isPlayerLevel(Z)
-
#define isAdminLevel(Z) ((Z) in SSatlas.current_map.admin_levels)
#define isNotAdminLevel(Z) !isAdminLevel(Z)
diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm
index e281dd60edb..e3c4ea38fcc 100644
--- a/code/__HELPERS/areas.dm
+++ b/code/__HELPERS/areas.dm
@@ -88,9 +88,6 @@
/proc/is_contact_area(var/area/A)
. = isContactLevel(A.z)
-/proc/is_player_area(var/area/A)
- . = isPlayerLevel(A.z)
-
/proc/is_not_space_area(var/area/A)
. = !istype(A,/area/space)
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 86cfd7aac06..cce6b4fc41e 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -1,15 +1,8 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-/proc/is_on_same_plane_or_station(var/z1, var/z2)
- if(z1 == z2)
- return 1
- if(isStationLevel(z1) && isStationLevel(z2))
- return 1
- return 0
-
/proc/max_default_z_level()
var/max_z = 0
- for(var/z in SSatlas.current_map.station_levels)
+ for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
max_z = max(z, max_z)
for(var/z in SSatlas.current_map.admin_levels)
max_z = max(z, max_z)
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 6ecc00f0b22..bcd300aa7bb 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -46,7 +46,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
/// List of all implants. Used for teleportation/tracking implants.
GLOBAL_LIST_EMPTY(implants)
-/// Turf is added to this list if isStationLevel() passes when it's initialized.
+/// Turf is added to this list if is_station_level() passes when it's initialized.
GLOBAL_LIST_EMPTY(station_turfs)
/// List of all instanced areas by type.
GLOBAL_LIST_EMPTY(areas_by_type)
diff --git a/code/__HELPERS/level_traits.dm b/code/__HELPERS/level_traits.dm
new file mode 100644
index 00000000000..0e489f3f572
--- /dev/null
+++ b/code/__HELPERS/level_traits.dm
@@ -0,0 +1,30 @@
+// Helpers for checking whether a z-level conforms to a specific requirement
+
+// Basic levels
+#define is_centcom_level(z) SSmapping.level_trait(z, ZTRAIT_CENTCOM)
+
+GLOBAL_LIST_EMPTY(station_levels_cache)
+
+// Used to prevent z from being re-evaluated
+GLOBAL_VAR(station_level_z_scratch)
+
+// Called a lot, somewhat slow, so has its own cache
+#define is_station_level(z_level) \
+ ( \
+ (z_level) && \
+ ( \
+ /* The right hand side of this guarantees that we'll have the space to fill later on, while also not failing the condition */ \
+ (GLOB.station_levels_cache.len < (GLOB.station_level_z_scratch = (z_level)) && (GLOB.station_levels_cache.len = GLOB.station_level_z_scratch)) \
+ || isnull(GLOB.station_levels_cache[GLOB.station_level_z_scratch]) \
+ ) \
+ ? (GLOB.station_levels_cache[GLOB.station_level_z_scratch] = !!SSmapping.level_trait(GLOB.station_level_z_scratch, ZTRAIT_STATION)) \
+ : GLOB.station_levels_cache[GLOB.station_level_z_scratch] \
+ )
+
+#define is_mining_level(z) SSmapping.level_trait(z, ZTRAIT_MINING)
+
+#define is_reserved_level(z) SSmapping.level_trait(z, ZTRAIT_RESERVED)
+
+#define is_away_level(z) SSmapping.level_trait(z, ZTRAIT_AWAY)
+
+#define is_secret_level(z) SSmapping.level_trait(z, ZTRAIT_SECRET)
diff --git a/code/__HELPERS/turfs.dm b/code/__HELPERS/turfs.dm
index ecb6c769565..7ee4cb962db 100644
--- a/code/__HELPERS/turfs.dm
+++ b/code/__HELPERS/turfs.dm
@@ -110,7 +110,7 @@
return !turf_contains_dense_objects(T)
/proc/is_station_turf(var/turf/T)
- return T && isStationLevel(T.z)
+ return T && is_station_level(T.z)
/proc/is_below_sound_pressure(var/turf/T)
var/datum/gas_mixture/environment = T ? T.return_air() : null
diff --git a/code/controllers/subsystems/evacuation/evacuation_pods.dm b/code/controllers/subsystems/evacuation/evacuation_pods.dm
index 1f2f4ba0811..4d2c0a0327e 100644
--- a/code/controllers/subsystems/evacuation/evacuation_pods.dm
+++ b/code/controllers/subsystems/evacuation/evacuation_pods.dm
@@ -47,7 +47,8 @@
if(TRANSFER_JUMP)
// Bluespace Jump
priority_announcement.Announce(replacetext(replacetext(SSatlas.current_map.bluespace_leaving_dock, "%dock_name%", "[SSatlas.current_map.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
- SetUniversalState(/datum/universal_state/bluespace_jump, arguments=list(SSatlas.current_map.station_levels))
+ SetUniversalState(/datum/universal_state/bluespace_jump, arguments=list(SSmapping.levels_by_trait(ZTRAIT_STATION)))
+
if(TRANSFER_CREW)
priority_announcement.Announce(replacetext(replacetext(SSatlas.current_map.shuttle_leaving_dock, "%dock_name%", "[SSatlas.current_map.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
diff --git a/code/controllers/subsystems/initialization/atlas.dm b/code/controllers/subsystems/initialization/atlas.dm
index 16063b632be..9b4f69f07b6 100644
--- a/code/controllers/subsystems/initialization/atlas.dm
+++ b/code/controllers/subsystems/initialization/atlas.dm
@@ -229,53 +229,26 @@ SUBSYSTEM_DEF(atlas)
filemaps_to_load += list(file)
var/mfile
- var/first_dmm = TRUE
- var/time
+ var/time = world.time
- var/is_first = TRUE
- for(var/i in 1 to length(filemaps_to_load))
- mfile = filemaps_to_load[i]
+ if(length(filemaps_to_load) >= 2)
+ stack_trace("Only one file is now supported per map!")
+ return
- log_subsystem_atlas("Loading '[mfile]'.")
- time = world.time
+ var/datum/space_level/first_level
+ for(var/traits in current_map.traits)
+ var/level = SSmapping.add_new_zlevel(name, traits, contain_turfs = FALSE)
+ if(!first_level)
+ first_level = level
- mfile = "[directory][mfile]"
+ mfile = "[directory][filemaps_to_load[1]]"
- if (overwrite_default_z && first_dmm)
- first_dmm = FALSE
- log_subsystem_atlas("Overwriting first Z.")
-
- var/list/trait = ZTRAITS_STATION
-
- //We're NOT loading the first level
- if(!is_first)
- //Last level is centcomm, noone goes in or out
- if(i == length(filemaps_to_load))
- trait += list(ZTRAIT_UP = FALSE, ZTRAIT_DOWN = FALSE)
- //Last level in the actual stack, can only go down
- else if(i == (length(filemaps_to_load) - 1))
- trait += list(ZTRAIT_UP = FALSE, ZTRAIT_DOWN = TRUE)
- //Bidirectional movement
- else
- trait += list(ZTRAIT_UP = TRUE, ZTRAIT_DOWN = TRUE)
-
- //We're loading the first level, usually it has something above it
- else if(length(filemaps_to_load) >= 2)
- trait += list(ZTRAIT_UP = TRUE, ZTRAIT_DOWN = FALSE)
- else //Special case for single-level maps
- trait += list(ZTRAIT_UP = FALSE, ZTRAIT_DOWN = FALSE)
-
- var/datum/space_level/level = SSmapping.add_new_zlevel(name, trait, contain_turfs = FALSE)
-
- if (!maploader.load_map(file(mfile), 0, 0, level.z_value, no_changeturf = TRUE))
- log_subsystem_atlas("Failed to load '[mfile]'!")
- else
- log_subsystem_atlas("Loaded level in [(world.time - time)/10] seconds.")
-
- is_first = FALSE
-
- .++
- CHECK_TICK
+ if(!maploader.load_map(file(mfile), 0, 0, first_level.z_value, no_changeturf = TRUE))
+ log_subsystem_atlas("Failed to load '[mfile]'!")
+ return FALSE
+ else
+ log_subsystem_atlas("Loaded level in [(world.time - time)/10] seconds.")
+ return TRUE
/datum/controller/subsystem/atlas/proc/get_selected_map()
if (GLOB.config.override_map)
diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm
index b2bb210bb5f..7e05aceaddc 100644
--- a/code/controllers/subsystems/mapping.dm
+++ b/code/controllers/subsystems/mapping.dm
@@ -50,7 +50,7 @@ SUBSYSTEM_DEF(mapping)
/datum/controller/subsystem/mapping/proc/preloadTemplates(path = "maps/templates/") //see master controller setup
var/list/filelist = flist(path)
for(var/map in filelist)
- var/datum/map_template/T = new(paths = list("[path][map]"), rename = "[map]")
+ var/datum/map_template/T = new(path = "[path][map]", rename = "[map]")
map_templates[T.id] = T
preloadBlacklistableTemplates()
@@ -74,10 +74,9 @@ SUBSYSTEM_DEF(mapping)
if (banned_maps)
var/is_banned = FALSE
- for (var/mappath in MT.mappaths)
- if(banned_maps.Find(mappath))
- is_banned = TRUE
- break
+ if(banned_maps.Find(MT.mappath))
+ is_banned = TRUE
+ break
if (is_banned)
continue
diff --git a/code/controllers/subsystems/spatial_gridmap.dm b/code/controllers/subsystems/spatial_gridmap.dm
index 85e5bfebc20..8c25e5f91d6 100644
--- a/code/controllers/subsystems/spatial_gridmap.dm
+++ b/code/controllers/subsystems/spatial_gridmap.dm
@@ -718,7 +718,7 @@ SUBSYSTEM_DEF(spatial_grid)
if(insert_clients)
var/list/turfs
var/level = z
- if(isStationLevel(level))
+ if(is_station_level(level))
turfs = GLOB.station_turfs
else
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index d3c6be4ee4b..1583524456d 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -250,11 +250,11 @@ var/datum/controller/subsystem/ticker/SSticker
var/turf/playerTurf = get_turf(Player)
var/area/playerArea = get_area(playerTurf)
if(evacuation_controller.round_over() && evacuation_controller.evacuation_type == TRANSFER_EMERGENCY)
- if(isStationLevel(playerTurf.z) && is_station_area(playerArea))
+ if(is_station_level(playerTurf.z) && is_station_area(playerArea))
to_chat(Player, SPAN_GOOD(SPAN_BOLD("You managed to survive the events on [station_name()] as [Player.real_name].")))
else
to_chat(Player, SPAN_NOTICE(SPAN_BOLD("You managed to survive, but were marooned as [Player.real_name]...")))
- else if(isStationLevel(playerTurf.z) && is_station_area(playerArea))
+ else if(is_station_level(playerTurf.z) && is_station_area(playerArea))
to_chat(Player, SPAN_GOOD(SPAN_BOLD("You successfully underwent the crew transfer after the events on [station_name()] as [Player.real_name].")))
else if(issilicon(Player))
to_chat(Player, SPAN_GOOD(SPAN_BOLD("You remain operational after the events on [station_name()] as [Player.real_name].")))
@@ -631,7 +631,10 @@ var/datum/controller/subsystem/ticker/SSticker
CHECK_TICK
-/datum/controller/subsystem/ticker/proc/station_explosion_cinematic(station_missed = 0, override = null, list/affected_levels = SSatlas.current_map.station_levels)
+/datum/controller/subsystem/ticker/proc/station_explosion_cinematic(station_missed = 0, override = null, list/affected_levels = list())
+ if(!length(affected_levels))
+ affected_levels = SSmapping.levels_by_trait(ZTRAIT_STATION)
+
if (cinematic)
return //already a cinematic in progress!
diff --git a/code/controllers/subsystems/virtual_reality.dm b/code/controllers/subsystems/virtual_reality.dm
index 2788367bb88..42c2ddbf583 100644
--- a/code/controllers/subsystems/virtual_reality.dm
+++ b/code/controllers/subsystems/virtual_reality.dm
@@ -180,7 +180,7 @@ SUBSYSTEM_DEF(virtualreality)
var/turf/T = get_turf(R)
if(!T)
continue
- if(isNotStationLevel(T.z))
+ if(!is_station_level(T.z))
continue
if(!R.remote)
continue
@@ -212,7 +212,7 @@ SUBSYSTEM_DEF(virtualreality)
var/turf/T = get_turf(R)
if(!T)
continue
- if(isNotStationLevel(T.z))
+ if(!is_station_level(T.z))
continue
if(R.client || R.ckey)
continue
@@ -237,7 +237,7 @@ SUBSYSTEM_DEF(virtualreality)
var/turf/T = get_turf(R)
if(!T)
continue
- if(isNotStationLevel(T.z))
+ if(!is_station_level(T.z))
continue
if(R.client || R.ckey)
continue
diff --git a/code/datums/ruins.dm b/code/datums/ruins.dm
index a965dc08d45..101594d0dd4 100644
--- a/code/datums/ruins.dm
+++ b/code/datums/ruins.dm
@@ -56,15 +56,12 @@
var/prefix = null
/**
- * The dynamic part of the ruin path, ie the files
- *
- * A `/list` with only the file names of the DMM files
- *
+ * The dynamic part of the ruin path, ie the file
* eg. `my_awesome_ruin.dmm`
*
- * Gets combined with the prefix to form the path to the map files, that are loaded when the ruin loads
+ * Gets combined with the prefix to form the path to the map file, that are loaded when the ruin loads
*/
- var/list/suffixes = null
+ var/suffix = null
/// Template flags for this ruin
template_flags = TEMPLATE_FLAG_NO_RUINS
@@ -86,10 +83,8 @@
*/
/datum/map_template/ruin/New(var/list/paths = null, rename = null)
// get the map paths
- if (suffixes)
- mappaths = list()
- for (var/suffix in suffixes)
- mappaths += (prefix + suffix)
+ if (suffix)
+ mappath = (prefix + suffix)
// set up sectors
sectors = flatten_list(sectors)
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index 6467248d251..985c3e32c7d 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -100,10 +100,16 @@
// Format currently matches that of newscaster feeds: Registered Name (Assigned Rank)
return I.assignment ? "[I.registered_name], [I.assignment]" : I.registered_name
-/proc/level_seven_announcement(var/list/affecting_z = SSatlas.current_map.station_levels)
+/proc/level_seven_announcement(var/list/affecting_z = list())
+ if(!length(affecting_z))
+ affecting_z += SSmapping.levels_by_trait(ZTRAIT_STATION)
+
command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/level_7_biohazard.ogg', zlevels = affecting_z)
-/proc/ion_storm_announcement(var/list/affecting_z = SSatlas.current_map.station_levels)
+/proc/ion_storm_announcement(var/list/affecting_z = list())
+ if(!length(affecting_z))
+ affecting_z += SSmapping.levels_by_trait(ZTRAIT_STATION)
+
command_announcement.Announce("It has come to our attention that the ship has passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert", zlevels = affecting_z)
/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message)
diff --git a/code/game/antagonist/antagonist_print.dm b/code/game/antagonist/antagonist_print.dm
index aaa9199f007..17091330ef6 100644
--- a/code/game/antagonist/antagonist_print.dm
+++ b/code/game/antagonist/antagonist_print.dm
@@ -73,7 +73,7 @@
else if(A?.is_prison() || (!A?.is_no_crew_expected() && C?.handcuffed))
// they are either imprisoned, or handcuffed in an area that can't be considered a hideout
text += "apprehended"
- else if(isNotStationLevel(M.z))
+ else if(!is_station_level(M.z))
text += "fled the [SSatlas.current_map.station_type]"
else
text += "survived"
@@ -134,7 +134,7 @@
if(ply.current)
if(ply.current.stat == DEAD)
text += "died"
- else if(isNotStationLevel(ply.current.z))
+ else if(!is_station_level(ply.current.z))
text += "fled the station"
else
text += "survived"
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index f1e00513c2a..05075a8b753 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -410,7 +410,7 @@ var/list/mob/living/forced_ambiance_list = new
if(!Y)
continue
var/area/A = Y
- if (isNotStationLevel(A.z))
+ if (!is_station_level(A.z))
continue
if (istype(A, /area/shuttle) || findtext(A.name, "Docked") || findtext(A.name, "Shuttle"))
continue
diff --git a/code/game/gamemodes/cult/runes/summon_narsie.dm b/code/game/gamemodes/cult/runes/summon_narsie.dm
index 56ee4afafd6..b42121195a1 100644
--- a/code/game/gamemodes/cult/runes/summon_narsie.dm
+++ b/code/game/gamemodes/cult/runes/summon_narsie.dm
@@ -8,7 +8,7 @@
return fizzle(user, A)
var/turf/T = get_turf(A)
- if(isNotStationLevel(T.z))
+ if(!is_station_level(T.z))
to_chat(user, SPAN_WARNING("You are too far from the station, Nar'sie can not be summoned here."))
return fizzle(user, A)
diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm
index 57c68fe2817..681aa5e5657 100644
--- a/code/game/gamemodes/events/clang.dm
+++ b/code/game/gamemodes/events/clang.dm
@@ -74,9 +74,9 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
spawn(0)
walk_towards(immrod, end,1)
sleep(1)
- while (immrod)
- if (isNotStationLevel(immrod.z))
- immrod.z = pick(SSatlas.current_map.station_levels)
+ while(immrod)
+ if(!is_station_level(immrod.z))
+ immrod.z = pick(SSmapping.levels_by_trait(ZTRAIT_STATION))
if(immrod.loc == end)
qdel(immrod)
sleep(10)
diff --git a/code/game/gamemodes/events/holidays/christmas.dm b/code/game/gamemodes/events/holidays/christmas.dm
index 4252971b9bf..77e4a0d1c4c 100644
--- a/code/game/gamemodes/events/holidays/christmas.dm
+++ b/code/game/gamemodes/events/holidays/christmas.dm
@@ -1,6 +1,6 @@
/proc/Christmas_Game_Start()
for(var/obj/structure/flora/tree/pine/xmas in world)
- if(isNotStationLevel(xmas.z)) continue
+ if(!is_station_level(xmas.z)) continue
for(var/turf/simulated/floor/T in orange(1,xmas))
for(var/i=1,i<=rand(1,5),i++)
new /obj/item/a_gift(T)
diff --git a/code/game/gamemodes/events/power_failure.dm b/code/game/gamemodes/events/power_failure.dm
index cb1ba87df61..73c7b83f4c2 100644
--- a/code/game/gamemodes/events/power_failure.dm
+++ b/code/game/gamemodes/events/power_failure.dm
@@ -18,11 +18,11 @@
if(announce)
command_announcement.Announce("The ship's power subroutines have been stabilized and restored.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
for(var/obj/machinery/power/apc/C in SSmachinery.processing)
- if(C.cell && isStationLevel(C.z))
+ if(C.cell && is_station_level(C.z))
C.cell.charge = C.cell.maxcharge
for(var/obj/machinery/power/smes/S in SSmachinery.smes_units)
var/area/current_area = get_area(S)
- if(current_area.type in skipped_areas || isNotStationLevel(S.z))
+ if(current_area.type in skipped_areas || !is_station_level(S.z))
continue
S.charge = S.capacity
S.update_icon()
@@ -33,7 +33,7 @@
if(announce)
command_announcement.Announce("The ship's power subroutines have been stabilized and restored.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
for(var/obj/machinery/power/smes/S in SSmachinery.smes_units)
- if(isNotStationLevel(S.z))
+ if(!is_station_level(S.z))
continue
S.charge = S.capacity
S.output_level = S.output_level_max
diff --git a/code/game/gamemodes/events/wormholes.dm b/code/game/gamemodes/events/wormholes.dm
index 8451d2d3021..e657909200b 100644
--- a/code/game/gamemodes/events/wormholes.dm
+++ b/code/game/gamemodes/events/wormholes.dm
@@ -2,7 +2,7 @@
var/list/pick_turfs = list()
for(var/turf/T in world)
var/turf/simulated/floor/F = T
- if(istype(F) && isStationLevel(F.z))
+ if(istype(F) && is_station_level(F.z))
pick_turfs += F
if(pick_turfs.len)
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 00e94c0e3fc..aff8117b8ce 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -383,7 +383,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
var/turf/playerTurf = get_turf(M)
var/area/playerArea = get_area(playerTurf)
surviving_total++
- if(isStationLevel(playerTurf.z) && is_station_area(playerArea))
+ if(is_station_level(playerTurf.z) && is_station_area(playerArea))
escaped_total++
if(isobserver(M))
ghosts++
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
index b85f0216cf5..0a5e026b72b 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
@@ -233,7 +233,7 @@
log_ability_use(user, "system override (STARTED)")
var/list/remaining_apcs = list()
for(var/obj/machinery/power/apc/A in SSmachinery.processing)
- if(isNotStationLevel(A.z)) // Only station APCs
+ if(!is_station_level(A.z)) // Only station APCs
continue
if(A.hacker == user || A.aidisabled) // This one is already hacked, or AI control is disabled on it.
continue
@@ -279,7 +279,7 @@
sleep(300)
// Hack all APCs, including those built during hack sequence.
for(var/obj/machinery/power/apc/A in SSmachinery.processing)
- if((!A.hacker || A.hacker != src) && !A.aidisabled && isStationLevel(A.z))
+ if((!A.hacker || A.hacker != src) && !A.aidisabled && is_station_level(A.z))
A.ai_hack(src)
log_ability_use(user, "system override (FINISHED)")
diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm
index 71650899faf..446c84a79bb 100644
--- a/code/game/gamemodes/meteor/meteor.dm
+++ b/code/game/gamemodes/meteor/meteor.dm
@@ -71,7 +71,7 @@
next_wave = round_duration_in_ticks + meteor_wave_delay
// Starts as barely noticeable dust impact, ends as barrage of most severe meteor types the code has to offer. Have fun.
spawn()
- spawn_meteors(meteor_severity, get_meteor_types(), pick(GLOB.cardinal), pick(SSatlas.current_map.station_levels))
+ spawn_meteors(meteor_severity, get_meteor_types(), pick(GLOB.cardinal), pick(SSmapping.levels_by_trait(ZTRAIT_STATION)))
var/escalated = FALSE
if(prob(escalation_probability) && (meteor_severity < maximal_severity))
meteor_severity++
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 35e9f2fa7d2..7549fcacdba 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -25,7 +25,7 @@ var/list/nuke_disks = list()
/datum/game_mode/nuclear/proc/check_nuke_disks()
for(var/obj/item/disk/nuclear/N in nuke_disks)
var/turf/T = get_turf(N)
- if(isNotStationLevel(T.z)) qdel(N)
+ if(!is_station_level(T.z)) qdel(N)
//checks if L has a nuke disk on their person
/datum/game_mode/nuclear/proc/check_mob(mob/living/L)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 3559dba7f5d..6025ed5d7a0 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -886,7 +886,7 @@ GLOBAL_LIST_EMPTY(process_objectives)
if(target in revs.current_antagonists)
return 1
var/turf/T = get_turf(H)
- if(T && isNotStationLevel(T.z)) //If they leave the station they count as dead for this
+ if(T && !is_station_level(T.z)) //If they leave the station they count as dead for this
rval = 2
return 0
return rval
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 55efb9cb7e0..f1601759bde 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -6,7 +6,7 @@
/mob/living/silicon/ai/var/stored_locations[0]
/proc/InvalidPlayerTurf(turf/T as turf)
- return !(T && isStationLevel(T.z))
+ return !(T && is_station_level(T.z))
/mob/living/silicon/ai/proc/get_camera_list()
if(src.stat == 2)
@@ -248,7 +248,7 @@
if(. == TRACKING_NO_COVERAGE)
var/turf/T = get_turf(src)
- if(T && isStationLevel(T.z) && hassensorlevel(src, SUIT_SENSOR_TRACKING))
+ if(T && is_station_level(T.z) && hassensorlevel(src, SUIT_SENSOR_TRACKING))
return TRACKING_POSSIBLE
/mob/living/proc/tracking_initiated()
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 12cd8004e35..4d41eb98fc8 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -36,7 +36,7 @@
update_icon()
/obj/machinery/computer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = TRUE)
- if(!operable() || isNotStationLevel(z) || user.stat)
+ if(!operable() || !is_station_level(z) || user.stat)
user.unset_machine()
return
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index 8b9eafe26eb..49feb2a5067 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -28,7 +28,7 @@
/obj/machinery/computer/aiupload/attackby(obj/item/attacking_item, mob/user)
- if(isNotStationLevel(src.z))
+ if(!is_station_level(src.z))
to_chat(user, SPAN_DANGER("Unable to establish a connection:"))
return TRUE
if(istype(attacking_item, /obj/item/aiModule))
@@ -72,7 +72,7 @@
/obj/machinery/computer/borgupload/attackby(obj/item/attacking_item, mob/user)
var/obj/item/aiModule/module = attacking_item
- if(isNotStationLevel(src.z))
+ if(!is_station_level(src.z))
to_chat(user, SPAN_DANGER("Unable to establish a connection:"))
return TRUE
if(istype(module, /obj/item/aiModule))
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index d1bb4e4cd92..ab4924106ac 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -393,7 +393,7 @@ GLOBAL_LIST_EMPTY(frozen_crew)
else
W.forceMove(T)
- if(isStationLevel(z))
+ if(is_station_level(z))
GLOB.global_announcer.autosay("[occupant.real_name], [occupant.mind.role_alt_title], [on_store_message] [on_store_location].", "[on_store_name]")
visible_message(SPAN_NOTICE("\The [src] hums and hisses as it moves [occupant] to [on_store_location]."))
playsound(loc, on_store_sound, 25)
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index eebc2fddfb9..5fef0152426 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -299,7 +299,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
src.scan_user(human_or_robot_user) //Newscaster scans you
- if(isNotStationLevel(z))
+ if(!is_station_level(z))
screen = 24 // No network connectivity
switch(screen)
@@ -1151,7 +1151,7 @@ var/list/obj/machinery/newscaster/allCasters = list()
return
/obj/machinery/newscaster/proc/newsAlert(var/news_call)
- if (isNotStationLevel(z))
+ if (!is_station_level(z))
clearAlert()
return
var/turf/T = get_turf(src)
diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm
index 04f86c38076..21c79583c5f 100644
--- a/code/game/machinery/nuclear_bomb.dm
+++ b/code/game/machinery/nuclear_bomb.dm
@@ -345,7 +345,7 @@ var/bomb_set
var/off_station = 0
var/turf/bomb_location = get_turf(src)
- if(bomb_location && isStationLevel(bomb_location.z))
+ if(bomb_location && is_station_level(bomb_location.z))
if( (bomb_location.x < (128-NUKERANGE)) || (bomb_location.x > (128+NUKERANGE)) || (bomb_location.y < (128-NUKERANGE)) || (bomb_location.y > (128+NUKERANGE)) )
off_station = 1
else
diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm
index 967b2eebf83..3c3e7c6306e 100644
--- a/code/game/machinery/telecomms/broadcasting.dm
+++ b/code/game/machinery/telecomms/broadcasting.dm
@@ -48,7 +48,7 @@
if(!source.loc)
// It's an announcer message, just send it to the horizon's receiver
for(var/obj/machinery/telecomms/receiver/R in SSmachinery.all_receivers)
- if(R.z in SSatlas.current_map.station_levels)
+ if(is_station_level(R.z))
R.receive_signal(src)
return TRUE
@@ -111,7 +111,7 @@
if(SSatlas.current_map.use_overmap)
sector = GLOB.map_sectors["[T.z]"]
else // if the source is in nullspace, it's probably an autosay
- levels = SSatlas.current_map.station_levels
+ levels = SSmapping.levels_by_trait(ZTRAIT_STATION)
origin_level = levels[1]
sector = GLOB.map_sectors["[levels[1]]"]
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index ea8d32b430c..79e13e51a34 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -66,7 +66,7 @@
return TRUE
desc = "Blueprints of the [station_name()]. There is a \"Classified\" stamp and several coffee stains on it."
area_prefix = station_name()
- valid_z_levels = SSatlas.current_map.station_levels
+ valid_z_levels = SSmapping.levels_by_trait(ZTRAIT_STATION)
/obj/item/blueprints/proc/create_blueprint_component() //So that subtypes can override
AddComponent(/datum/component/eye/blueprints)
diff --git a/code/game/objects/items/devices/drop_targeter/_droptargeter.dm b/code/game/objects/items/devices/drop_targeter/_droptargeter.dm
index ce44377f609..ce7e492bc4d 100644
--- a/code/game/objects/items/devices/drop_targeter/_droptargeter.dm
+++ b/code/game/objects/items/devices/drop_targeter/_droptargeter.dm
@@ -44,7 +44,7 @@
var/turf/targloc = get_turf(target)
if(!emagged)
for(var/turf/t in block(locate(targloc.x+3,targloc.y+3,targloc.z), locate(targloc.x-3,targloc.y-3,targloc.z)))
- if (isStationLevel(targloc.z))
+ if (is_station_level(targloc.z))
to_chat(user, SPAN_WARNING("You can't request this orbital drop on the ship!"))
return
if (!isfloor(targloc))
diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm
index a9616ed7c61..493ca147829 100644
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -118,7 +118,7 @@
spawn(0)
while(selected_camera && Adjacent(user))
var/turf/T = get_turf(selected_camera)
- if(!T || !is_on_same_plane_or_station(T.z, user.z) || !selected_camera.can_use())
+ if(!T || !(T.z == user.z || !is_station_level(T.z) || !is_station_level(user.z)) || !selected_camera.can_use())
user.unset_machine()
user.reset_view(null)
to_chat(user, SPAN_NOTICE("[selected_camera] unavailable."))
diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm
index b95b1f87e9d..5135e3fc848 100644
--- a/code/game/objects/items/weapons/RFD.dm
+++ b/code/game/objects/items/weapons/RFD.dm
@@ -772,7 +772,7 @@
to_chat(user, SPAN_WARNING("You can't materialize a pipe here!"))
return FALSE
var/turf/T = get_turf(A)
- if(isNotStationLevel(T.z))
+ if(!is_station_level(T.z))
to_chat(user, SPAN_WARNING("You can't materialize a pipe on this level!"))
return FALSE
return do_pipe(T, user)
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index f38c6759cb8..66542aae437 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -39,8 +39,8 @@
for(var/atom/movable/AM as mob|obj in src)
src.Entered(AM, AM.loc)
- if (isStationLevel(z))
- GLOB.station_turfs += src
+ // if (is_station_level(z))
+ // GLOB.station_turfs += src
if(dynamic_lighting)
luminosity = 0
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 8df6e1b1923..f6b635e67ee 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -95,7 +95,7 @@
for(var/atom/movable/AM as mob|obj in src)
Entered(AM, src)
- if (isStationLevel(z))
+ if (is_station_level(z))
GLOB.station_turfs += src
if(dynamic_lighting)
@@ -135,7 +135,7 @@
changing_turf = FALSE
- if (isStationLevel(z))
+ if (is_station_level(z))
GLOB.station_turfs -= src
remove_cleanables()
diff --git a/code/modules/admin/secrets/fun_secrets/ghost_mode.dm b/code/modules/admin/secrets/fun_secrets/ghost_mode.dm
index aa909fd3f5d..ab3f81a407b 100644
--- a/code/modules/admin/secrets/fun_secrets/ghost_mode.dm
+++ b/code/modules/admin/secrets/fun_secrets/ghost_mode.dm
@@ -30,7 +30,7 @@
step_rand(W)
var/area/A = get_area(M)
- if(A.requires_power && !A.always_unpowered && A.power_light && isPlayerLevel(A.z))
+ if(A.requires_power && !A.always_unpowered && A.power_light && !is_centcom_level(A.z) && !is_reserved_level(A.z))
affected_areas |= get_area(M)
affected_mobs |= user
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index fc87c459879..58cf7337588 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -17,7 +17,7 @@
var/inactive_on_main_station = 0
for(var/zone/zone in SSair.zones)
var/turf/simulated/turf = locate() in zone.contents
- if(turf && isStationLevel(turf.z))
+ if(turf && is_station_level(turf.z))
if(zone.needs_update)
active_on_main_station++
else
diff --git a/code/modules/alarm/alarm_handler.dm b/code/modules/alarm/alarm_handler.dm
index 962b19c3a01..803cd07ba48 100644
--- a/code/modules/alarm/alarm_handler.dm
+++ b/code/modules/alarm/alarm_handler.dm
@@ -18,7 +18,7 @@
if(!(origin && source))
return
- if(isNotStationLevel(origin.z))
+ if(!is_station_level(origin.z))
return
origin = origin.get_alarm_origin()
diff --git a/code/modules/events/apc_damage.dm b/code/modules/events/apc_damage.dm
index fdc344ab208..53181875e02 100644
--- a/code/modules/events/apc_damage.dm
+++ b/code/modules/events/apc_damage.dm
@@ -49,4 +49,4 @@
/datum/event/apc_damage/proc/is_valid_apc(var/obj/machinery/power/apc/apc)
var/turf/T = get_turf(apc)
- return !apc.is_critical && !apc.emagged && T && isStationLevel(T.z)
+ return !apc.is_critical && !apc.emagged && T && is_station_level(T.z)
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index d109c6b9294..0ca58e3fb18 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -15,7 +15,7 @@
..()
for(var/obj/machinery/vending/V in SSmachinery.processing)
- if(isNotStationLevel(V.z)) continue
+ if(!is_station_level(V.z)) continue
vendingMachines.Add(V)
if(!vendingMachines.len)
diff --git a/code/modules/events/camera_damage.dm b/code/modules/events/camera_damage.dm
index 8888b1e7572..0869e64b2d4 100644
--- a/code/modules/events/camera_damage.dm
+++ b/code/modules/events/camera_damage.dm
@@ -37,4 +37,4 @@
/datum/event/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C)
// Only return a functional camera, not installed in a silicon, and that exists somewhere players have access
var/turf/T = get_turf(C)
- return T && C.can_use() && !istype(C.loc, /mob/living/silicon) && isStationLevel(T.z)
+ return T && C.can_use() && !istype(C.loc, /mob/living/silicon) && is_station_level(T.z)
diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm
index 8c7f7672f13..bc3fa73735d 100644
--- a/code/modules/events/event.dm
+++ b/code/modules/events/event.dm
@@ -215,7 +215,7 @@
setup_for_overmap(overmap_ship, overmap_hazard)
if(!affecting_z)
- affecting_z = SSatlas.current_map.station_levels
+ affecting_z = SSmapping.levels_by_trait(ZTRAIT_STATION)
// event needs to be responsible for this, as stuff like APLUs currently make their own events for curious reasons
SSevents.active_events += src
diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm
index 1af43f460b4..ae3d39ae70b 100644
--- a/code/modules/events/spider_infestation.dm
+++ b/code/modules/events/spider_infestation.dm
@@ -20,7 +20,7 @@
var/list/vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in SSmachinery.processing)
- if(!temp_vent.welded && temp_vent.network && isStationLevel(temp_vent.loc.z))
+ if(!temp_vent.welded && temp_vent.network && is_station_level(temp_vent.loc.z))
if(temp_vent.network.normal_members.len > 50)
vents += temp_vent
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 130f2ae4f39..e2a1665a938 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -51,7 +51,7 @@
for(var/obj/machinery/atmospherics/unary/vent_scrubber/temp_vent in SSmachinery.processing)
if(!temp_vent)
continue
- if(isStationLevel(temp_vent.z))
+ if(is_station_level(temp_vent.z))
if(temp_vent.network && temp_vent.network.normal_members.len > 20)
vents += temp_vent
if(!vents.len)
diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm
index 4ccd688d2c5..203fd725415 100644
--- a/code/modules/events/wallrot.dm
+++ b/code/modules/events/wallrot.dm
@@ -19,7 +19,7 @@
// 100 attempts
for(var/i = 0, i < 100, i++)
- var/turf/candidate = locate(rand(1, world.maxx), rand(1, world.maxy), pick(SSatlas.current_map.station_levels))
+ var/turf/candidate = locate(rand(1, world.maxx), rand(1, world.maxy), pick(SSmapping.levels_by_trait(ZTRAIT_STATION)))
if(istype(candidate, /turf/simulated/wall))
origin_turf = candidate
break
diff --git a/code/modules/hallucinations/types/basic.dm b/code/modules/hallucinations/types/basic.dm
index 2c364248a05..f3db638fa04 100644
--- a/code/modules/hallucinations/types/basic.dm
+++ b/code/modules/hallucinations/types/basic.dm
@@ -6,7 +6,7 @@
/datum/hallucination/announcement/start()
var/list/hal_sender = SShallucinations.message_sender
for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
- if(H.client && !player_is_antag(H, only_offstation_roles = TRUE) && isStationLevel(H.z)) //We're not going to add ninjas, mercs, borers, etc to prevent meta. No people off-station, either
+ if(H.client && !player_is_antag(H, only_offstation_roles = TRUE) && is_station_level(H.z)) //We're not going to add ninjas, mercs, borers, etc to prevent meta. No people off-station, either
hal_sender += H
switch(rand(1,15))
if(1)
@@ -75,7 +75,7 @@
/datum/hallucination/announcement/proc/delam_call()
var/list/people = list()
for(var/mob/living/carbon/human/M in GLOB.living_mob_list)
- if(!M.isMonkey() && !player_is_antag(M, only_offstation_roles = TRUE) && isStationLevel(M.z)) //Antag check prevents meta, isStationLevel prevents people offsite doing it
+ if(!M.isMonkey() && !player_is_antag(M, only_offstation_roles = TRUE) && is_station_level(M.z)) //Antag check prevents meta, isStationLevel prevents people offsite doing it
people += M
people -= holder
if(!length(people))
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index 54c0eb8656b..20f3e8ef89b 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -3,7 +3,20 @@
var/id = null // All maps that should be loadable during runtime need an id
var/width = 0
var/height = 0
- var/list/mappaths = null
+ var/mappath = null
+
+ /**
+ * A list of traits for the zlevels of the map
+ *
+ * Each element is one zlevel, starting from the bottom one up
+ *
+ * Works the same as the variable in `/datum/map`
+ */
+ var/list/traits = list(
+ //Z1 (The define is a list), this is set as default because most templates only have a single zlevel
+ ZTRAITS_AWAY
+ )
+
var/loaded = 0 // Times loaded this round
var/static/dmm_suite/maploader = new
var/list/shuttles_to_initialise = list()
@@ -16,28 +29,25 @@
///ONLY IF IT'S THE LONGEST RUNNING CI POD AND THEY ARE ALREADY BALANCED
var/list/unit_test_groups = list()
-/datum/map_template/New(var/list/paths = null, rename = null)
- if(paths && !islist(paths))
- crash_with("Non-list paths passed into map template constructor.")
- if(paths)
- mappaths = paths
- if(mappaths)
- preload_size(mappaths)
+/datum/map_template/New(path = null, rename = null, cache = FALSE)
+ SHOULD_CALL_PARENT(TRUE)
+ . = ..()
+ if(path)
+ mappath = path
+ if(mappath)
+ preload_size(mappath, cache)
if(rename)
name = rename
- ..()
-
-/datum/map_template/proc/preload_size(paths)
+/datum/map_template/proc/preload_size(path)
var/list/bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF)
- var/z_offset = 1 // needed to calculate z-bounds correctly
- for(var/mappath in mappaths)
- var/datum/map_load_metadata/M = maploader.load_map(file(mappath), 1, 1, z_offset, cropMap=FALSE, measureOnly=TRUE)
- if(M)
- bounds = extend_bounds_if_needed(bounds, M.bounds)
- z_offset++
- else
- return FALSE
+
+ var/datum/map_load_metadata/M = maploader.load_map(file(mappath), 1, 1, cropMap=FALSE, measureOnly=TRUE)
+ if(M)
+ bounds = extend_bounds_if_needed(bounds, M.bounds)
+ else
+ return FALSE
+
width = bounds[MAP_MAXX] - bounds[MAP_MINX] + 1
height = bounds[MAP_MAXY] - bounds[MAP_MINX] + 1
return bounds
@@ -58,41 +68,20 @@
//Since SSicon_smooth.add_to_queue() manually wakes the subsystem, we have to use enable/disable.
SSicon_smooth.can_fire = FALSE
- var/is_first = TRUE
- for(var/i in 1 to length(mappaths))
- var/mappath = mappaths[i]
+ var/datum/space_level/base_level = null
+ for(var/traits_for_level in traits)
+ var/level = SSmapping.add_new_zlevel(name, traits_for_level, contain_turfs = FALSE)
+ if(!base_level)
+ base_level = level
- var/list/trait = ZTRAITS_AWAY
-
- //Second or subsequent map file
- if(!is_first)
- //Last map file in a multi level map, can only go down
- if(i == length(mappaths))
- trait += list(ZTRAIT_UP = FALSE, ZTRAIT_DOWN = TRUE)
- //Intermediate map file, can go up and down
- else
- trait += list(ZTRAIT_UP = TRUE, ZTRAIT_DOWN = TRUE)
-
- //First map file
- else
- //Multi-level map
- if(length(mappaths) >= 2)
- trait += list(ZTRAIT_UP = TRUE, ZTRAIT_DOWN = FALSE)
- //Single-level map
- else
- trait += list(ZTRAIT_UP = FALSE, ZTRAIT_DOWN = FALSE)
-
- var/datum/space_level/level = SSmapping.add_new_zlevel(name, trait, contain_turfs = FALSE)
- var/datum/map_load_metadata/M = maploader.load_map(file(mappath), x, y, level.z_value, no_changeturf = no_changeturf)
- if (M)
- bounds = extend_bounds_if_needed(bounds, M.bounds)
- atoms_to_initialise += M.atoms_to_initialise
- else
- SSicon_smooth.can_fire = TRUE
- return FALSE
-
- is_first = FALSE
+ var/datum/map_load_metadata/M = maploader.load_map(file(mappath), x, y, base_level.z_value, no_changeturf = no_changeturf)
+ if(M)
+ bounds = extend_bounds_if_needed(bounds, M.bounds)
+ atoms_to_initialise += M.atoms_to_initialise
+ else
+ SSicon_smooth.can_fire = TRUE
+ return FALSE
for (var/z_index = bounds[MAP_MINZ]; z_index <= bounds[MAP_MAXZ]; z_index++)
if (accessibility_weight)
@@ -204,13 +193,13 @@
//Since SSicon_smooth.add_to_queue() manually wakes the subsystem, we have to use enable/disable.
SSicon_smooth.can_fire = FALSE
- for (var/mappath in mappaths)
- var/datum/map_load_metadata/M = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE)
- if (M)
- atoms_to_initialise += M.atoms_to_initialise
- else
- SSicon_smooth.can_fire = TRUE
- return FALSE
+
+ var/datum/map_load_metadata/M = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE)
+ if(M)
+ atoms_to_initialise += M.atoms_to_initialise
+ else
+ SSicon_smooth.can_fire = TRUE
+ return FALSE
//initialize things that are normally initialized after map load
init_atoms(atoms_to_initialise)
diff --git a/code/modules/mapping/space_management/traits.dm b/code/modules/mapping/space_management/traits.dm
index 315464d62fd..9841f85ebd7 100644
--- a/code/modules/mapping/space_management/traits.dm
+++ b/code/modules/mapping/space_management/traits.dm
@@ -14,3 +14,42 @@
stack_trace("Unmanaged z-level [z]! maxz = [world.maxz], default.len = [default.len]")
return list()
return default[z][DL_TRAITS][trait]
+
+/// Check if levels[z] has any of the specified traits
+/datum/controller/subsystem/mapping/proc/level_has_any_trait(z, list/traits)
+ var/datum/space_level/level_to_check = z_list[z]
+ if (length(level_to_check.traits & traits))
+ return TRUE
+ return FALSE
+
+/// Check if levels[z] has all of the specified traits
+/datum/controller/subsystem/mapping/proc/level_has_all_traits(z, list/traits)
+ var/datum/space_level/level_to_check = z_list[z]
+ if (length(level_to_check.traits & traits) == length(traits))
+ return TRUE
+ return FALSE
+
+/// Get a list of all z which have the specified trait
+/datum/controller/subsystem/mapping/proc/levels_by_trait(trait)
+ return z_trait_levels[trait] || list()
+
+/// Get a list of all z which have any of the specified traits
+/datum/controller/subsystem/mapping/proc/levels_by_any_trait(list/traits)
+ var/list/final_return = list()
+ for (var/trait in traits)
+ if (z_trait_levels[trait])
+ final_return |= z_trait_levels[trait]
+ return final_return
+
+/// Get a list of all z which have all of the specified traits
+/datum/controller/subsystem/mapping/proc/levels_by_all_traits(list/traits)
+ var/list/final_return = list()
+ for(var/datum/space_level/level as anything in z_list)
+ if(level_has_all_traits(level.z_value, traits))
+ final_return += level.z_value
+ return final_return
+
+/// Prefer not to use this one too often
+/datum/controller/subsystem/mapping/proc/get_station_center()
+ var/station_z = levels_by_trait(ZTRAIT_STATION)[1]
+ return locate(round(world.maxx * 0.5, 1), round(world.maxy * 0.5, 1), station_z)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 388ebffbf10..f4773e170cb 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -710,7 +710,7 @@
for(var/obj/item/device/radio/beacon/B in GLOB.teleportbeacons)
var/turf/T = get_turf(B)
- if(isStationLevel(T.z))
+ if(is_station_level(T.z))
destinations += B
return destinations
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index d7991f95271..1e0fbd07f92 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -71,7 +71,7 @@ var/list/mineral_can_smooth_with = list(
if(icon != actual_icon)
icon = actual_icon
- if(isStationLevel(z))
+ if(is_station_level(z))
GLOB.station_turfs += src
if(dynamic_lighting)
@@ -187,7 +187,7 @@ var/list/mineral_can_smooth_with = list(
if(icon != actual_icon)
icon = actual_icon
- if(isStationLevel(z))
+ if(is_station_level(z))
GLOB.station_turfs += src
if(dynamic_lighting)
@@ -729,7 +729,7 @@ var/list/asteroid_floor_smooth = list(
base_desc = desc
base_name = name
- if(isStationLevel(z))
+ if(is_station_level(z))
GLOB.station_turfs += src
if(dynamic_lighting)
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index 6d8fbf9e535..e77e2974c2f 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -121,7 +121,7 @@
return FALSE
//Check if they are not on a station level -> else abort
var/turf/T = get_turf(src)
- if (!T || isStationLevel(T.z))
+ if (!T || is_station_level(T.z))
return FALSE
if(is_type_in_list(get_area(T), allowed_areas))
return FALSE
diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm
index 1d64c508f1c..d5f750139e3 100644
--- a/code/modules/mob/living/silicon/ai/malf.dm
+++ b/code/modules/mob/living/silicon/ai/malf.dm
@@ -63,7 +63,7 @@
// Off-Station APCs should not count towards CPU generation.
for(var/obj/machinery/power/apc/A in hacked_apcs)
- if(A.z in SSatlas.current_map.station_levels)
+ if(A.z in SSmapping.levels_by_trait(ZTRAIT_STATION))
cpu_gain += 0.05
cpu_storage += 100
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index 74dde064d71..5f0bdf86706 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -33,9 +33,9 @@
dat += "Maintenance Units
"
for(var/mob/living/silicon/robot/drone/D in GLOB.silicon_mob_list)
- if(isStationLevel(src.z) && isNotStationLevel(D.z)) //If the console is on a station level, then list all drones on the station levels
+ if(is_station_level(src.z) && !is_station_level(D.z)) //If the console is on a station level, then list all drones on the station levels
continue
- else if (isNotStationLevel(src.z) && src.z != D.z) //If the console is not on the station, only list drones on the current level
+ else if (!is_station_level(src.z) && src.z != D.z) //If the console is not on the station, only list drones on the current level
continue
dat += "
[D.real_name] ([D.stat == 2 ? SPAN_WARNING("INACTIVE") : "ACTIVE"])"
dat += "