From a478555dbdcd5fcafaa2452e9acececf7c66da56 Mon Sep 17 00:00:00 2001
From: LetterN <24603524+LetterN@users.noreply.github.com>
Date: Mon, 15 Mar 2021 21:02:50 +0800
Subject: [PATCH] mapfix

---
 .../IceRuins/icemoon_surface_asteroid.dmm     | 1807 ++++++++---------
 .../IceRuins/icemoon_surface_hotsprings.dmm   |    2 +-
 .../IceRuins/icemoon_surface_lust.dmm         |    2 +-
 .../IceRuins/icemoon_surface_mining_site.dmm  |    6 +-
 .../icemoon_underground_abandoned_village.dmm |    2 +-
 .../icemoon_underground_bathhouse.dmm         |    2 +-
 .../IceRuins/icemoon_underground_lavaland.dmm |    8 +-
 .../IceRuins/icemoon_underground_library.dmm  |   40 +-
 .../IceRuins/icemoon_underground_puzzle.dmm   |    2 +-
 .../IceRuins/icemoon_underground_wrath.dmm    |    2 +-
 .../lavaland_surface_elite_tumor.dmm          |    2 +-
 .../LavaRuins/lavaland_surface_envy.dmm       |   10 +-
 .../LavaRuins/lavaland_surface_puzzle.dmm     |    2 +-
 .../lavaland_surface_random_ripley.dmm        |    2 +-
 _maps/RandomRuins/SpaceRuins/spacehermit.dmm  |  507 +++--
 _maps/map_files/BoxStation/BoxStation.dmm     |   20 +-
 _maps/map_files/CogStation/CogStation.dmm     |   10 +-
 .../map_files/Deltastation/DeltaStation2.dmm  |   20 +-
 _maps/map_files/KiloStation/KiloStation.dmm   |   14 +-
 _maps/map_files/LambdaStation/lambda.dmm      |   30 +-
 _maps/map_files/MetaStation/MetaStation.dmm   |   23 +-
 _maps/map_files/OmegaStation/OmegaStation.dmm |   14 +-
 _maps/map_files/PubbyStation/PubbyStation.dmm |    4 +-
 _maps/map_files/Snaxi/Snaxi.dmm               |   18 +-
 code/game/turfs/space/transit.dm              |    8 +-
 25 files changed, 1279 insertions(+), 1278 deletions(-)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
