diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index 51ce08a1bc4..7e74d0e6918 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -162,7 +162,7 @@
 /area/ruin/powered/beach)
 "cP" = (
 /obj/structure/flora/bush/stalky/style_random,
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/ruin/powered/beach)
 "cV" = (
 /obj/structure/closet/secure_closet/freezer/meat{
@@ -335,7 +335,7 @@
 "iH" = (
 /obj/structure/flora/bush/stalky/style_random,
 /obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/ruin/powered/beach)
 "jc" = (
 /obj/structure/table/wood,
@@ -457,7 +457,7 @@
 /turf/open/floor/pod/light,
 /area/ruin/powered/beach)
 "pz" = (
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/ruin/powered/beach)
 "pE" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
@@ -614,12 +614,6 @@
 	},
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
-"tG" = (
-/turf/open/misc/beach/coastline_t/sandwater_inner,
-/area/ruin/powered/beach)
-"tO" = (
-/turf/open/misc/beach/coastline_t,
-/area/ruin/powered/beach)
 "tQ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
 	dir = 4
@@ -680,9 +674,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/turf/open/misc/beach/coastline_b{
-	dir = 9
-	},
+/turf/open/misc/beach/coast/corner,
 /area/ruin/powered/beach)
 "xA" = (
 /obj/machinery/light/directional/east,
@@ -713,11 +705,11 @@
 /turf/open/misc/beach/sand,
 /area/ruin/powered/beach)
 "yT" = (
-/turf/open/misc/beach/coastline_b,
+/turf/open/misc/beach/coast,
 /area/ruin/powered/beach)
 "yY" = (
 /obj/machinery/light/directional/east,
-/turf/open/misc/beach/coastline_b{
+/turf/open/misc/beach/coast{
 	dir = 8
 	},
 /area/ruin/powered/beach)
@@ -878,7 +870,7 @@
 /area/ruin/powered/beach)
 "Eu" = (
 /obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/ruin/powered/beach)
 "EE" = (
 /obj/structure/dresser,
@@ -886,7 +878,7 @@
 /area/ruin/powered/beach)
 "EL" = (
 /obj/machinery/light/directional/south,
-/turf/open/misc/beach/coastline_b{
+/turf/open/misc/beach/coast{
 	dir = 1
 	},
 /area/ruin/powered/beach)
@@ -1053,8 +1045,8 @@
 	dir = 1
 	},
 /obj/machinery/light/directional/south,
-/turf/open/misc/beach/coastline_b{
-	dir = 10
+/turf/open/misc/beach/coast/corner{
+	dir = 8
 	},
 /area/ruin/powered/beach)
 "Jr" = (
@@ -1071,7 +1063,7 @@
 /obj/structure/railing{
 	dir = 8
 	},
-/turf/open/misc/beach/coastline_b{
+/turf/open/misc/beach/coast{
 	dir = 4
 	},
 /area/ruin/powered/beach)
@@ -1096,8 +1088,8 @@
 /turf/closed/wall/mineral/sandstone,
 /area/ruin/powered/beach)
 "Ld" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 5
+/turf/open/misc/beach/coast/corner{
+	dir = 1
 	},
 /area/ruin/powered/beach)
 "Lm" = (
@@ -1235,12 +1227,12 @@
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "Ro" = (
-/turf/open/misc/beach/coastline_b{
+/turf/open/misc/beach/coast{
 	dir = 1
 	},
 /area/ruin/powered/beach)
 "Rx" = (
-/turf/open/misc/beach/coastline_b{
+/turf/open/misc/beach/coast{
 	dir = 8
 	},
 /area/ruin/powered/beach)
@@ -1428,8 +1420,8 @@
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "WV" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 6
+/turf/open/misc/beach/coast/corner{
+	dir = 4
 	},
 /area/ruin/powered/beach)
 "Xa" = (
@@ -1437,7 +1429,7 @@
 /mob/living/simple_animal/chicken{
 	name = "Chicken Joe"
 	},
-/turf/open/misc/beach/coastline_t,
+/turf/open/misc/beach/sand,
 /area/ruin/powered/beach)
 "Xt" = (
 /obj/machinery/door/airlock/sandstone{
@@ -1805,7 +1797,7 @@ VI
 VI
 VI
 VI
-tG
+VI
 Iv
 lq
 lq
@@ -1837,7 +1829,7 @@ VI
 hN
 SH
 VI
-tO
+VI
 xn
 JA
 JA
@@ -1869,7 +1861,7 @@ VI
 bC
 Ti
 VI
-tO
+VI
 yT
 cP
 pz
@@ -1901,7 +1893,7 @@ VI
 XM
 VI
 rz
-tO
+VI
 yT
 pz
 pz
@@ -1933,7 +1925,7 @@ VI
 Jr
 Jr
 VI
-tO
+VI
 yT
 pz
 pz
@@ -1965,7 +1957,7 @@ VI
 FO
 VI
 VI
-tO
+VI
 yT
 pz
 pz
@@ -1997,7 +1989,7 @@ VI
 Bn
 Zj
 VI
-tO
+VI
 yT
 cP
 pz
@@ -2029,7 +2021,7 @@ ks
 xA
 VI
 VI
-tO
+VI
 yT
 pz
 pz
@@ -2061,7 +2053,7 @@ Ao
 bG
 bL
 VI
-tO
+VI
 yT
 pz
 Eu
@@ -2125,7 +2117,7 @@ VI
 VI
 VI
 wc
-tO
+VI
 Ld
 yY
 Rx
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index 61c3e62e341..aa922c7063c 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -309,11 +309,6 @@
 	dir = 1
 	},
 /area/ruin/space/has_grav/hotel/dock)
-"db" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 8
-	},
-/area/ruin/space/has_grav/hotel/pool)
 "dd" = (
 /obj/structure/sink/directional/west,
 /turf/open/floor/iron/showroomfloor,
@@ -2715,7 +2710,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/hotel)
 "CG" = (
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 8
 	},
 /area/ruin/space/has_grav/hotel/pool)
