diff --git a/modular_chomp/maps/southern_cross/overmap/planets/tyr/tyr.dmm b/modular_chomp/maps/southern_cross/overmap/planets/tyr/tyr.dmm
index 36b8fa8649..b8a7a4f1ca 100644
--- a/modular_chomp/maps/southern_cross/overmap/planets/tyr/tyr.dmm
+++ b/modular_chomp/maps/southern_cross/overmap/planets/tyr/tyr.dmm
@@ -16,11 +16,22 @@
 	},
 /turf/simulated/floor/bmarble,
 /area/surface/tyr/eclipse_stronghold/science)
+"ad" = (
+/obj/effect/zone_divider,
+/turf/simulated/floor/tiled/dark,
+/area/surface/tyr/eclipse_stronghold/sec)
 "ae" = (
 /obj/structure/flora/tyr/flowers,
 /mob/living/simple_mob/animal/tyr/groundpitcher,
 /turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr,
 /area/surface/tyr/south_caverns)
+"af" = (
+/obj/structure/bed/chair/backed_grey{
+	dir = 1
+	},
+/obj/effect/zone_divider,
+/turf/simulated/floor/tiled/dark,
+/area/surface/tyr/eclipse_stronghold/sec)
 "ag" = (
 /obj/effect/zone_divider,
 /turf/simulated/wall/r_concrete,
@@ -42,15 +53,54 @@
 /obj/random/obstruction,
 /turf/simulated/floor,
 /area/surface/tyr/eclipse_stronghold/science)
+"al" = (
+/obj/structure/table/steel,
+/obj/effect/zone_divider,
+/turf/simulated/floor/tiled/dark,
+/area/surface/tyr/eclipse_stronghold/sec)
+"am" = (
+/obj/structure/bed/chair/backed_grey,
+/obj/effect/zone_divider,
+/turf/simulated/floor/tiled/dark,
+/area/surface/tyr/eclipse_stronghold/sec)
 "an" = (
 /obj/effect/zone_divider,
 /turf/simulated/mineral/light/tyr,
 /area/surface/tyr/north_caverns)
+"ao" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/effect/zone_divider,
+/turf/simulated/floor/tiled/dark,
+/area/surface/tyr/eclipse_stronghold/sec)
+"ap" = (
+/obj/structure/table/steel,
+/obj/item/handcuffs/legcuffs,
+/obj/effect/zone_divider,
+/turf/simulated/floor/tiled/dark,
+/area/surface/tyr/eclipse_stronghold/sec)
 "aq" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/effect/floor_decal/corner/lime/diagonal,
 /turf/simulated/floor/tiled/hydro,
 /area/surface/tyr/eclipse_stronghold/sec)
+"ar" = (
+/obj/structure/table/steel,
+/obj/item/handcuffs/legcuffs/bola,
+/obj/effect/zone_divider,
+/turf/simulated/floor/tiled/dark,
+/area/surface/tyr/eclipse_stronghold/sec)
+"as" = (
+/obj/effect/floor_decal/corner/purple/diagonal,
+/obj/machinery/door/airlock/silver,
+/turf/simulated/floor/tiled/old_tile/purple,
+/area/surface/tyr/eclipse_stronghold/science)
+"at" = (
+/obj/random/vendorsnack,
+/obj/effect/zone_divider,
+/turf/simulated/floor/tiled/dark,
+/area/surface/tyr/eclipse_stronghold/sec)
 "au" = (
 /mob/living/simple_mob/humanoid/eclipse/solar/clockspear,
 /turf/simulated/floor/tiled/dark,
@@ -61,9 +111,33 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/surface/tyr/eclipse_stronghold/sec)
+"aw" = (
+/obj/random/obstruction,
+/obj/effect/zone_divider,
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_stronghold/sec)
 "ax" = (
 /turf/simulated/floor/carpet/bcarpet,
 /area/surface/tyr/eclipse_stronghold/science)