index acb68d3c80..5b8e494688 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
@@ -1,12 +1,9 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/closed/mineral/random/more_caves,
-/area/icemoon/surface/outdoors/unexplored)
 "b" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/surface/outdoors)
 "U" = (
-/turf/closed/mineral/random/no_caves,
+/turf/closed/mineral/random,
 /area/icemoon/surface/outdoors/unexplored)
 
 (1,1,1) = {"
@@ -225,36 +222,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -267,36 +264,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -309,36 +306,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -351,36 +348,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -393,36 +390,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -435,36 +432,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -477,36 +474,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -519,36 +516,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -561,36 +558,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -603,36 +600,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -645,36 +642,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -687,36 +684,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -729,36 +726,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -771,36 +768,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -813,36 +810,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -855,36 +852,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -897,36 +894,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -939,36 +936,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -981,36 +978,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1023,36 +1020,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1065,36 +1062,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1107,36 +1104,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1149,36 +1146,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1191,36 +1188,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1233,36 +1230,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1275,36 +1272,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1317,36 +1314,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1359,36 +1356,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1401,36 +1398,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
@@ -1443,36 +1440,36 @@ b
 U
 U
 U
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
 U
 U
 U
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm
index a32c526ec4..b95afc83d3 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm
@@ -3,7 +3,7 @@
 /turf/closed/indestructible/riveted/uranium,
 /area/icemoon/surface/outdoors)
 "b" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/surface/outdoors)
 "c" = (
 /turf/open/water/cursed_spring,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
index 7a41256478..6055932141 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/surface/outdoors)
 "b" = (
 /obj/structure/sign/poster/contraband/lusty_xenomorph,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
index 780dc9e97e..bf16fa91e7 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/surface/outdoors)
 "b" = (
 /turf/closed/wall/mineral/wood/nonmetal,
@@ -38,7 +38,7 @@
 /area/ruin/unpowered)
 "h" = (
 /obj/structure/flora/rock/icy,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/surface/outdoors)
 "i" = (
 /turf/template_noop,
@@ -62,7 +62,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "n" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered)
 "o" = (
 /obj/item/reagent_containers/food/drinks/beer,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index 35eb1901f6..2b9702be9e 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -233,7 +233,7 @@
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/icemoon/underground/explored)
 "tN" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/underground/explored)
 "tX" = (
 /obj/structure/table/wood,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
index 3672599cff..6947549f83 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
@@ -13,7 +13,7 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/powered/bathhouse)
 "d" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/underground/explored)
 "e" = (
 /obj/structure/mirror{
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
index a7a97dfec9..b7707c2f58 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
@@ -1,9 +1,9 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/closed/mineral/random/volcanic/more_caves,
+/turf/closed/mineral/random/volcanic,
 /area/icemoon/surface/outdoors/unexplored)
 "b" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/underground/explored)
 "y" = (
 /mob/living/simple_animal/hostile/megafauna/dragon{
@@ -13,7 +13,7 @@
 /turf/open/floor/mineral/gold,
 /area/icemoon/underground/explored)
 "B" = (
-/turf/closed/mineral/random/no_caves,
+/turf/closed/mineral/random,
 /area/icemoon/surface/outdoors/unexplored)
 "P" = (
 /turf/open/floor/mineral/silver,
@@ -22,7 +22,7 @@
 /turf/open/floor/mineral/gold,
 /area/icemoon/underground/explored)
 "T" = (
-/turf/closed/mineral/random/no_caves,
+/turf/closed/mineral/random,
 /area/icemoon/underground/explored)
 
 (1,1,1) = {"
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
index 479610b0b7..38e4f2685e 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
@@ -12,7 +12,7 @@
 /turf/closed/wall/mineral/wood,
 /area/ruin/unpowered/buried_library)
 "ad" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/underground/explored)
 "ae" = (
 /turf/open/floor/wood,
@@ -36,7 +36,7 @@
 /turf/open/floor/plasteel/cult,
 /area/ruin/unpowered/buried_library)
 "ak" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "al" = (
 /turf/closed/wall/mineral/iron,
@@ -67,7 +67,7 @@
 "as" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/paper/fluff/ruins/oldstation/protosing,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "at" = (
 /obj/structure/fluff/paper,
@@ -75,14 +75,14 @@
 /area/ruin/unpowered/buried_library)
 "av" = (
 /obj/structure/bookcase/random,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "aw" = (
 /turf/open/floor/plating,
 /area/ruin/unpowered/buried_library)
 "ax" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "ay" = (
 /obj/machinery/door/keycard/library,
@@ -98,7 +98,7 @@
 /area/ruin/unpowered/buried_library)
 "aC" = (
 /obj/item/feather,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "aD" = (
 /turf/open/floor/carpet/black,
@@ -111,7 +111,7 @@
 "aF" = (
 /obj/item/book/manual/random,
 /obj/effect/decal/cleanable/dirt,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "aG" = (
 /obj/structure/table/bronze,
@@ -145,7 +145,7 @@
 "aM" = (
 /obj/item/stack/sheet/mineral/wood,
 /obj/item/book/manual/random,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "aN" = (
 /obj/structure/statue/sandstone/venus,
@@ -157,7 +157,7 @@
 /area/ruin/unpowered/buried_library)
 "aP" = (
 /obj/item/keycard/library,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "aQ" = (
 /obj/effect/decal/cleanable/dirt,
@@ -207,7 +207,7 @@
 /area/ruin/unpowered/buried_library)
 "ba" = (
 /obj/structure/barricade/wooden/snowed,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bc" = (
 /obj/item/feather,
@@ -239,7 +239,7 @@
 /area/ruin/unpowered/buried_library)
 "bg" = (
 /obj/item/paper/fluff/ruins/oldstation/protogun,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bh" = (
 /obj/effect/decal/cleanable/dirt,
@@ -248,11 +248,11 @@
 /area/ruin/unpowered/buried_library)
 "bi" = (
 /obj/structure/fluff/paper,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bj" = (
 /obj/item/book/manual/random,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bk" = (
 /obj/structure/fluff/paper{
@@ -262,25 +262,25 @@
 /area/ruin/unpowered/buried_library)
 "bl" = (
 /obj/item/storage/box/fountainpens,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bm" = (
 /obj/structure/fluff/paper/stack,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bn" = (
 /obj/item/book/manual/random,
 /obj/item/stack/sheet/mineral/wood,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bo" = (
 /obj/item/stack/sheet/mineral/wood,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/fluff/paper,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bq" = (
 /obj/structure/mineral_door/wood,
@@ -289,7 +289,7 @@
 /area/ruin/unpowered/buried_library)
 "br" = (
 /obj/structure/girder,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/ruin/unpowered/buried_library)
 "bt" = (
 /obj/effect/decal/cleanable/dirt,
@@ -297,7 +297,7 @@
 /area/template_noop)
 "bu" = (
 /obj/item/stack/sheet/mineral/wood,
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/underground/explored)
 "bw" = (
 /turf/open/floor/wood,
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm
index 79a4625aed..6bdbee4d7d 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /turf/template_noop,
-/area/icemoon/underground/explored)
+/area/template_noop)
 "b" = (
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/icemoon/underground/explored)
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm
index e233afbfb2..002f63a22e 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm
@@ -3,7 +3,7 @@
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/icemoon/underground/explored)
 "b" = (
-/turf/closed/mineral/random/snow/no_caves,
+/turf/closed/mineral/random/snow,
 /area/icemoon/underground/explored)
 "e" = (
 /obj/structure/spawner/nether,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm
index 6e44ec3197..53f5b3a84f 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /turf/template_noop,
-/area/lavaland/surface/outdoors)
+/area/template_noop)
 "b" = (
 /obj/structure/elite_tumor,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
index a14a8d3a13..2051251744 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
+/turf/template_noop,
+/area/template_noop)
 "b" = (
 /turf/closed/mineral/volcanic/lava_land_surface,
 /area/lavaland/surface/outdoors)
@@ -260,7 +260,7 @@ c
 a
 "}
 (9,1,1) = {"
-b
+a
 c
 c
 d
@@ -279,8 +279,8 @@ c
 a
 "}
 (10,1,1) = {"
-b
-b
+a
+a
 c
 c
 c
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm
index 911ee904fe..a27d300c02 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /turf/template_noop,
-/area/lavaland/surface/outdoors)
+/area/template_noop)
 "b" = (
 /obj/effect/sliding_puzzle/lavaland,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
index 03d28bdff5..e1097d3f68 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /turf/template_noop,
-/area/lavaland/surface/outdoors)
+/area/template_noop)
 "b" = (
 /turf/closed/mineral/volcanic/lava_land_surface,
 /area/lavaland/surface/outdoors)
diff --git a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm
index 268c907445..a2c7b18966 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm
@@ -253,11 +253,8 @@
 "aZ" = (
 /turf/closed/mineral/random/low_chance,
 /area/ruin/powered)
-"ba" = (
-/turf/closed/mineral/random/low_chance/earth_like,
-/area/ruin/powered)
 "bb" = (
-/turf/closed/mineral/random/no_caves/earth_like,
+/turf/closed/mineral/random,
 /area/ruin/powered)
 "bc" = (
 /obj/structure/table/wood,
@@ -354,10 +351,10 @@
 /turf/open/floor/plating/asteroid,
 /area/ruin/powered)
 "fp" = (
-/turf/closed/mineral/random/high_chance/earth_like,
+/turf/closed/mineral/random/high_chance,
 /area/ruin/powered)
 "jx" = (
-/turf/closed/mineral/silver/earth_like,
+/turf/closed/mineral/silver,
 /area/ruin/powered)
 "ma" = (
 /obj/item/stack/ore/iron,
@@ -373,7 +370,7 @@
 /turf/open/floor/mineral/titanium,
 /area/ruin/powered)
 "nc" = (
-/turf/closed/mineral/bscrystal/earth_like,
+/turf/closed/mineral/bscrystal,
 /area/ruin/powered)
 "nl" = (
 /obj/structure/closet/emcloset,
@@ -513,7 +510,7 @@
 /turf/open/floor/mineral/titanium,
 /area/ruin/powered)
 "JZ" = (
-/turf/closed/mineral/titanium/earth_like,
+/turf/closed/mineral/titanium,
 /area/ruin/powered)
 "Kj" = (
 /obj/machinery/power/floodlight,
@@ -527,7 +524,7 @@
 /turf/closed/wall/mineral/iron,
 /area/ruin/powered)
 "PG" = (
-/turf/closed/mineral/gold/earth_like,
+/turf/closed/mineral/gold,
 /area/ruin/powered)
 "Qi" = (
 /obj/structure/cable,
@@ -543,10 +540,10 @@
 /turf/open/floor/mineral/titanium,
 /area/ruin/powered)
 "Ue" = (
-/turf/closed/mineral/diamond/earth_like,
+/turf/closed/mineral/diamond,
 /area/ruin/powered)
 "VS" = (
-/turf/closed/mineral/uranium/earth_like,
+/turf/closed/mineral/uranium,
 /area/ruin/powered)
 "WH" = (
 /obj/item/circuitboard/machine/mining_equipment_vendor/golem,
@@ -753,12 +750,12 @@ aA
 aZ
 aZ
 aZ
-ba
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -766,9 +763,9 @@ bb
 bb
 bb
 bb
-ba
-ba
-ba
+aZ
+aZ
+aZ
 aZ
 aZ
 aA
@@ -802,14 +799,14 @@ aA
 aA
 aA
 aZ
-ba
-ba
-ba
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
 fp
 bb
 bb
@@ -818,11 +815,11 @@ bb
 bb
 bb
 bb
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
 aZ
 aA
 aa
@@ -853,16 +850,16 @@ aZ
 aZ
 aA
 aZ
-ba
-ba
+aZ
+aZ
 fp
-ba
+aZ
 bb
-ba
+aZ
 bb
-ba
-ba
-ba
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -872,10 +869,10 @@ bb
 bb
 bb
 bb
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
 aZ
 aA
 aa
@@ -904,13 +901,13 @@ bb
 bb
 bb
 aZ
-ba
+aZ
 fp
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -922,13 +919,13 @@ bb
 bb
 bb
 bb
-ba
+aZ
 bb
 bb
 bb
 bb
-ba
-ba
+aZ
+aZ
 aZ
 aA
 aa
@@ -955,16 +952,16 @@ bb
 bb
 bb
 bb
-ba
-ba
-ba
+aZ
+aZ
+aZ
 VS
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
 bb
-ba
+aZ
 bb
 bb
 JZ
@@ -979,9 +976,9 @@ bb
 bb
 bb
 bb
-ba
-ba
-ba
+aZ
+aZ
+aZ
 aZ
 aA
 aa
@@ -1010,31 +1007,31 @@ bb
 fp
 fp
 fp
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
 bb
 bb
-ba
+aZ
 JZ
-ba
-ba
-ba
+aZ
+aZ
+aZ
 bb
 bb
 bb
 af
 aq
 af
-ba
+aZ
 bb
 bb
 bb
 bb
 fp
-ba
-ba
+aZ
+aZ
 aZ
 aA
 aa
@@ -1062,12 +1059,12 @@ bb
 fp
 VS
 fp
-ba
+aZ
 bb
 fp
 fp
 bb
-ba
+aZ
 bb
 bb
 bb
@@ -1080,7 +1077,7 @@ ae
 ao
 ae
 ae
-ba
+aZ
 fp
 bb
 bb
@@ -1111,20 +1108,20 @@ bb
 bb
 bb
 bb
-ba
-ba
+aZ
+aZ
 bb
-ba
+aZ
 Ue
-ba
+aZ
 bb
 bb
 bb
 bb
 bb
 bb
-ba
-ba
+aZ
+aZ
 bb
 bb
 af
@@ -1132,14 +1129,14 @@ an
 an
 an
 af
-ba
+aZ
 fp
 bb
 bb
 bb
 fp
 bb
-ba
+aZ
 aZ
 aA
 aa
@@ -1166,17 +1163,17 @@ bb
 bb
 bb
 Ue
-ba
+aZ
 bb
-ba
-ba
+aZ
+aZ
 bb
 fp
 bb
 fp
 fp
-ba
-ba
+aZ
+aZ
 bb
 ae
 ae
@@ -1191,7 +1188,7 @@ bb
 jx
 fp
 bb
-ba
+aZ
 aZ
 aA
 aa
@@ -1218,17 +1215,17 @@ bb
 bb
 bb
 bb
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
 bb
-ba
+aZ
 bb
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
 bb
 af
 aY
@@ -1237,13 +1234,13 @@ ao
 ao
 ak
 af
-ba
+aZ
 bb
 fp
 bb
 bb
 bb
-ba
+aZ
 aZ
 aA
 aa
@@ -1271,15 +1268,15 @@ bb
 bb
 fp
 bb
-ba
+aZ
 fp
-ba
+aZ
 bb
 bb
 bb
-ba
-ba
-ba
+aZ
+aZ
+aZ
 bb
 bb
 al
@@ -1289,13 +1286,13 @@ an
 as
 aj
 al
-ba
+aZ
 bb
 jx
 bb
 bb
 fp
-ba
+aZ
 aZ
 aA
 aa
@@ -1323,9 +1320,9 @@ bb
 bb
 bb
 bb
-ba
-ba
-ba
+aZ
+aZ
+aZ
 fp
 fp
 fp
@@ -1347,7 +1344,7 @@ bb
 bb
 bb
 bb
-ba
+aZ
 aZ
 aA
 aa
@@ -1367,7 +1364,7 @@ aa
 aA
 aA
 ab
-ba
+aZ
 bb
 bb
 bb
@@ -1377,13 +1374,13 @@ bb
 bb
 ah
 az
-ba
-ba
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
 bb
 aR
 ae
@@ -1419,23 +1416,23 @@ aa
 aA
 aA
 ab
-ba
+aZ
 bb
 bb
 bb
 bb
 bb
 bb
-ba
+aZ
 am
 am
-ba
-ba
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
+aZ
 bb
 aR
 ae
@@ -1471,7 +1468,7 @@ aa
 aA
 aA
 ab
-ba
+aZ
 bb
 bb
 bb
@@ -1483,7 +1480,7 @@ am
 am
 am
 am
-ba
+aZ
 aH
 aJ
 aL
@@ -1522,8 +1519,8 @@ aa
 aA
 aE
 aZ
-ba
-ba
+aZ
+aZ
 bb
 bb
 bb
@@ -1539,7 +1536,7 @@ am
 am
 am
 am
-ba
+aZ
 bb
 am
 af
@@ -1574,8 +1571,8 @@ aa
 aA
 aE
 aZ
-ba
-ba
+aZ
+aZ
 bb
 bb
 bb
@@ -1591,7 +1588,7 @@ WH
 am
 am
 am
-ba
+aZ
 bb
 bb
 ae
@@ -1626,7 +1623,7 @@ aa
 aA
 aE
 aZ
-ba
+aZ
 bb
 bb
 bb
@@ -1678,7 +1675,7 @@ aa
 aA
 aE
 aZ
-ba
+aZ
 bb
 fp
 bb
@@ -1696,7 +1693,7 @@ am
 am
 bb
 bb
-ba
+aZ
 am
 am
 am
@@ -1710,8 +1707,8 @@ bb
 bb
 bb
 fp
-ba
-ba
+aZ
+aZ
 aZ
 aA
 aa
@@ -1729,9 +1726,9 @@ aa
 aa
 aA
 aZ
-ba
-ba
-ba
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -1762,7 +1759,7 @@ bb
 bb
 bb
 bb
-ba
+aZ
 aZ
 aE
 aa
@@ -1781,9 +1778,9 @@ aa
 aA
 aE
 aZ
-ba
-ba
-ba
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -1814,7 +1811,7 @@ bb
 bb
 bb
 fp
-ba
+aZ
 aZ
 aA
 aa
@@ -1832,10 +1829,10 @@ aa
 aa
 aA
 aZ
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -1884,9 +1881,9 @@ aa
 aa
 aA
 aZ
-ba
-ba
-ba
+aZ
+aZ
+aZ
 bb
 nc
 bb
@@ -1902,8 +1899,8 @@ am
 am
 am
 am
-ba
-ba
+aZ
+aZ
 am
 am
 am
@@ -1915,9 +1912,9 @@ oR
 Xh
 Xh
 Qi
-ba
-ba
-ba
+aZ
+aZ
+aZ
 aZ
 aa
 aa
@@ -1936,10 +1933,10 @@ aa
 aa
 aA
 aZ
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -1950,12 +1947,12 @@ ar
 ar
 ar
 ar
-ba
-ba
-ba
+aZ
+aZ
+aZ
 aK
-ba
-ba
+aZ
+aZ
 bm
 bo
 am
@@ -1967,8 +1964,8 @@ am
 am
 fc
 aR
-ba
-ba
+aZ
+aZ
 aZ
 aE
 aa
@@ -1989,8 +1986,8 @@ aa
 aa
 aE
 aZ
-ba
-ba
+aZ
+aZ
 nc
 bb
 bb
@@ -2005,9 +2002,9 @@ bb
 bb
 bb
 fp
-ba
+aZ
 fp
-ba
+aZ
 bn
 bp
 am
@@ -2019,8 +2016,8 @@ aP
 am
 am
 aR
-ba
-ba
+aZ
+aZ
 aZ
 aA
 aa
@@ -2041,9 +2038,9 @@ aa
 aa
 aE
 aZ
-ba
-ba
-ba
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -2057,9 +2054,9 @@ bb
 bb
 bb
 bb
-ba
-ba
-ba
+aZ
+aZ
+aZ
 aQ
 bq
 am
@@ -2071,8 +2068,8 @@ WP
 aP
 bb
 am
-ba
-ba
+aZ
+aZ
 aZ
 aA
 aa
@@ -2093,9 +2090,9 @@ aa
 aa
 aE
 aZ
-ba
-ba
-ba
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -2109,11 +2106,11 @@ bb
 PG
 bb
 bb
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
 am
 am
 am
@@ -2124,7 +2121,7 @@ bg
 bb
 bb
 bb
-ba
+aZ
 aZ
 aa
 aa
@@ -2146,8 +2143,8 @@ aa
 aE
 aZ
 aZ
-ba
-ba
+aZ
+aZ
 bb
 bb
 bb
@@ -2164,8 +2161,8 @@ bb
 bb
 bb
 bb
-ba
-ba
+aZ
+aZ
 am
 am
 am
@@ -2199,7 +2196,7 @@ aa
 aA
 aA
 aZ
-ba
+aZ
 bb
 bb
 bb
@@ -2217,7 +2214,7 @@ bb
 bb
 bb
 bb
-ba
+aZ
 bg
 am
 am
@@ -2251,7 +2248,7 @@ aa
 aa
 aA
 aZ
-ba
+aZ
 bb
 bb
 bb
@@ -2265,11 +2262,11 @@ bb
 bb
 bb
 bb
-ba
+aZ
 bb
 bb
 fp
-ba
+aZ
 am
 am
 bj
@@ -2304,11 +2301,11 @@ aa
 aa
 aE
 aZ
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -2317,11 +2314,11 @@ bb
 bb
 bb
 bb
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
 aS
 bi
 am
@@ -2357,10 +2354,10 @@ aM
 aa
 aE
 aZ
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -2369,11 +2366,11 @@ bb
 bb
 bb
 fp
-ba
-ba
-ba
 aZ
-ba
+aZ
+aZ
+aZ
+aZ
 aS
 am
 am
@@ -2381,8 +2378,8 @@ am
 am
 aS
 aS
-ba
-ba
+aZ
+aZ
 aZ
 aE
 aa
@@ -2409,10 +2406,10 @@ aa
 aa
 aE
 aZ
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -2421,8 +2418,8 @@ bb
 bb
 bb
 bb
-ba
-ba
+aZ
+aZ
 aZ
 aE
 aS
@@ -2462,9 +2459,9 @@ aa
 aE
 aE
 aZ
-ba
-ba
-ba
+aZ
+aZ
+aZ
 bb
 bb
 bb
@@ -2473,7 +2470,7 @@ bb
 bb
 fp
 fp
-ba
+aZ
 aZ
 aE
 aE
@@ -2515,8 +2512,8 @@ aa
 aE
 aE
 aZ
-ba
-ba
+aZ
+aZ
 bb
 bb
 bb
@@ -2524,8 +2521,8 @@ bb
 bb
 bb
 bb
-ba
-ba
+aZ
+aZ
 aZ
 aE
 aE
@@ -2568,7 +2565,7 @@ aa
 aE
 aE
 aZ
-ba
+aZ
 fp
 fp
 bb
@@ -2576,8 +2573,8 @@ bb
 bb
 bb
 bb
-ba
-ba
+aZ
+aZ
 aZ
 aE
 aa
@@ -2621,16 +2618,16 @@ aa
 aE
 aE
 aZ
-ba
-ba
-ba
-ba
-ba
+aZ
+aZ
+aZ
+aZ
+aZ
 bb
 bb
-ba
-ba
-ba
+aZ
+aZ
+aZ
 aZ
 aZ
 aa
@@ -2681,9 +2678,9 @@ aZ
 aZ
 aZ
 aZ
-ba
-ba
-ba
+aZ
+aZ
+aZ
 aZ
 aa
 aa
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index a36cf4525f..0f5eb7ead0 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -974,7 +974,7 @@
 /area/command/heads_quarters/hos)
 "acs" = (
 /obj/machinery/power/apc{
-	areastring = "/area/crew_quarters/heads/hos";
+	areastring = "/area/command/heads_quarters/hos";
 	dir = 8;
 	name = "Head of Security's Office APC";
 	pixel_x = -25
@@ -20702,7 +20702,7 @@
 /area/command/bridge)
 "aWW" = (
 /obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/bridge";
+	areastring = "/area/command";
 	name = "Bridge APC";
 	pixel_y = -24
 	},
@@ -22486,7 +22486,7 @@
 /area/cargo/warehouse)
 "bbu" = (
 /obj/machinery/power/apc{
-	areastring = "/area/crew_quarters/heads/captain";
+	areastring = "/area/command/heads_quarters/captain";
 	dir = 1;
 	name = "Captain's Office APC";
 	pixel_y = 23
@@ -26309,7 +26309,7 @@
 /area/maintenance/central)
 "bkX" = (
 /obj/machinery/power/apc{
-	areastring = "/area/bridge/meeting_room";
+	areastring = "/area/command/meeting_room";
 	dir = 4;
 	name = "Conference Room APC";
 	pixel_x = 24
@@ -33767,7 +33767,7 @@
 /area/maintenance/port/aft)
 "bCf" = (
 /obj/machinery/power/apc{
-	areastring = "/area/crew_quarters/heads/hor";
+	areastring = "/area/command/heads_quarters/rd";
 	dir = 8;
 	name = "RD Office APC";
 	pixel_x = -25
@@ -37578,9 +37578,9 @@
 /area/medical/medbay/central)
 "bKS" = (
 /obj/machinery/power/apc{
-	areastring = "/area/crew_quarters/heads/cmo";
+	areastring = "/area/command/heads_quarters/cmo";
 	dir = 1;
-	name = "CM Office APC";
+	name = "CMO Office APC";
 	pixel_y = 23
 	},
 /obj/structure/cable{
@@ -43755,7 +43755,7 @@
 "cbp" = (
 /obj/structure/closet/secure_closet/engineering_chief,
 /obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/crew_quarters/heads/chief";
+	areastring = "/area/command/heads_quarters/ce";
 	dir = 4;
 	name = "CE Office APC";
 	pixel_x = 24
@@ -45793,7 +45793,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/command/heads_quarters/ce)
+/area/command)
 "cgQ" = (
 /obj/machinery/camera{
 	c_tag = "Engineering East";
@@ -51521,7 +51521,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/crew_quarters/heads/hop";
+	areastring = "/area/command/heads_quarters/hop";
 	name = "Head of Personnel APC";
 	pixel_y = -24
 	},
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index b2ccd71141..2af242c292 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -14551,7 +14551,7 @@
 	},
 /obj/structure/cable,
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/bridge";
+	areastring = "/area/command";
 	name = "Bridge APC";
 	pixel_y = -24
 	},
@@ -25583,7 +25583,7 @@
 	pixel_y = 1
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hor";
+	areastring = "/area/command/heads_quarters/rd";
 	dir = 8;
 	name = "Research Director's Office APC";
 	pixel_x = -25
@@ -36028,7 +36028,7 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/cmo";
+	areastring = "/area/command/heads_quarters/cmo";
 	dir = 1;
 	name = "Chief Medical Officer's Office APC";
 	pixel_y = 23
@@ -36238,7 +36238,7 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/service/heads/captain";
+	areastring = "/area/command/heads_quarters/captain";
 	dir = 4;
 	name = "Captain's Quarters APC";
 	pixel_x = 24
@@ -59843,7 +59843,7 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/chief";
+	areastring = "/area/command/heads_quarters/ce";
 	dir = 4;
 	name = "Chief Engineer's Office APC";
 	pixel_x = 24
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 972aace15d..c9bab5455f 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -40610,7 +40610,7 @@
 "buT" = (
 /obj/item/kirbyplants/random,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hos";
+	areastring = "/area/command/heads_quarters/hos";
 	name = "Head of Security's Office APC";
 	pixel_y = -26
 	},
@@ -48939,7 +48939,7 @@
 "bGY" = (
 /obj/structure/cable/white,
 /obj/machinery/power/apc{
-	areastring = "/area/bridge";
+	areastring = "/area/command";
 	name = "Bridge APC";
 	pixel_y = -26
 	},
@@ -51333,7 +51333,7 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/bridge/meeting_room/council";
+	areastring = "/area/command/meeting_room/council";
 	dir = 1;
 	name = "Council Chambers APC";
 	pixel_y = 23
@@ -55340,7 +55340,7 @@
 /area/command/heads_quarters/captain)
 "bQV" = (
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/service/heads/captain";
+	areastring = "/area/command/heads_quarters/captain";
 	name = "Captain's Office APC";
 	pixel_y = -24
 	},
@@ -60738,7 +60738,7 @@
 "bYu" = (
 /obj/structure/cable/white,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/chief";
+	areastring = "/area/command/heads_quarters/ce";
 	name = "Chief Engineer's APC";
 	pixel_y = -26
 	},
@@ -64350,7 +64350,7 @@
 /area/command/heads_quarters/hop)
 "cer" = (
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hop";
+	areastring = "/area/command/heads_quarters/hop";
 	dir = 4;
 	name = "HoP Office APC";
 	pixel_x = 24
@@ -65669,7 +65669,7 @@
 	dir = 8
 	},
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/service/heads/captain/private";
+	areastring = "/area/command/heads_quarters/captain/private";
 	name = "Captain's Quarters APC";
 	pixel_y = -24
 	},
@@ -78968,7 +78968,7 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/bridge/showroom/corporate";
+	areastring = "/area/command/corporate_showroom";
 	dir = 8;
 	name = "Corporate Lounge APC";
 	pixel_x = -25
@@ -102498,7 +102498,7 @@
 /area/science/mixing)
 "drX" = (
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hor";
+	areastring = "/area/command/heads_quarters/rd";
 	dir = 8;
 	name = "Research Director's Office APC";
 	pixel_x = -25
@@ -107128,7 +107128,7 @@
 	dir = 4
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/cmo";
+	areastring = "/area/command/heads_quarters/cmo";
 	dir = 4;
 	name = "Chief Medical Officer's Office APC";
 	pixel_x = 24
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index f2f5b1ca08..dd91acc817 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -6592,7 +6592,7 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hos";
+	areastring = "/area/command/heads_quarters/hos";
 	dir = 1;
 	name = "Head of Security's Office APC";
 	pixel_y = 23
@@ -9326,7 +9326,7 @@
 "apN" = (
 /obj/structure/bed/dogbed/ian,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hop";
+	areastring = "/area/command/heads_quarters/hop";
 	dir = 1;
 	name = "Head of Personnel's Office APC";
 	pixel_y = 23
@@ -14158,7 +14158,7 @@
 /obj/effect/turf_decal/bot,
 /obj/machinery/recharger,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/chief";
+	areastring = "/area/command/heads_quarters/ce";
 	dir = 4;
 	name = "Chief Engineer's Office APC";
 	pixel_x = 24
@@ -22370,7 +22370,7 @@
 /obj/item/hand_labeler,
 /obj/item/reagent_containers/spray/cleaner,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/cmo";
+	areastring = "/area/command/heads_quarters/cmo";
 	dir = 1;
 	name = "CMO's Office APC";
 	pixel_y = 23
@@ -35601,7 +35601,7 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hor";
+	areastring = "/area/command/heads_quarters/rd";
 	dir = 1;
 	name = "RD Office APC";
 	pixel_y = 23
@@ -42305,7 +42305,7 @@
 	},
 /obj/item/kirbyplants,
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/bridge";
+	areastring = "/area/command";
 	dir = 8;
 	name = "Bridge APC";
 	pixel_x = -25
@@ -46271,7 +46271,7 @@
 /obj/structure/table/wood,
 /obj/machinery/recharger,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/captain";
+	areastring = "/area/command/heads_quarters/captain";
 	dir = 4;
 	name = "Captain's Office APC";
 	pixel_x = 24
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
index 17b59e5429..66a2f21569 100644
--- a/_maps/map_files/LambdaStation/lambda.dmm
+++ b/_maps/map_files/LambdaStation/lambda.dmm
@@ -13486,7 +13486,7 @@
 /obj/item/book/manual/wiki/security_space_law,
 /obj/item/cartridge/detective,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hos";
+	areastring = "/area/command/heads_quarters/hos";
 	dir = 1;
 	name = "Head of Security's Office APC";
 	pixel_y = 23
@@ -15490,7 +15490,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hor";
+	areastring = "/area/command/heads_quarters/rd";
 	name = "RD Office APC";
 	pixel_y = -27
 	},
@@ -15986,7 +15986,7 @@
 	pixel_y = -32
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hos/private";
+	areastring = "/area/command/heads_quarters/hos/private";
 	dir = 4;
 	name = "Head of Security's Private Quarters APC";
 	pixel_x = 24
@@ -23517,7 +23517,7 @@
 /area/science/explab)
 "aQJ" = (
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/service/heads/hor/private";
+	areastring = "/area/command/heads_quarters/rd/private";
 	name = "Research Director's Quarters APC";
 	pixel_y = -24
 	},
@@ -24839,7 +24839,7 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/service/heads/captain";
+	areastring = "/area/command/heads_quarters/captain";
 	dir = 8;
 	name = "Captain's Office APC";
 	pixel_x = -25
@@ -29516,7 +29516,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/bridge/meeting_room";
+	areastring = "/area/command/meeting_room";
 	dir = 8;
 	name = "Council Chambers APC";
 	pixel_x = -25
@@ -29549,7 +29549,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/service/heads/captain/private";
+	areastring = "/area/command/heads_quarters/captain/private";
 	name = "Captain's Quarters APC";
 	pixel_y = -24
 	},
@@ -29580,7 +29580,7 @@
 /area/command/heads_quarters/captain/private)
 "beO" = (
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/service/heads/hop/private";
+	areastring = "/area/command/heads_quarters/hop/private";
 	dir = 4;
 	name = "Head of Personnel's Quarters APC";
 	pixel_x = 24
@@ -32917,7 +32917,7 @@
 	},
 /obj/structure/cable,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/cmo";
+	areastring = "/area/command/heads_quarters/cmo";
 	dir = 8;
 	name = "Chief Medical Officer's Office APC";
 	pixel_x = -25
@@ -36212,7 +36212,7 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hop";
+	areastring = "/area/command/heads_quarters/hop";
 	name = "Head of Personnel APC";
 	pixel_y = -24
 	},
@@ -36284,7 +36284,7 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/bridge";
+	areastring = "/area/command";
 	dir = 4;
 	name = "Bridge APC";
 	pixel_x = 24
@@ -40167,7 +40167,7 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/bridge/showroom/corporate";
+	areastring = "/area/command/corporate_showroom";
 	dir = 4;
 	name = "Nanotrasen Corporate Showroom APC";
 	pixel_x = 24
@@ -43460,7 +43460,7 @@
 	dir = 10
 	},
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/service/heads/cmo/private";
+	areastring = "/area/command/heads_quarters/cmo/private";
 	dir = 4;
 	name = "Chief Medical Officer's Quarters APC";
 	pixel_x = 24