@@ -2805,7 +2800,7 @@
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/hotel/bar)
 "DK" = (
-/turf/open/misc/beach/coastline_t,
+/turf/open/water/beach,
 /area/ruin/space/has_grav/hotel/pool)
 "DO" = (
 /obj/effect/turf_decal/loading_area,
@@ -3153,7 +3148,7 @@
 /area/ruin/space/has_grav/hotel/bar)
 "HI" = (
 /obj/machinery/light/directional/west,
-/turf/open/misc/beach/coastline_t,
+/turf/open/water/beach,
 /area/ruin/space/has_grav/hotel/pool)
 "HP" = (
 /obj/structure/table/wood/fancy/red,
@@ -6646,11 +6641,11 @@ MQ
 JY
 ma
 JC
-db
-db
-db
-db
-db
+DK
+DK
+DK
+DK
+DK
 xP
 ma
 JY
@@ -6719,11 +6714,11 @@ Iw
 Vq
 Si
 QP
-db
-db
-db
-db
-db
+DK
+DK
+DK
+DK
+DK
 nJ
 mL
 JY
@@ -6792,11 +6787,11 @@ JY
 JY
 Fi
 QP
-db
-db
-db
-db
-db
+DK
+DK
+DK
+DK
+DK
 nJ
 qg
 JY
@@ -6865,11 +6860,11 @@ yV
 JY
 wW
 Cu
-db
-db
-db
-db
-db
+DK
+DK
+DK
+DK
+DK
 Qc
 dN
 JY
diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
index 9ddd34ae361..85cec66e1a3 100644
--- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
+++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
@@ -84,7 +84,7 @@
 /turf/open/floor/holofloor/beach,
 /area/ruin/space/has_grav/powered/aesthetic)
 "u" = (
-/turf/open/floor/holofloor/beach/coast_t,
+/turf/open/floor/holofloor/beach/coast,
 /area/ruin/space/has_grav/powered/aesthetic)
 "v" = (
 /obj/item/statuebust,
@@ -101,7 +101,7 @@
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "y" = (
-/turf/open/floor/holofloor/beach/coast_b,
+/turf/open/floor/holofloor/beach/water,
 /area/ruin/space/has_grav/powered/aesthetic)
 "z" = (
 /obj/structure/fans/tiny,
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index 1e8ac374713..45da11f62c3 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -6,46 +6,28 @@
 /turf/open/indestructible/binary{
 	density = 1;
 	desc = "I can't move through this.";
-	icon = 'icons/misc/beach.dmi';
+	icon = 'icons/turf/beach.dmi';
 	icon_state = "water";
 	name = "deep ocean water"
 	},
 /area/awaymission/beach)
-"ac" = (
-/turf/open/water/beach/biodome,
-/area/awaymission/beach)
-"ad" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 1
-	},
-/area/awaymission/beach)
-"ae" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 8
-	},
-/area/awaymission/beach)
 "af" = (
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 9
 	},
 /area/awaymission/beach)
 "ag" = (
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 1
 	},
 /area/awaymission/beach)
 "ah" = (
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 5
 	},
 /area/awaymission/beach)
-"ai" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 4
-	},
-/area/awaymission/beach)
 "aj" = (
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 8
 	},
 /area/awaymission/beach)
@@ -61,7 +43,7 @@
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "am" = (
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 4
 	},
 /area/awaymission/beach)
@@ -73,21 +55,18 @@
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "ao" = (
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 10
 	},
 /area/awaymission/beach)
 "ap" = (
-/turf/open/misc/beach/coastline_t,
+/turf/open/misc/beach/coast,
 /area/awaymission/beach)
 "aq" = (
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 6
 	},
 /area/awaymission/beach)