+"ay" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/effect/zone_divider,
+/turf/simulated/floor/concrete,
+/area/surface/tyr/eclipse_stronghold/sec)
+"az" = (
+/obj/effect/zone_divider,
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_stronghold/engineering)
+"aA" = (
+/obj/effect/floor_decal/corner/yellow{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightorange,
+/obj/effect/zone_divider,
+/turf/simulated/floor/tiled/techmaint,
+/area/surface/tyr/eclipse_stronghold/engineering)
 "aB" = (
 /obj/effect/floor_decal/corner/white/diagonal,
 /turf/simulated/floor/tiled/white,
@@ -450,9 +524,6 @@
 "cN" = (
 /turf/simulated/wall/sandstone,
 /area/surface/tyr/south_caverns)
-"cP" = (
-/turf/simulated/floor/water/indoors,
-/area/surface/tyr/precursorruins/finale)
 "cQ" = (
 /obj/machinery/disposal/deliveryChute{
 	dir = 1
@@ -470,7 +541,10 @@
 /area/surface/tyr/south_caverns)
 "cY" = (
 /obj/effect/map_effect/interval/effect_emitter/smoke/shock,
-/turf/simulated/floor/water/deep/indoors,
+/turf/simulated/floor/water/deep/indoors{
+	nitrogen = 82.1472;
+	oxygen = 21.8366
+	},
 /area/surface/tyr/precursorruins/finale)
 "db" = (
 /obj/structure/inflatable/door,
@@ -1048,10 +1122,6 @@
 /mob/living/simple_mob/humanoid/eclipse/solar/snipertesh,
 /turf/simulated/floor/tiled/white,
 /area/surface/tyr/eclipse_stronghold/medical)
-"fN" = (
-/obj/effect/zone_divider,
-/turf/simulated/floor/water/indoors,
-/area/surface/tyr/precursorruins/finale)
 "fO" = (
 /obj/structure/table/standard,
 /obj/item/universal_translator,
@@ -1119,10 +1189,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/surface/tyr/eclipse_stronghold/medical)
-"gc" = (
-/obj/structure/table/darkglass,
-/turf/simulated/floor/water/indoors,
-/area/surface/tyr/precursorruins/finale)
 "ge" = (
 /obj/structure/mob_spawner/ant_hill,
 /obj/effect/zone_divider,
@@ -1367,7 +1433,7 @@
 /turf/simulated/floor/outdoors/desert_planet/gravel/tyr,
 /area/surface/tyr/south_caverns)
 "hd" = (
-/turf/simulated/floor/water/indoors,
+/turf/simulated/floor/water/pool/turfpack/station,
 /area/surface/tyr/eclipse_stronghold/science)
 "he" = (
 /obj/structure/disposalpipe/segment{
@@ -6724,6 +6790,7 @@
 "Gf" = (
 /obj/structure/bed/chair/backed_grey,
 /mob/living/simple_mob/humanoid/eclipse/solar/clocksgun,
+/obj/effect/zone_divider,
 /turf/simulated/floor/tiled/dark,
 /area/surface/tyr/eclipse_stronghold/sec)
 "Gg" = (
@@ -6940,6 +7007,7 @@
 	dir = 1
 	},
 /mob/living/simple_mob/humanoid/eclipse/lunar/silvernoodle,
+/obj/effect/zone_divider,
 /turf/simulated/floor/tiled/dark,
 /area/surface/tyr/eclipse_stronghold/sec)
 "HP" = (
@@ -7094,7 +7162,7 @@
 /area/surface/tyr/eclipse_stronghold/sec)
 "IT" = (
 /obj/random/mob/fish,
-/turf/simulated/floor/water/indoors,
+/turf/simulated/floor/water/pool/turfpack/station,
 /area/surface/tyr/eclipse_stronghold/science)
 "IY" = (
 /obj/structure/closet/toolcloset,
@@ -22363,7 +22431,7 @@ Qp
 MW
 Qp
 Qp
-Qp
+as
 fc
 jA
 uc
@@ -36805,26 +36873,26 @@ lz
 nA
 HP
 rD
-jU
-jU
-jU
-Sq
-VJ
-Xj
+aw
+aw
+aw
+rD
+at
+ad
 Gf
-ta
-ml
+ar
+ap
 HL
-Xj
-Sq
-av
-Xj
-IZ
-Hx
-SM
-Xj
-Xj
-Sq
+ad
+rD
+ao
+ad
+am
+al
+af
+ad
+ad
+rD
 an
 an
 an
@@ -37137,6 +37205,9 @@ Uo
 Uo
 Uo
 YZ
+ie
+ie
+ie
 Uo
 Uo
 Uo
@@ -37160,12 +37231,9 @@ Uo
 Uo
 Uo
 Uo
-Uo
-Uo
-Uo
-Uo
-Uo
-Uo
+ie
+ie
+ie
 Uo
 Uo
 Uo
@@ -37181,8 +37249,8 @@ Uo
 Uo
 jD
 jD
-jD
-jD
+ie
+ie
 OQ
 OQ
 OQ
@@ -39878,7 +39946,7 @@ Zy
 Zy
 Zy
 Zy
-Zy
+bE
 Zy
 Zy
 Zy
@@ -40136,7 +40204,7 @@ Zy
 Zy
 Zy
 Zy
-Zy
+bE
 Zy
 Zy
 Zy
@@ -40394,7 +40462,7 @@ Zy
 Zy
 Zy
 Zy
-Zy
+bE
 Zy
 Zy
 Zy
@@ -40652,7 +40720,7 @@ wY
 wY
 Zy
 Zy
-Zy
+bE
 Zy
 Zy
 Zy
@@ -40910,7 +40978,7 @@ CW
 wY
 wY
 wY
-Zy
+bE
 Zy
 Zy
 Zy
@@ -42979,7 +43047,7 @@ Zy
 Zy
 Zy
 Zy
-Zy
+bE
 Zy
 Zy
 Zy
@@ -43148,7 +43216,7 @@ Mz
 Mz
 Th
 bF
-cP
+Th
 Mz
 Mz
 Mz
@@ -43237,7 +43305,7 @@ Zy
 Zy
 Zy
 Zy
-Zy
+bE
 Zy
 Zy
 Zy
@@ -43405,7 +43473,7 @@ Th
 Mz
 Mz
 Th
-cP
+bF
 cY
 Mz
 Mz
@@ -43664,7 +43732,7 @@ Mz
 Mz
 Th
 bF
-cP
+Th
 Mz
 Mz
 Th
@@ -44167,7 +44235,7 @@ hU
 hU
 Mz
 Mz
-cP
+Th
 Th
 Th
 Th
@@ -44223,7 +44291,7 @@ Th
 Th
 Th
 Th
-cP
+Th
 Th
 Th
 Th
@@ -44426,7 +44494,6 @@ Mz
 Mz
 Mz
 cY
-cP
 bF
 bF
 bF
@@ -44434,7 +44501,8 @@ bF
 bF
 bF
 bF
-cP
+bF
+bF
 bF
 bF
 bF
@@ -44480,9 +44548,9 @@ Th
 bF
 bF
 bF
-cP
+bF
 cY
-cP
+bF
 bF
 bF
 bF
@@ -44683,7 +44751,7 @@ Mz
 Mz
 Mz
 Mz
-cP
+Th
 bF
 Th
 Th
@@ -44691,9 +44759,9 @@ Th
 Th
 Th
 Th
-cP
+Th
 cY
-cP
+Th
 Th
 bF
 Th
@@ -44739,12 +44807,12 @@ bF
 Th
 Th
 Th
-cP
 Th
 Th
 Th
 Th
-cP
+Th
+Th
 bF
 Th
 Mz
@@ -44980,9 +45048,9 @@ Mz
 Mz
 Th
 Th
-cP
+Th
 cY
-cP
+Th
 Th
 fW
 Mz
@@ -45003,7 +45071,7 @@ Mz
 Mz
 Mz
 cY
-cP
+bF
 Th
 Mz
 "}
@@ -45200,7 +45268,7 @@ Mz
 Mz
 Mz
 Th
-cP
+bF
 Th
 Mz
 Mz
@@ -45239,7 +45307,7 @@ Mz
 Th
 bF
 bF
-cP
+bF
 bF
 bF
 Mz
@@ -45260,7 +45328,7 @@ Mz
 Mz
 Mz
 Mz
-cP
+Th
 bF
 Th
 Mz
@@ -45457,19 +45525,19 @@ Mz
 Mz
 Mz
 Th
-cP
+Th
 cY
-cP
 Th
 Th
 Th
-cP
+Th
+Th
 cY
-cP
+Th
 Mz
 Mz
 Th
-cP
+bF
 Th
 Mz
 Mz
@@ -45510,7 +45578,7 @@ Mz
 Mz
 Th
 bF
-cP
+Th
 Mz
 Mz
 Th
@@ -45716,19 +45784,19 @@ Mz
 Mz
 Th
 bF
-cP
+bF
 ct
 bF
 bF
 bF
 ct
-cP
+bF
 Th
 Mz
 Mz
-cP
+Th
 cY
-cP
+Th
 Mz
 Mz
 Mz
@@ -45767,7 +45835,7 @@ Mz
 Mz
 Mz
 Th
-cP
+bF
 cY
 Mz
 Mz
@@ -45985,7 +46053,7 @@ Th
 Mz
 Mz
 Th
-cP
+bF
 Th
 Mz
 Mz
@@ -46026,7 +46094,7 @@ Mz
 Mz
 Th
 bF
-cP
+Th
 Mz
 Mz
 Th
@@ -46259,7 +46327,7 @@ Th
 Th
 bF
 Th
-cP
+Th
 Th
 Th
 Th
@@ -46276,9 +46344,9 @@ Th
 Th
 Th
 Th
-cP
+Th
 cY
-cP
+Th
 Th
 Th
 Th
@@ -46492,12 +46560,12 @@ Th
 Th
 bF
 bF
-cP
 bF
 bF
 bF
 bF
-cP
+bF
+Th
 Mz
 Mz
 Th
@@ -46516,9 +46584,8 @@ bF
 bF
 bF
 bF
-cP
+bF
 cY
-cP
 bF
 bF
 bF
@@ -46527,7 +46594,6 @@ bF
 bF
 bF
 bF
-cP
 bF
 bF
 bF
@@ -46535,7 +46601,9 @@ bF
 bF
 bF
 bF
-cP
+bF
+bF
+bF
 bF
 bF
 bF
@@ -46749,12 +46817,12 @@ Mz
 Mz
 Th
 bF
-cP
+bF
 cY
-cP
 bF
 bF
-cP
+bF
+bF
 cY
 Mz
 Mz
@@ -46775,7 +46843,7 @@ Th
 Th
 Th
 Th
-cP
+Th
 Th
 Th
 Th
@@ -46784,9 +46852,9 @@ bF
 Th
 Th
 Th
-cP
+Th
 cY
-cP
+Th
 Th
 Th
 Th
@@ -47008,12 +47076,12 @@ Mz
 Th
 Th
 hC
-cP
+bF
 bF
 bF
 hC
 bF
-cP
+Th
 Mz
 Mz
 Th
@@ -47038,7 +47106,7 @@ Mz
 Mz
 Mz
 Th
-cP
+bF
 Th
 Mz
 Mz
@@ -47209,6 +47277,9 @@ dZ
 dZ
 dZ
 dZ
+id
+id
+id
 dZ
 dZ
 dZ
@@ -47223,12 +47294,9 @@ dZ
 dZ
 dZ
 dZ
-dZ
-dZ
-dZ
-dZ
-dZ
-dZ
+id
+id
+id
 dZ
 dZ
 dZ
@@ -47243,8 +47311,8 @@ dZ
 dZ
 dN
 dN
-dN
-dN
+id
+id
 OQ
 OQ
 OQ
@@ -47295,9 +47363,9 @@ Mz
 Mz
 Mz
 Mz
-cP
+Th
 cY
-cP
+Th
 Mz
 Mz
 Mz
@@ -47363,35 +47431,35 @@ em
 Eg
 mG
 mG
-MY
-fR
-Qa
-Qa
-Qa
-Qa
-Qa
-fR
-Vu
-yS
-Iu
-yS
-yS
-yS
-Iu
-yS
-yS
-Iu
-yS
-yS
-Iu
-yS
-yS
-Iu
-yS
-yS
-Iu
-yS
-yS
+aA
+Eg
+az
+az
+az
+az
+az
+Eg
+ay
+dL
+PF
+dL
+dL
+dL
+PF
+dL
+dL
+PF
+dL
+dL
+PF
+dL
+dL
+PF
+dL
+dL
+PF
+dL
+dL
 PF
 dL
 dL
@@ -47534,7 +47602,7 @@ aa
 aa
 co
 fG
-fN
+co
 aa
 aa
 co
@@ -47554,7 +47622,7 @@ co
 co
 co
 co
-fN
+fG
 co
 co
 co
@@ -47573,7 +47641,7 @@ co
 aa
 aa
 co
-fN
+fG
 co
 aa
 aa
@@ -47791,13 +47859,13 @@ Mz
 Mz
 Mz
 Th
-cP
+bF
 cY
 Mz
 Mz
 Th
 ct
-gc
+ct
 bF
 bF
 bF
@@ -47818,7 +47886,7 @@ bF
 bF
 bF
 ct
-gc
+ct
 bF
 bF
 ct
@@ -47830,9 +47898,9 @@ ct
 Th
 Mz
 Mz
-cP
+Th
 cY
-cP
+Th
 Mz
 Mz
 Mz
@@ -48050,19 +48118,19 @@ Mz
 Mz
 Th
 bF
-cP
+Th
 Mz
 Mz
 Th
-cP
+bF
 cY
-cP
 bF
 bF
 bF
 bF
 bF
-cP
+bF
+bF
 bF
 bF
 bF
@@ -48075,9 +48143,9 @@ Th
 Th
 Th
 Th
-cP
+bF
 cY
-cP
+bF
 bF
 bF
 bF
@@ -48089,7 +48157,7 @@ Th
 Mz
 Mz
 Th
-cP
+bF
 Th
 Mz
 Mz
@@ -48313,15 +48381,15 @@ Mz
 Mz
 Th
 ct
-gc
+ct
 bF
 bF
 bF
 ct
 ct
-cP
+bF
 cY
-cP
+bF
 ct
 ct
 Th
@@ -48334,7 +48402,7 @@ Mz
 Mz
 Th
 ct
-gc
+ct
 bF
 bF
 ct
@@ -48578,7 +48646,7 @@ Th
 Th
 Th
 Th
-cP
+Th
 Th
 Th
 Th
@@ -48822,7 +48890,7 @@ bF
 bF
 Mz
 Mz
-cP
+Th
 bF
 Th
 Mz
@@ -48845,7 +48913,7 @@ Mz
 Mz
 Th
 bF
-cP
+Th
 Mz
 Mz
 Mz
@@ -49081,7 +49149,7 @@ bF
 Mz
 Mz
 cY
-cP
+bF
 Th
 Mz
 Mz
@@ -49102,7 +49170,7 @@ Mz
 Mz
 Mz
 Th
-cP
+bF
 cY
 Mz
 Mz
@@ -49338,7 +49406,7 @@ bF
 bF
 Mz
 Mz
-cP
+Th
 bF
 Th
 Mz
@@ -49346,9 +49414,9 @@ Mz
 Th
 Th
 Th
-cP
+Th
 cY
-cP
+Th
 Th
 Th
 Th
@@ -49361,7 +49429,7 @@ Mz
 Mz
 Th
 bF
-cP
+Th
 Mz
 Mz
 Th
@@ -49605,7 +49673,7 @@ Th
 ct
 ct
 bF
-cP
+bF
 bF
 ct
 ct
@@ -49868,7 +49936,7 @@ bF
 bF
 bF
 bF
-cP
+bF
 bF
 bF
 bF
@@ -49887,7 +49955,7 @@ bF
 bF
 bF
 bF
-cP
+bF
 bF
 bF
 bF
@@ -50125,9 +50193,9 @@ bF
 bF
 ct
 ct
-cP
+bF
 cY
-cP
+bF
 ct
 ct
 bF
@@ -50144,9 +50212,9 @@ ct
 bF
 bF
 ct
-gc
+ct
 cY
-cP
+bF
 ct
 ct
 Th
@@ -50384,7 +50452,6 @@ Th
 Th
 Th
 Th
-cP
 Th
 Th
 Th
@@ -50403,7 +50470,8 @@ Th
 Th
 Th
 Th
-cP
+Th
+Th
 Th
 Th
 Th
@@ -54889,7 +54957,7 @@ Na
 Na
 Na
 if
-Zy
+an
 dN
 dZ
 dZ
@@ -55147,7 +55215,7 @@ Na
 Na
 Na
 if
-Zy
+an
 dN
 dZ
 dZ
@@ -55405,7 +55473,7 @@ Na
 Na
 Na
 if
-Zy
+an
 dN
 dN
 dZ
@@ -55663,7 +55731,7 @@ Na
 Na
 Na
 if
-Zy
+an
 dN
 dN
 dZ
@@ -55921,7 +55989,7 @@ if
 if
 if
 if
-Zy
+an
 dN
 dN
 dZ
@@ -56179,7 +56247,7 @@ Zy
 Zy
 Zy
 Zy
-Zy
+an
 dN
 dN
 dZ
@@ -56437,7 +56505,7 @@ Zy
 Zy
 Zy
 Zy
-Zy
+an
 dN
 dN
 dZ
@@ -56695,7 +56763,7 @@ if
 if
 if
 Zy
-Zy
+an
 dN
 dN
 dN
@@ -56953,7 +57021,7 @@ iH
 iH
 if
 Zy
-Zy
+an
 dN
 dN
 dN
@@ -59457,7 +59525,7 @@ lf
 "}
 (196,1,1) = {"
 Vr
-Zy
+bE
 Zy
 Zy
 Zy
@@ -59715,7 +59783,7 @@ lf
 "}
 (197,1,1) = {"
 Vr
-Zy
+bE
 Zy
 Zy
 Zy
@@ -59973,7 +60041,7 @@ lf
 "}
 (198,1,1) = {"
 Vr
-Zy
+bE
 Zy
 Zy
 Zy