@@ -44185,7 +44185,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/chief";
+	areastring = "/area/command/heads_quarters/ce";
 	dir = 4;
 	name = "Chief Engineer's APC";
 	pixel_x = 24
@@ -45711,7 +45711,7 @@
 	pixel_x = -32
 	},
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/service/heads/chief/private";
+	areastring = "/area/command/heads_quarters/ce/private";
 	name = "Chief Engineer's Quarters APC";
 	pixel_y = -24
 	},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index bfe21bca47..1c87dbb1d2 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -11210,7 +11210,7 @@
 "auX" = (
 /obj/machinery/photocopier,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hos";
+	areastring = "/area/command/heads_quarters/hos";
 	dir = 4;
 	name = "Head of Security's Office APC";
 	pixel_x = 24
@@ -25733,7 +25733,7 @@
 "aYr" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/chief";
+	areastring = "/area/command/heads_quarters/ce";
 	dir = 4;
 	name = "CE Office APC";
 	pixel_x = 24
@@ -34277,7 +34277,7 @@
 /area/command/heads_quarters/hop)
 "bop" = (
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/bridge";
+	areastring = "/area/command";
 	dir = 8;
 	name = "Bridge APC";
 	pixel_x = -25
@@ -35568,7 +35568,7 @@
 /obj/structure/table/wood,
 /obj/item/book/manual/wiki/security_space_law,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/captain/private";
+	areastring = "/area/command/heads_quarters/captain/private";
 	dir = 8;
 	name = "Captain's Quarters APC";
 	pixel_x = -25
@@ -37065,7 +37065,7 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hop";
+	areastring = "/area/command/heads_quarters/hop";
 	dir = 1;
 	name = "Head of Personnel APC";
 	pixel_y = 23
@@ -46766,7 +46766,7 @@
 /area/command/corporate_showroom)
 "bOF" = (
 /obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/bridge/showroom/corporate";
+	areastring = "/area/command/corporate_showroom";
 	dir = 4;
 	name = "Nanotrasen Corporate Showroom APC";
 	pixel_x = 24
@@ -59771,7 +59771,7 @@
 /area/command/heads_quarters/cmo)
 "coS" = (
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/cmo";
+	areastring = "/area/command/heads_quarters/cmo";
 	dir = 4;
 	name = "CMO's Office APC";
 	pixel_x = 24
@@ -64075,7 +64075,7 @@
 /area/science/research)
 "cwP" = (
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hor";
+	areastring = "/area/command/heads_quarters/rd";
 	name = "RD Office APC";
 	pixel_y = -27
 	},