-"ar" = (
-/turf/open/misc/beach/coastline_b,
-/area/awaymission/beach)
 "as" = (
 /obj/structure/flora/rock/style_random{
 	desc = "A volcanic rock.";
@@ -100,7 +79,7 @@
 /turf/open/indestructible/binary{
 	density = 1;
 	desc = "I can't move through this.";
-	icon = 'icons/misc/beach.dmi';
+	icon = 'icons/turf/beach.dmi';
 	icon_state = "water";
 	name = "deep ocean water"
 	},
@@ -113,7 +92,7 @@
 /turf/open/indestructible/binary{
 	density = 1;
 	desc = "I can't move through this.";
-	icon = 'icons/misc/beach.dmi';
+	icon = 'icons/turf/beach.dmi';
 	icon_state = "water";
 	name = "deep ocean water"
 	},
@@ -141,29 +120,16 @@
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "av" = (
-/turf/open/water/beach/biodome{
-	desc = "What's the difference?";
-	name = "coastline water"
-	},
-/area/awaymission/beach)
-"aw" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 6
-	},
-/area/awaymission/beach)
-"ax" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 10
-	},
+/turf/open/water/beach,
 /area/awaymission/beach)
 "ay" = (
-/turf/open/misc/beach/coastline_t/sandwater_inner{
+/turf/open/misc/beach/coast/corner{
 	dir = 4
 	},
 /area/awaymission/beach)
 "az" = (
-/turf/open/misc/beach/coastline_t/sandwater_inner{
-	dir = 1
+/turf/open/misc/beach/coast/corner{
+	dir = 8
 	},
 /area/awaymission/beach)
 "aA" = (
@@ -208,7 +174,7 @@
 	pixel_x = -16;
 	pixel_y = 1
 	},
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/awaymission/beach)
 "aK" = (
 /mob/living/simple_animal/crab,
@@ -231,18 +197,13 @@
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "aT" = (
-/turf/open/misc/beach/coastline_t/sandwater_inner{
-	dir = 8
+/turf/open/misc/beach/coast/corner{
+	dir = 1
 	},
 /area/awaymission/beach)
 "aX" = (
 /turf/closed/wall/mineral/sandstone,
 /area/awaymission/beach)
-"aY" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 5
-	},
-/area/awaymission/beach)
 "aZ" = (
 /obj/effect/overlay/palmtree_r,
 /turf/open/misc/beach/sand,
@@ -347,7 +308,7 @@
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "bo" = (
-/turf/open/misc/beach/coastline_t/sandwater_inner,
+/turf/open/misc/beach/coast/corner,
 /area/awaymission/beach)
 "bp" = (
 /obj/effect/turf_decal/sand,
@@ -394,11 +355,6 @@
 /obj/effect/overlay/coconut,
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
-"bw" = (
-/turf/open/misc/beach/coastline_b{
-	dir = 9
-	},
-/area/awaymission/beach)
 "bx" = (
 /obj/effect/turf_decal/sand,
 /obj/effect/turf_decal/stripes/asteroid/line{
@@ -901,7 +857,7 @@
 	pixel_x = -5;
 	pixel_y = 4
 	},
-/turf/open/misc/beach/coastline_t/sandwater_inner,
+/turf/open/misc/beach/coast,
 /area/awaymission/beach)
 "cW" = (
 /obj/item/reagent_containers/cup/soda_cans/lemon_lime{
@@ -927,7 +883,7 @@
 /obj/item/clothing/head/collectable/paper{
 	desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from fire, Curators, and ocean waves."
 	},
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/awaymission/beach)
 "da" = (
 /mob/living/simple_animal/parrot,
@@ -969,7 +925,7 @@
 /area/awaymission/beach)
 "iy" = (
 /obj/item/toy/seashell,
-/turf/open/misc/beach/coastline_t,
+/turf/open/misc/beach/coast,
 /area/awaymission/beach)
 "kK" = (
 /obj/item/toy/seashell{
@@ -1030,15 +986,15 @@
 /obj/item/toy/seashell{
 	pixel_y = -5
 	},
-/turf/open/misc/beach/coastline_t,
+/turf/open/misc/beach/coast,
 /area/awaymission/beach)
 "wz" = (
 /obj/item/toy/seashell{
 	pixel_x = -8;
 	pixel_y = 9
 	},
-/turf/open/misc/beach/coastline_t/sandwater_inner{
-	dir = 8
+/turf/open/misc/beach/coast/corner{
+	dir = 1
 	},
 /area/awaymission/beach)
 "xA" = (
@@ -1084,7 +1040,9 @@
 	pixel_x = 12;
 	pixel_y = 5
 	},
-/turf/open/misc/beach/coastline_t/sandwater_inner,
+/turf/open/misc/beach/coast{
+	dir = 4
+	},
 /area/awaymission/beach)
 "EG" = (
 /obj/item/flashlight/flare/torch{
@@ -1100,8 +1058,8 @@
 /area/awaymission/beach)
 "He" = (
 /obj/structure/fluff/beach_umbrella/syndi,
-/turf/open/misc/beach/coastline_t/sandwater_inner{
-	dir = 1
+/turf/open/misc/beach/coast/corner{
+	dir = 8
 	},
 /area/awaymission/beach)
 "HN" = (
@@ -4229,55 +4187,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -4336,55 +4294,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -4443,55 +4401,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -4550,55 +4508,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ae
-ae
-ae
-ae
-ae
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -4657,55 +4615,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
+av
+av
+av
+av
 af
 aj
 aj
 aj
 ao
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -4764,14 +4722,14 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
+av
+av
+av
 af
 ay
 kK
@@ -4779,40 +4737,40 @@ ak
 kS
 aT
 ao
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -4871,13 +4829,13 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
+av
+av
 af
 ay
 AR
@@ -4887,39 +4845,39 @@ ak
 ak
 aT
 ao
-aY
-ae
-ae
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -4978,12 +4936,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
+av
 af
 ay
 ak
@@ -4997,36 +4955,36 @@ aT
 aj
 aj
 ao
-aY
-ae
-ae
-ae
-ae
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -5085,11 +5043,11 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
 af
 ay
 ak
@@ -5109,31 +5067,31 @@ aj
 aj
 aj
 ao
-aY
-ae
-ac
-ac
-ac
-ac
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -5192,10 +5150,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 af
 ay
 ak
@@ -5218,10 +5176,10 @@ ak
 aT
 aj
 ao
-aY
-ac
-ac
-ad
+av
+av
+av
+av
 af
 aj
 aj
@@ -5229,18 +5187,18 @@ aj
 aj
 aj
 ao
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -5299,10 +5257,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -5326,9 +5284,9 @@ ak
 ak
 aT
 ao
-aY
-ae
-aw
+av
+av
+av
 ag
 MD
 aZ
@@ -5337,17 +5295,17 @@ ak
 ak
 aT
 ao
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -5406,10 +5364,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -5445,16 +5403,16 @@ ak
 MD
 aT
 ao
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -5513,10 +5471,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -5552,16 +5510,16 @@ aK
 ak
 cG
 ap
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -5620,10 +5578,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -5660,15 +5618,15 @@ ak
 ak
 aT
 ao
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -5727,10 +5685,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 aA
@@ -5767,15 +5725,15 @@ ak
 ak
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -5834,10 +5792,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -5874,15 +5832,15 @@ aA
 ak
 bo
 aq
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -5941,10 +5899,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -5980,16 +5938,16 @@ ak
 aD
 ak
 ap
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -6048,10 +6006,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -6087,16 +6045,16 @@ ak
 ak
 ak
 ap
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -6155,10 +6113,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -6195,15 +6153,15 @@ ak
 ak
 aT
 ao
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -6262,10 +6220,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -6302,15 +6260,15 @@ ak
 aK
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -6369,10 +6327,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -6409,15 +6367,15 @@ ak
 ak
 ak
 iy
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -6476,10 +6434,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 ak
 ak
@@ -6516,15 +6474,15 @@ ak
 ak
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -6583,10 +6541,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ag
 MD
 ak
@@ -6623,15 +6581,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -6690,10 +6648,10 @@ av
 av
 av
 av
-ac
-ac
-ac
-ad
+av
+av
+av
+av
 ah
 az
 ak
@@ -6730,15 +6688,15 @@ ak
 cP
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -6797,11 +6755,11 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -6837,15 +6795,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -6904,11 +6862,11 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -6944,15 +6902,15 @@ ak
 ak
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7011,12 +6969,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -7051,15 +7009,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7118,12 +7076,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -7158,15 +7116,15 @@ ak
 cQ
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7225,12 +7183,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -7265,15 +7223,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7332,12 +7290,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -7372,15 +7330,15 @@ ak
 cR
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7439,12 +7397,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -7479,15 +7437,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7546,12 +7504,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -7586,15 +7544,15 @@ aA
 cS
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7653,12 +7611,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -7693,15 +7651,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7760,12 +7718,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -7800,15 +7758,15 @@ ak
 cT
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7867,12 +7825,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -7907,15 +7865,15 @@ ak
 ak
 bo
 aq
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -7974,13 +7932,13 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -8013,16 +7971,16 @@ ak
 ak
 ak
 ap
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -8081,13 +8039,13 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -8120,16 +8078,16 @@ ak
 ak
 bo
 aq
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -8188,13 +8146,13 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
 ag
 aE
 ak
@@ -8226,17 +8184,17 @@ ak
 Nr
 cM
 ap
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -8295,13 +8253,13 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
 ag
 ak
 aH
@@ -8333,17 +8291,17 @@ ak
 cL
 cN
 ap
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -8402,13 +8360,13 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -8441,16 +8399,16 @@ ak
 ak
 aT
 ao
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -8509,14 +8467,14 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 aE
 ak
@@ -8548,16 +8506,16 @@ aZ
 ak
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -8616,14 +8574,14 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 ak
 mV
@@ -8655,16 +8613,16 @@ ak
 aD
 ak
 ap
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -8723,14 +8681,14 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
 ah
 am
 He
@@ -8763,15 +8721,15 @@ ak
 ak
 aT
 ao
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -8830,16 +8788,16 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ai
-ax
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ah
 am
 az
@@ -8870,15 +8828,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -8937,18 +8895,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ai
-ax
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -8977,15 +8935,15 @@ ak
 cU
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -9044,18 +9002,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 aA
 ak
@@ -9084,15 +9042,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -9151,18 +9109,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -9191,15 +9149,15 @@ ak
 ak
 bo
 aq
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -9258,18 +9216,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -9297,16 +9255,16 @@ ak
 aZ
 bo
 aq
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -9365,18 +9323,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 aI
-ac
-ad
+av
+av
 ag
 ak
 ak
@@ -9403,17 +9361,17 @@ cu
 ak
 ak
 ap
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -9472,18 +9430,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 aX
 aX
@@ -9510,17 +9468,17 @@ cu
 ak
 aK
 ap
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -9579,18 +9537,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 aX
 bb
@@ -9616,18 +9574,18 @@ cy
 cy
 ak
 ak
-aT
-ao
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+ap
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -9686,18 +9644,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 aX
 bd
@@ -9724,17 +9682,17 @@ cu
 ak
 ak
 cV
-aq
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -9793,17 +9751,17 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ae
-aw
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 af
 ay
 aX
@@ -9831,17 +9789,17 @@ cu
 ak
 ak
 ap
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -9900,15 +9858,15 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
+av
+av
+av
+av
 af
 aj
 ay
@@ -9938,17 +9896,17 @@ cu
 ak
 ak
 ap
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -10007,14 +9965,14 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
 af
 ay
 aA
@@ -10046,16 +10004,16 @@ ak
 ak
 wz
 ao
-aY
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -10114,14 +10072,14 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 ak
 aK
@@ -10154,15 +10112,15 @@ ak
 ak
 aT
 ao
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -10221,13 +10179,13 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
+av
+av
 af
 ay
 ak
@@ -10261,15 +10219,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -10328,12 +10286,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
 af
 ay
 ak
@@ -10368,15 +10326,15 @@ ak
 cW
 ak
 ap
-ar
-ac
-ac
-ac
+av
+av
+av
+av
 cZ
-ac
-ac
-ac
-ac
+av
+av
+av
+av
 av
 av
 av
@@ -10435,12 +10393,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-aw
+av
+av
+av
+av
+av
+av
 ag
 MD
 ak
@@ -10475,15 +10433,15 @@ ak
 cO
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -10542,11 +10500,11 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
 af
 ay
 ak
@@ -10582,15 +10540,15 @@ ak
 cX
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -10649,11 +10607,11 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -10689,15 +10647,15 @@ ak
 cO
 ak
 wr
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -10756,11 +10714,11 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
 ag
 aA
 aB
@@ -10796,15 +10754,15 @@ ak
 cY
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -10863,11 +10821,11 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -10903,15 +10861,15 @@ ak
 aK
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -10970,11 +10928,11 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -11010,15 +10968,15 @@ ak
 ak
 ak
 ap
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -11077,12 +11035,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
 ag
 MD
 ak
@@ -11117,15 +11075,15 @@ ak
 ze
 bo
 aq
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -11184,12 +11142,12 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -11223,16 +11181,16 @@ aA
 aD
 bo
 aq
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -11291,13 +11249,13 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -11329,17 +11287,17 @@ ak
 ak
 bo
 aq
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -11398,14 +11356,14 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
+av
+av
 ah
 az
 aK
@@ -11435,18 +11393,18 @@ ak
 ak
 bo
 aq
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -11505,15 +11463,15 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 aA
 ak
@@ -11541,19 +11499,19 @@ ak
 ak
 bo
 aq
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -11612,15 +11570,15 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -11647,20 +11605,20 @@ am
 am
 am
 aq
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -11719,16 +11677,16 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -11746,28 +11704,28 @@ ak
 bo
 am
 aq
-bw
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -11826,17 +11784,17 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -11851,30 +11809,30 @@ ak
 ak
 bo
 aq
-bw
-ai
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -11933,18 +11891,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ag
 ak
 ak
@@ -11957,31 +11915,31 @@ ak
 ak
 ak
 ap
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -12040,18 +11998,18 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ad
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ah
 az
 ak
@@ -12061,34 +12019,34 @@ ak
 bo
 am
 am
-az
+am
 Bd
 aq
-ar
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -12147,55 +12105,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ax
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 ah
-az
-bo
+am
+am
 am
 am
 aq
-bw
-ax
-ah
-aq
-bw
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -12254,55 +12212,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ax
-ah
-aq
-bw
-ai
-ai
-ac
-ac
-ai
-ai
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -12361,55 +12319,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ai
-ai
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -12468,55 +12426,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -12575,55 +12533,55 @@ av
 av
 av
 av
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
+av
 av
 av
 av
@@ -14689,13 +14647,13 @@ aa
 (127,1,1) = {"
 aa
 aa
-ac
-ae
-ae
-ae
-ae
-ae
-ac
+av
+av
+av
+av
+av
+av
+av
 ab
 ab
 ab
@@ -14796,13 +14754,13 @@ aa
 (128,1,1) = {"
 aa
 aa
-ad
+av
 af
 aj
 aj
 aj
 ao
-ar
+av
 ab
 ab
 ab
@@ -14903,13 +14861,13 @@ aa
 (129,1,1) = {"
 aa
 aa
-ad
+av
 ag
 ak
 ak
 da
 ap
-ar
+av
 ab
 ab
 ab
@@ -15010,13 +14968,13 @@ aa
 (130,1,1) = {"
 aa
 aa
-ad
+av
 ag
 au
 an
 ak
 ap
-ar
+av
 ab
 ab
 ab
@@ -15117,13 +15075,13 @@ aa
 (131,1,1) = {"
 aa
 aa
-ad
+av
 ag
 al
 ak
 MD
 ap
-ar
+av
 ab
 ab
 ab
@@ -15224,13 +15182,13 @@ aa
 (132,1,1) = {"
 aa
 aa
-ad
+av
 ah
 am
 am
 am
 aq
-ar
+av
 ab
 ab
 ab
@@ -15331,13 +15289,13 @@ aa
 (133,1,1) = {"
 aa
 aa
-ac
-ai
-ai
-ai
-ai
-ai
-ac
+av
+av
+av
+av
+av
+av
+av
 ab
 ab
 ab
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index 8d0b28236b8..53093f2ff59 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -2757,6 +2757,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/science/auxlab)
+"aHX" = (
+/obj/machinery/light/red/dim/directional/north,
+/turf/open/water/beach{
+	desc = "Refreshing!";
+	name = "treated water"
+	},
+/area/station/maintenance/floor1/port/aft)
 "aId" = (
 /obj/effect/turf_decal/trimline/blue/line{
 	dir = 4
@@ -5035,6 +5042,18 @@
 /obj/structure/window/spawner/directional/west,
 /turf/open/floor/grass,
 /area/station/hallway/secondary/exit/departure_lounge)
+"bkG" = (
+/obj/structure/railing{
+	dir = 6
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 6
+	},
+/turf/open/water/beach{
+	desc = "Refreshing!";
+	name = "treated water"
+	},
+/area/station/maintenance/floor1/port/aft)
 "bkM" = (
 /obj/effect/landmark/start/ai/secondary,
 /obj/item/radio/intercom/directional/north{
@@ -6669,14 +6688,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai)
-"bCM" = (
-/obj/structure/railing,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/turf/open/misc/beach/coastline_b{
-	desc = "refreshing!";
-	name = "treated water"
-	},
-/area/station/maintenance/floor1/port/aft)
 "bCW" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/spawner/random/engineering/material,
@@ -6861,6 +6872,12 @@
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/pod/light,
 /area/station/maintenance/floor3/port)
+"bGf" = (
+/turf/open/water/beach{
+	desc = "Refreshing!";
+	name = "treated water"
+	},
+/area/station/maintenance/floor1/port/aft)
 "bGh" = (
 /obj/effect/spawner/random/engineering/atmospherics_portable,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -9179,6 +9196,10 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/plating,
 /area/station/service/abandoned_gambling_den)
+"ckP" = (
+/obj/machinery/smartfridge/extract/preloaded,
+/turf/open/floor/iron/white,
+/area/station/science/xenobiology)
 "ckQ" = (
 /obj/item/kirbyplants/random,
 /turf/open/floor/wood/parquet,
@@ -10827,18 +10848,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
-"cIW" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 4
-	},
-/turf/open/misc/beach/coastline_b{
-	desc = "refreshing!";
-	name = "treated water"
-	},
-/area/station/maintenance/floor1/port/aft)
 "cJf" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/rack,
@@ -11465,6 +11474,20 @@
 	},
 /turf/open/floor/engine,
 /area/station/maintenance/disposal/incinerator)
+"cSb" = (
+/obj/structure/table,
+/obj/item/stock_parts/micro_laser,
+/obj/item/stock_parts/servo{
+	pixel_x = 15;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/dropper{
+	pixel_x = -2;
+	pixel_y = 9
+	},
+/obj/effect/turf_decal/tile/purple/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/science/lab)
 "cSc" = (
 /obj/item/food/cornchips/green{
 	pixel_x = -8;
@@ -28471,20 +28494,6 @@
 /obj/machinery/light/small/red/directional/east,
 /turf/open/floor/catwalk_floor,
 /area/station/maintenance/floor3/port/aft)
-"hBs" = (
-/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/medical{
-	name = "Medical Storage"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/duct,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
-/area/station/medical/storage)
 "hBw" = (
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron/textured_large,
@@ -29071,6 +29080,11 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/floor4/starboard/aft)
+"hKI" = (
+/obj/machinery/smartfridge/organ,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/station/science/cytology)
 "hKK" = (
 /obj/effect/turf_decal/tile/yellow/opposingcorners,
 /obj/structure/cable,
@@ -32734,12 +32748,6 @@
 /obj/structure/cable,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
-"iNe" = (
-/turf/open/misc/beach/coastline_b{
-	desc = "refreshing!";
-	name = "treated water"
-	},
-/area/station/maintenance/floor1/port/aft)
 "iNs" = (
 /obj/structure/table/reinforced/rglass,
 /obj/item/flashlight/lamp{
@@ -35840,17 +35848,6 @@
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/station/service/kitchen/diner)
-"jDl" = (
-/obj/structure/rack,
-/obj/item/circuitboard/machine/biogenerator{
-	pixel_y = 6
-	},
-/obj/item/stock_parts/matter_bin,
-/obj/item/stock_parts/servo,
-/obj/item/stack/cable_coil,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/iron,
-/area/station/science/research/abandoned)
 "jDq" = (
 /obj/machinery/light/directional/west,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41044,6 +41041,18 @@
 /obj/structure/table/reinforced/rglass,
 /turf/open/floor/iron/dark,
 /area/station/commons/dorms/room3)
+"kUk" = (
+/obj/structure/table,
+/obj/item/stock_parts/servo{
+	pixel_x = 2;
+	pixel_y = -4
+	},
+/obj/item/disk/tech_disk{
+	pixel_y = 8
+	},
+/obj/effect/turf_decal/tile/purple/fourcorners,
+/turf/open/floor/iron/white,
+/area/station/science/lab)
 "kUo" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/iron/dark,
@@ -47253,6 +47262,11 @@
 "myz" = (
 /turf/open/openspace,
 /area/station/maintenance/department/medical)
+"myF" = (
+/obj/machinery/smartfridge/chemistry/preloaded,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/white,
+/area/station/medical/pharmacy)
 "myO" = (
 /turf/closed/wall,
 /area/station/hallway/secondary/exit/escape_pod)
@@ -48184,10 +48198,6 @@
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron/checker,
 /area/station/service/bar/atrium)
-"mKI" = (
-/obj/machinery/smartfridge/extract/preloaded,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
 "mKO" = (
 /obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
 	name = "Burn Chamber Interior Airlock"
@@ -51524,6 +51534,11 @@
 	},
 /turf/open/floor/pod/light,
 /area/station/maintenance/floor3/starboard/aft)
+"nyx" = (
+/obj/machinery/smartfridge/organ,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/white,
+/area/station/medical/storage)
 "nyE" = (
 /turf/closed/wall/r_wall,
 /area/station/ai_monitored/turret_protected/ai_upload_foyer)
@@ -54175,6 +54190,20 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/science/lobby)
+"ohF" = (
+/obj/effect/mapping_helpers/airlock/access/any/medical/general,
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/medical{
+	name = "Medical Storage"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/duct,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/white,
+/area/station/medical/storage)
 "ohL" = (
 /obj/effect/turf_decal/tile/yellow/opposingcorners,
 /obj/structure/cable,
@@ -56376,6 +56405,17 @@
 	dir = 8
 	},
 /area/station/hallway/secondary/exit/departure_lounge)
+"oMU" = (
+/obj/structure/rack,
+/obj/item/circuitboard/machine/biogenerator{
+	pixel_y = 6
+	},
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/servo,
+/obj/item/stack/cable_coil,
+/obj/item/stack/sheet/glass/fifty,
+/turf/open/floor/iron,
+/area/station/science/research/abandoned)
 "oMV" = (
 /obj/structure/cable,
 /obj/machinery/light/red/dim/directional/east,
@@ -57937,18 +57977,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/service/kitchen/abandoned)
-"pkI" = (
-/obj/structure/railing{
-	dir = 6
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 6
-	},
-/turf/open/misc/beach/coastline_b{
-	desc = "refreshing!";
-	name = "treated water"
-	},
-/area/station/maintenance/floor1/port/aft)
 "pkR" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -59538,20 +59566,6 @@
 /obj/effect/turf_decal/tile/green/opposingcorners,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
-"pHB" = (
-/obj/structure/table,
-/obj/item/stock_parts/micro_laser,
-/obj/item/stock_parts/servo{
-	pixel_x = 15;
-	pixel_y = 4
-	},
-/obj/item/reagent_containers/dropper{
-	pixel_x = -2;
-	pixel_y = 9
-	},
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
 "pHI" = (
 /obj/effect/landmark/blobstart,
 /obj/structure/railing,
@@ -65943,6 +65957,14 @@
 	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"rpF" = (
+/obj/structure/railing,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/turf/open/water/beach{
+	desc = "Refreshing!";
+	name = "treated water"
+	},
+/area/station/maintenance/floor1/port/aft)
 "rpR" = (
 /turf/open/floor/iron/dark/textured_edge,
 /area/station/maintenance/floor1/starboard/aft)
@@ -69265,11 +69287,6 @@
 /obj/machinery/duct,
 /turf/open/floor/iron/dark/side,
 /area/station/security/brig)
-"soU" = (
-/obj/machinery/smartfridge/chemistry/preloaded,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
 "soZ" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -70248,11 +70265,6 @@
 /obj/machinery/duct,
 /turf/open/floor/iron/dark/textured,
 /area/station/commons/fitness)
-"sBZ" = (
-/obj/machinery/smartfridge/organ,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/station/science/cytology)
 "sCe" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/structure/table/wood,
@@ -82783,6 +82795,18 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/catwalk_floor,
 /area/station/maintenance/floor1/port/fore)
+"vZn" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 4
+	},
+/turf/open/water/beach{
+	desc = "Refreshing!";
+	name = "treated water"
+	},
+/area/station/maintenance/floor1/port/aft)
 "vZq" = (
 /obj/structure/railing/corner{
 	dir = 8
@@ -86051,11 +86075,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
-"wOk" = (
-/obj/machinery/smartfridge/organ,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
-/area/station/medical/storage)
 "wOm" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/engine,
@@ -86920,18 +86939,6 @@
 /obj/structure/closet/emcloset,
 /turf/open/floor/iron,
 /area/station/hallway/floor3/fore)
-"wZY" = (
-/obj/structure/table,
-/obj/item/stock_parts/servo{
-	pixel_x = 2;
-	pixel_y = -4
-	},
-/obj/item/disk/tech_disk{
-	pixel_y = 8
-	},
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
 "xad" = (
 /obj/machinery/door/airlock/research{
 	name = "Research Director's Office"
@@ -87041,13 +87048,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/pod/dark,
 /area/station/maintenance/floor4/starboard)
-"xbz" = (
-/obj/machinery/light/red/dim/directional/north,
-/turf/open/misc/beach/coastline_b{
-	desc = "refreshing!";
-	name = "treated water"
-	},
-/area/station/maintenance/floor1/port/aft)
 "xbA" = (
 /obj/effect/turf_decal/trimline/green/filled/corner{
 	dir = 4
@@ -137349,8 +137349,8 @@ vFE
 khQ
 wss
 vcr
-iNe
-bCM
+bGf
+rpF
 cgx
 aSj
 nhU
@@ -137606,8 +137606,8 @@ xWv
 khQ
 qwj
 vcr
-xbz
-bCM
+aHX
+rpF
 grD
 aSj
 wor
@@ -137863,8 +137863,8 @@ bwL
 xzr
 wzB
 vcr
-cIW
-pkI
+vZn
+bkG
 kzn
 cPQ
 lnX
@@ -182300,7 +182300,7 @@ mhT
 jFr
 sif
 lvS
-pHB
+cSb
 mUJ
 jnV
 sif
@@ -182557,7 +182557,7 @@ jFJ
 fJo
 sif
 lvS
-wZY
+kUk
 aRK
 jnV
 sif
@@ -188205,7 +188205,7 @@ dTG
 xcZ
 sRY
 tZR
-jDl
+oMU
 nqo
 tbp
 tEN
@@ -191051,7 +191051,7 @@ ilg
 gmj
 unV
 fTN
-soU
+myF
 wPX
 neu
 dCp
@@ -193374,7 +193374,7 @@ svm
 xLp
 nBt
 jQj
-wOk
+nyx
 jVs
 bPo
 noN
@@ -193631,7 +193631,7 @@ fJU
 vrA
 rja
 sHX
-hBs
+ohF
 jVQ
 kmT
 kyq
@@ -250645,7 +250645,7 @@ uhr
 abx
 vuH
 qvb
-sBZ
+hKI
 elp
 qel
 gvW
@@ -252444,7 +252444,7 @@ nAj
 nAj
 rpY
 nPH
-mKI
+ckP
 nyc
 aXr
 nBg
diff --git a/_maps/shuttles/emergency_fish.dmm b/_maps/shuttles/emergency_fish.dmm
index 923ddcb0ebb..6f36b361a2e 100644
--- a/_maps/shuttles/emergency_fish.dmm
+++ b/_maps/shuttles/emergency_fish.dmm
@@ -38,7 +38,7 @@
 	dir = 8
 	},
 /obj/machinery/light/directional/south,
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 4
 	},
 /area/shuttle/escape)
@@ -79,7 +79,7 @@
 	desc = "An adorable stuffed toy that resembles a very determined seafaring lizardperson. To ten thousand leagues and below, little guy.";
 	name = "Drinks-The-Salt"
 	},
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/shuttle/escape)
 "eQ" = (
 /obj/structure/moisture_trap{
@@ -136,7 +136,7 @@
 	dir = 8
 	},
 /obj/item/fishing_rod,
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 4
 	},
 /area/shuttle/escape)
@@ -226,14 +226,14 @@
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "kX" = (
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/shuttle/escape)
 "lW" = (
 /turf/open/chasm,
 /area/shuttle/escape)
 "mD" = (
 /obj/item/toy/beach_ball/branded,
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/shuttle/escape)
 "nz" = (
 /obj/machinery/door/airlock/medical/glass,
@@ -335,8 +335,8 @@
 	pixel_y = 3
 	},
 /obj/item/fishing_hook{
-	pixel_y = 3;
-	layer = 5
+	layer = 5;
+	pixel_y = 3
 	},
 /obj/item/bait_can/worm{
 	pixel_x = -5;
@@ -397,7 +397,7 @@
 /area/shuttle/escape)
 "ut" = (
 /obj/machinery/light/directional/south,
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/shuttle/escape)
 "vH" = (
 /obj/structure/table/wood,
@@ -406,7 +406,7 @@
 "vV" = (
 /obj/machinery/light/directional/north,
 /obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/water/beach/biodome,
+/turf/open/water/beach,
 /area/shuttle/escape)
 "wq" = (
 /obj/machinery/light/directional/east,
@@ -618,8 +618,8 @@
 "IM" = (
 /obj/structure/table/wood,
 /obj/item/fishing_hook{
-	pixel_y = 3;
-	layer = 5
+	layer = 5;
+	pixel_y = 3
 	},
 /obj/item/fishing_line{
 	layer = 4;
@@ -646,8 +646,8 @@
 "Ju" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/fancy/donut_box{
-	pixel_y = 3;
-	pixel_x = -1
+	pixel_x = -1;
+	pixel_y = 3
 	},
 /obj/effect/turf_decal/tile/dark/opposingcorners,
 /turf/open/floor/mineral/plastitanium/red,
@@ -860,7 +860,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/turf/open/misc/beach/coastline_t{
+/turf/open/misc/beach/coast{
 	dir = 4
 	},
 /area/shuttle/escape)
diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm
index eeb25b19cca..9ee4bc54e12 100644
--- a/_maps/shuttles/emergency_luxury.dmm
+++ b/_maps/shuttles/emergency_luxury.dmm
@@ -9,7 +9,7 @@
 /turf/open/floor/iron,
 /area/shuttle/escape)
 "bJ" = (
-/turf/open/floor/holofloor/beach/coast_t{
+/turf/open/floor/holofloor/beach{
 	dir = 4
 	},
 /area/shuttle/escape/luxury)
@@ -104,8 +104,8 @@
 /area/shuttle/escape)
 "gG" = (
 /obj/machinery/door/poddoor/shutters/indestructible/preopen{
-	id = "gimmemoney";
-	dir = 4
+	dir = 4;
+	id = "gimmemoney"
 	},
 /turf/closed/indestructible/opsglass{
 	desc = "A durable looking window made of an alloy of of plasma and titanium.";
@@ -569,9 +569,9 @@
 /area/shuttle/escape)
 "yB" = (
 /obj/structure/chair/stool/bar{
-	name = "buckleable bar stool";
 	can_buckle = 1;
-	dir = 1
+	dir = 1;
+	name = "buckleable bar stool"
 	},
 /turf/open/floor/carpet/blue,
 /area/shuttle/escape/luxury)
@@ -608,9 +608,9 @@
 /area/shuttle/escape/luxury)
 "zM" = (
 /obj/structure/chair/stool/bar{
-	name = "buckleable bar stool";
 	can_buckle = 1;
-	dir = 8
+	dir = 8;
+	name = "buckleable bar stool"
 	},
 /turf/open/floor/carpet/blue,
 /area/shuttle/escape/luxury)
@@ -768,7 +768,9 @@
 /area/shuttle/escape/luxury)
 "FC" = (
 /obj/machinery/light/directional/north,
-/turf/open/floor/holofloor/beach/water,
+/turf/open/floor/holofloor/beach/coast{
+	dir = 4
+	},
 /area/shuttle/escape/luxury)
 "FD" = (
 /obj/item/food/cherrycupcake{
@@ -897,7 +899,9 @@
 /area/shuttle/escape/luxury)
 "Lc" = (
 /obj/machinery/light/directional/south,
-/turf/open/floor/holofloor/beach/water,
+/turf/open/floor/holofloor/beach/coast{
+	dir = 4
+	},
 /area/shuttle/escape/luxury)
 "Li" = (
 /obj/structure/window/spawner/directional/north,
@@ -963,6 +967,11 @@
 /obj/structure/table/wood/fancy/black,
 /turf/open/floor/carpet/red,
 /area/shuttle/escape/luxury)
+"Om" = (
+/turf/open/floor/holofloor/beach/coast{
+	dir = 4
+	},
+/area/shuttle/escape/luxury)
 "Ow" = (
 /obj/effect/decal/cleanable/oil/slippery,
 /obj/structure/door_assembly,
@@ -1789,8 +1798,8 @@ WF
 vL
 Ex
 FC
-YV
-YV
+Om
+Om
 Lc
 Ex
 Ex
diff --git a/_maps/templates/holodeck_beach.dmm b/_maps/templates/holodeck_beach.dmm
index 6a87546c881..1f933e5925c 100644
--- a/_maps/templates/holodeck_beach.dmm
+++ b/_maps/templates/holodeck_beach.dmm
@@ -1,10 +1,10 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/open/floor/holofloor/beach/water,
+/turf/open/floor/holofloor/beach/coast,
 /area/template_noop)
 "f" = (
 /obj/item/shovel/spade,
-/turf/open/floor/holofloor/beach/coast_t,
+/turf/open/floor/holofloor/beach,
 /area/template_noop)
 "g" = (
 /obj/item/toy/beach_ball,
@@ -15,12 +15,9 @@
 /obj/item/clothing/glasses/sunglasses,
 /turf/open/floor/holofloor/beach,
 /area/template_noop)
-"k" = (
-/turf/open/floor/holofloor/beach/coast_b,
-/area/template_noop)
 "q" = (
 /obj/item/reagent_containers/cup/bucket,
-/turf/open/floor/holofloor/beach/coast_t,
+/turf/open/floor/holofloor/beach,
 /area/template_noop)
 "t" = (
 /turf/open/floor/holofloor/carpet,
@@ -29,16 +26,13 @@
 /obj/effect/holodeck_effect/mobspawner/monkey,
 /turf/open/floor/holofloor/beach,
 /area/template_noop)
-"J" = (
-/turf/open/floor/holofloor/beach/coast_t,
-/area/template_noop)
 "M" = (
 /obj/item/toy/seashell,
 /turf/open/floor/holofloor/beach,
 /area/template_noop)
 "Q" = (
 /obj/effect/holodeck_effect/mobspawner/crab/jon,
-/turf/open/floor/holofloor/beach/coast_t,
+/turf/open/floor/holofloor/beach,
 /area/template_noop)
 "R" = (
 /turf/open/floor/holofloor/beach,
@@ -69,8 +63,8 @@ R
 R
 R
 R
-J
-k
+R
+R
 a
 "}
 (2,1,1) = {"
@@ -82,7 +76,7 @@ R
 S
 R
 Q
-k
+R
 a
 "}
 (3,1,1) = {"
@@ -93,8 +87,8 @@ R
 R
 t
 t
-J
-k
+R
+R
 a
 "}
 (4,1,1) = {"
@@ -105,8 +99,8 @@ R
 h
 R
 R
-J
-k
+R
+R
 a
 "}
 (5,1,1) = {"
@@ -117,8 +111,8 @@ R
 R
 t
 t
-J
-k
+R
+R
 a
 "}
 (6,1,1) = {"
@@ -130,7 +124,7 @@ X
 g
 R
 q
-k
+R
 a
 "}
 (7,1,1) = {"
@@ -142,7 +136,7 @@ R
 R
 R
 f
-k
+R
 a
 "}
 (8,1,1) = {"
@@ -153,8 +147,8 @@ R
 H
 R
 M
-J
-k
+R
+R
 a
 "}
 (9,1,1) = {"
@@ -165,7 +159,7 @@ R
 R
 R
 R
-J
-k
+R
+R
 a
 "}
diff --git a/code/game/turfs/open/sand.dm b/code/game/turfs/open/sand.dm
index 8835cbdb03c..c821b9d4516 100644
--- a/code/game/turfs/open/sand.dm
+++ b/code/game/turfs/open/sand.dm
@@ -1,7 +1,7 @@
 /turf/open/misc/beach
 	name = "beach"
 	desc = "Sandy."
-	icon = 'icons/misc/beach.dmi'
+	icon = 'icons/turf/sand.dmi'
 	flags_1 = NONE
 	bullet_bounce_sound = null
 	footstep = FOOTSTEP_SAND
@@ -20,33 +20,33 @@
 	base_icon_state = "sand"
 	baseturfs = /turf/open/misc/beach/sand
 
-/turf/open/misc/beach/coastline_t
+/turf/open/misc/beach/sand/Initialize(mapload)
+	. = ..()
+	if(prob(15))
+		icon_state = "sand[rand(1,4)]"
+
+/turf/open/misc/beach/coast
 	name = "coastline"
 	desc = "Tide's high tonight. Charge your batons."
-	icon_state = "sandwater_t"
-	base_icon_state = "sandwater_t"
-	baseturfs = /turf/open/misc/beach/coastline_t
+	icon = 'icons/turf/beach.dmi'
+	icon_state = "beach"
+	base_icon_state = "beach"
+	footstep = FOOTSTEP_WATER
+	barefootstep = FOOTSTEP_WATER
+	clawfootstep = FOOTSTEP_WATER
+	heavyfootstep = FOOTSTEP_WATER
 
-/turf/open/misc/beach/sand/coastline_t/break_tile()
+/turf/open/misc/beach/coast/break_tile()
 	. = ..()
-	icon_state = "sandwater_t"
+	icon_state = "beach"
 
-/turf/open/misc/beach/coastline_t/sandwater_inner
-	icon_state = "sandwater_inner"
+/turf/open/misc/beach/coast/corner
+	icon_state = "beach-corner"
+	base_icon_state = "beach-corner"
 
-/turf/open/misc/beach/coastline_b //need to make this water subtype.
-	name = "coastline"
-	icon_state = "sandwater_b"
-	base_icon_state = "sandwater_b"
-	baseturfs = /turf/open/misc/beach/coastline_b
-	footstep = FOOTSTEP_LAVA
-	barefootstep = FOOTSTEP_LAVA
-	clawfootstep = FOOTSTEP_LAVA
-	heavyfootstep = FOOTSTEP_LAVA
-
-/turf/open/misc/beach/sand/coastline_b/break_tile()
+/turf/open/misc/beach/coast/corner/break_tile()
 	. = ..()
-	icon_state = "sandwater_b"
+	icon_state = "beach-corner"
 
 /turf/open/misc/sandy_dirt
 	gender = PLURAL
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index 465645eabee..3f953174b7a 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -4,27 +4,23 @@
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "riverwater_motion"
 	baseturfs = /turf/open/chasm/lavaland
-	initial_gas_mix = OPENTURF_LOW_PRESSURE
 	planetary_atmos = TRUE
 	slowdown = 1
 	bullet_sizzle = TRUE
 	bullet_bounce_sound = null //needs a splashing sound one day.
 	turf_flags = NO_RUST
-
 	footstep = FOOTSTEP_WATER
 	barefootstep = FOOTSTEP_WATER
 	clawfootstep = FOOTSTEP_WATER
 	heavyfootstep = FOOTSTEP_WATER
 
 /turf/open/water/jungle
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
 
-//This version of the beach turf uses low pressure, inherieted from above
 /turf/open/water/beach
 	planetary_atmos = FALSE
 	gender = PLURAL
 	desc = "You get the feeling that nobody's bothered to actually make this water functional..."
-	icon = 'icons/misc/beach.dmi'
+	icon = 'icons/turf/beach.dmi'
 	icon_state = "water"
 	base_icon_state = "water"
 	baseturfs = /turf/open/water/beach
@@ -32,7 +28,3 @@
 /turf/open/water/beach/Initialize(mapload)
 	. = ..()
 	AddElement(/datum/element/lazy_fishing_spot, FISHING_SPOT_PRESET_BEACH)
-
-//Same turf, but instead used in the Beach Biodome
-/turf/open/water/beach/biodome
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 4a545c8b323..5f521bcb3dd 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -70,24 +70,24 @@
 	gender = PLURAL
 	name = "sand"
 	desc = "This is better than a vacation, since you're still getting paid."
-	icon = 'icons/misc/beach.dmi'
+	icon = 'icons/turf/sand.dmi'
 	icon_state = "sand"
 	bullet_bounce_sound = null
 	tiled_dirt = FALSE
 
-/turf/open/floor/holofloor/beach/coast_t
+/turf/open/floor/holofloor/beach/coast
 	gender = NEUTER
 	name = "coastline"
-	icon_state = "sandwater_t"
+	icon = 'icons/turf/beach.dmi'
+	icon_state = "beach"
 
-/turf/open/floor/holofloor/beach/coast_b
-	gender = NEUTER
-	name = "coastline"
-	icon_state = "sandwater_b"
+/turf/open/floor/holofloor/beach/coast/corner
+	icon_state = "beach-corner"
 
 /turf/open/floor/holofloor/beach/water
 	name = "water"
 	desc = "Gives the impression you can walk on water. Chaplains love it."
+	icon = 'icons/turf/beach.dmi'
 	icon_state = "water"
 	bullet_sizzle = TRUE
 
diff --git a/icons/misc/beach.dmi b/icons/misc/beach.dmi
index 1d189263150..8ff4ffea1a4 100644
Binary files a/icons/misc/beach.dmi and b/icons/misc/beach.dmi differ
diff --git a/icons/turf/beach.dmi b/icons/turf/beach.dmi
new file mode 100644
index 00000000000..aeb18a4fe61
Binary files /dev/null and b/icons/turf/beach.dmi differ
diff --git a/icons/turf/sand.dmi b/icons/turf/sand.dmi
new file mode 100644
index 00000000000..5c0b8eb84cb
Binary files /dev/null and b/icons/turf/sand.dmi differ
diff --git a/sound/effects/water1.ogg b/sound/effects/water1.ogg
new file mode 100644
index 00000000000..1fb82a70ecc
Binary files /dev/null and b/sound/effects/water1.ogg differ
diff --git a/sound/effects/water2.ogg b/sound/effects/water2.ogg
new file mode 100644
index 00000000000..df9ba85a58e
Binary files /dev/null and b/sound/effects/water2.ogg differ
diff --git a/sound/effects/water3.ogg b/sound/effects/water3.ogg
new file mode 100644
index 00000000000..605ae01db05
Binary files /dev/null and b/sound/effects/water3.ogg differ
diff --git a/sound/effects/water4.ogg b/sound/effects/water4.ogg
new file mode 100644
index 00000000000..66f6f329669
Binary files /dev/null and b/sound/effects/water4.ogg differ
diff --git a/tools/UpdatePaths/Scripts/75254_beach_coast.txt b/tools/UpdatePaths/Scripts/75254_beach_coast.txt
new file mode 100644
index 00000000000..f685627145f
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/75254_beach_coast.txt
@@ -0,0 +1,11 @@
+# These aren't going to be a perfect 1:1, adjust your maps accordingly
+
+/turf/open/water/beach/biodome : /turf/open/water/beach{@OLD}
+
+/turf/open/misc/beach/coastline_b : /turf/open/misc/beach/coast{@OLD}
+/turf/open/misc/beach/coastline_t : /turf/open/misc/beach/sand{@OLD}
+
+/turf/open/misc/beach/coastline_t/sandwater_inner : /turf/open/misc/beach/coast/corner{@OLD}
+
+/turf/open/floor/holofloor/beach/coast_t : /turf/open/floor/holofloor/beach/coast{@OLD}
+/turf/open/floor/holofloor/beach/coast_b : /turf/open/floor/holofloor/beach/water{@OLD}