@@ -82337,6 +82337,9 @@
 /obj/structure/table/reinforced,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"ohu" = (
+/turf/open/space/basic,
+/area/command/heads_quarters/captain)
 "oms" = (
 /obj/machinery/atmospherics/pipe/manifold/general/visible{
 	dir = 1
@@ -121905,7 +121908,7 @@ oRp
 oRp
 aaa
 aai
-aaa
+ohu
 aaa
 aaa
 aaa
@@ -130476,7 +130479,7 @@ aaf
 aaf
 aaa
 aaa
-aaa
+ohu
 aaa
 aaa
 aaa
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 8bfba13ba8..6f88575c83 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -713,7 +713,7 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/bridge";
+	areastring = "/area/command";
 	name = "Bridge APC";
 	pixel_y = -26
 	},
@@ -3019,7 +3019,7 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/service/heads/hop";
+	areastring = "/area/command/heads_quarters/hop";
 	dir = 1;
 	name = "Head of Personnel Quarter's APC";
 	pixel_y = 23
@@ -3754,7 +3754,7 @@
 /area/maintenance/fore)
 "afS" = (
 /obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/service/heads/hos";
+	areastring = "/area/command/heads_quarters/hos";
 	dir = 1;
 	name = "Head of Security's Office APC";
 	pixel_y = 23
@@ -4331,7 +4331,7 @@
 	dir = 8
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/captain/private";
+	areastring = "/area/command/heads_quarters/captain/private";
 	dir = 8;
 	name = "Captain's Quarters APC";
 	pixel_x = -25;
@@ -9049,7 +9049,7 @@
 	},
 /obj/effect/turf_decal/tile/yellow,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/chief";
+	areastring = "/area/command/heads_quarters/ce";
 	dir = 4;
 	name = "Chief Engineer's Office APC";
 	pixel_x = 24
@@ -26316,7 +26316,7 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/cmo";
+	areastring = "/area/command/heads_quarters/cmo";
 	dir = 1;
 	name = "CMO's Office APC";
 	pixel_y = 23
@@ -34996,7 +34996,7 @@
 	dir = 4
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hor";
+	areastring = "/area/command/heads_quarters/rd";
 	dir = 1;
 	name = "RD Office APC";
 	pixel_y = 23
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 4056bc85c9..10790665cc 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -11090,7 +11090,7 @@
 "azo" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/power/apc/highcap/ten_k{
-	areastring = "/area/bridge";
+	areastring = "/area/command";
 	dir = 4;
 	name = "Bridge APC";
 	pixel_x = 24
@@ -35623,7 +35623,7 @@
 /area/command/heads_quarters/cmo)
 "bDx" = (
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/cmo";
+	areastring = "/area/command/heads_quarters/cmo";
 	dir = 4;
 	name = "CMO's Office APC";
 	pixel_x = 24
diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm
index df4a6a1f91..bff105ae3e 100644
--- a/_maps/map_files/Snaxi/Snaxi.dmm
+++ b/_maps/map_files/Snaxi/Snaxi.dmm
@@ -6821,7 +6821,7 @@
 	dir = 1
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hos";
+	areastring = "/area/command/heads_quarters/hos";
 	dir = 8;
 	name = "Head of Security's Office APC";
 	pixel_x = -25
@@ -8665,7 +8665,7 @@
 	dir = 1
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/captain";
+	areastring = "/area/command/heads_quarters/captain";
 	name = "Captain's Office APC";
 	pixel_y = -26
 	},
@@ -9029,7 +9029,7 @@
 	pixel_y = 9
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hor";
+	areastring = "/area/command/heads_quarters/rd";
 	dir = 1;
 	name = "RD Office APC";
 	pixel_y = 23
@@ -12605,7 +12605,7 @@
 /obj/structure/cable,
 /obj/machinery/suit_storage_unit/ce,
 /obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/service/heads/chief";
+	areastring = "/area/command/heads_quarters/ce";
 	name = "CE Office APC";
 	pixel_y = -24
 	},
@@ -13403,7 +13403,7 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/power/apc{
-	areastring = "/area/bridge/meeting_room";
+	areastring = "/area/command/meeting_room";
 	dir = 1;
 	name = "Conference Room APC";
 	pixel_y = 23
@@ -19613,7 +19613,7 @@
 	dir = 1
 	},
 /obj/machinery/power/apc/highcap/five_k{
-	areastring = "/area/bridge";
+	areastring = "/area/command";
 	dir = 1;
 	name = "Bridge APC";
 	pixel_y = 23
@@ -25286,9 +25286,9 @@
 /area/hallway/primary/central)
 "mfF" = (
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/cmo";
+	areastring = "/area/command/heads_quarters/cmo";
 	dir = 1;
-	name = "CM Office APC";
+	name = "CMO Office APC";
 	pixel_x = -32;
 	pixel_y = 23
 	},
@@ -39579,7 +39579,7 @@
 	},
 /obj/machinery/pdapainter,
 /obj/machinery/power/apc{
-	areastring = "/area/service/heads/hop";
+	areastring = "/area/command/heads_quarters/hop";
 	dir = 1;
 	name = "Head of Personnel APC";
 	pixel_y = 23
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index db5fc8a1f8..08da6fa84f 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -58,8 +58,8 @@
 	set waitfor = FALSE
 	if(!AM || istype(AM, /obj/docking_port))
 		return
-	if(AM.loc != src) 	// Multi-tile objects are "in" multiple locs but its loc is it's true placement.
-		return			// Don't move multi tile objects if their origin isnt in transit
+	if(AM.loc != src) // Multi-tile objects are "in" multiple locs but its loc is it's true placement.
+		return // Don't move multi tile objects if their origin isn't in transit
 	var/max = world.maxx-TRANSITIONEDGE
 	var/min = 1+TRANSITIONEDGE
 
@@ -68,6 +68,10 @@
 		var/datum/space_level/D = A
 		if (D.linkage == CROSSLINKED)
 			possible_transtitons += D.z_value
+	if(!length(possible_transtitons)) //No space to throw them to - try throwing them onto mining
+		possible_transtitons = SSmapping.levels_by_trait(ZTRAIT_MINING)
+		if(!length(possible_transtitons)) //Just throw them back on station, if not just runtime.
+			possible_transtitons = SSmapping.levels_by_trait(ZTRAIT_STATION)
 	var/_z = pick(possible_transtitons)
 
 	//now select coordinates for a border turf