diff --git a/_maps/map_files/Vampire/generic/forest.dmm b/_maps/map_files/Vampire/generic/forest.dmm
index 7d8b218a7bdc..ccf83d1b0699 100644
--- a/_maps/map_files/Vampire/generic/forest.dmm
+++ b/_maps/map_files/Vampire/generic/forest.dmm
@@ -272,7 +272,7 @@
 /obj/effect/turf_decal/darkpack/rough{
 	dir = 9
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "cj" = (
 /obj/effect/turf_decal/darkpack/sand/corner,
@@ -395,6 +395,12 @@
 "cS" = (
 /turf/closed/wall/vampwall/wood,
 /area/vtm/interior/forest/cabin)
+"cZ" = (
+/obj/effect/turf_decal/darkpack/cave{
+	dir = 6
+	},
+/turf/open/water/river/deep,
+/area/vtm/outside/forest)
 "db" = (
 /obj/effect/decal/kopatich,
 /turf/open/floor/wood/smooth/old,
@@ -630,6 +636,20 @@
 	},
 /turf/open/misc/grass/random/grass,
 /area/vtm/outside/forest)
+"fg" = (
+/obj/structure/table/countertop/bubway,
+/obj/machinery/chem_dispenser/drinks{
+	dir = 4
+	},
+/obj/effect/turf_decal/darkpack/sand{
+	dir = 9
+	},
+/obj/machinery/vending/cola{
+	pixel_y = 20;
+	density = 0
+	},
+/turf/open/floor/plating/concrete,
+/area/vtm/interior/forest)
 "fm" = (
 /obj/item/food/grown/moonflower,
 /obj/effect/turf_decal/darkpack/dirt{
@@ -860,11 +880,6 @@
 /obj/effect/landmark/start/darkpack/forest_wolves/guardian,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/outside/forest/sept)
-"hB" = (
-/obj/structure/bonfire/fire_barrel,
-/obj/effect/realistic_fog/dense,
-/turf/open/floor/plating/rough/cave,
-/area/vtm/interior/forest/cave)
 "hD" = (
 /obj/structure/flora/rock/darkpack_big,
 /turf/open/misc/dirt,
@@ -941,7 +956,7 @@
 /obj/effect/turf_decal/darkpack/rough{
 	dir = 4
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "ix" = (
 /obj/structure/fireplace,
@@ -968,7 +983,7 @@
 "iD" = (
 /obj/effect/turf_decal/darkpack/cave/corner,
 /obj/effect/turf_decal/darkpack/cave,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "iG" = (
 /obj/structure/glowshroom/single,
@@ -1070,7 +1085,7 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 9
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "jH" = (
 /obj/effect/decal/pallet,
@@ -1092,7 +1107,7 @@
 /obj/effect/turf_decal/darkpack/rough/corner{
 	dir = 8
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "jS" = (
 /obj/effect/gibspawner/human/bodypartless,
@@ -1261,7 +1276,7 @@
 /obj/effect/turf_decal/darkpack/rough{
 	dir = 8
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "lD" = (
 /obj/effect/turf_decal/siding{
@@ -1368,7 +1383,7 @@
 	dir = 8
 	},
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "mD" = (
 /obj/effect/realistic_fog/dense,
@@ -1376,7 +1391,7 @@
 /area/vtm/outside/forest/sept)
 "mN" = (
 /obj/effect/turf_decal/darkpack/rough,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "mO" = (
 /obj/structure/vampdoor,
@@ -1707,7 +1722,7 @@
 /obj/effect/turf_decal/darkpack/cave/corner{
 	dir = 4
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "pC" = (
 /obj/effect/turf_decal/darkpack/dirt{
@@ -1757,9 +1772,6 @@
 /obj/structure/flora/tree/vamp/pine,
 /turf/open/misc/grass/random,
 /area/vtm/outside/forest)
-"pX" = (
-/turf/open/water/beach/vamp/deep,
-/area/vtm/outside/forest)
 "qb" = (
 /obj/effect/turf_decal/darkpack/rough{
 	dir = 10
@@ -1869,7 +1881,7 @@
 	dir = 1
 	},
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "qY" = (
 /obj/effect/turf_decal/darkpack/sand/corner,
@@ -1921,6 +1933,11 @@
 	},
 /turf/open/misc/grass/random/grass,
 /area/vtm/outside/forest/sept)
+"rf" = (
+/obj/structure/bonfire/fire_barrel,
+/obj/effect/realistic_fog/dense,
+/turf/open/floor/plating/rough/cave,
+/area/vtm/interior/forest/cave)
 "rg" = (
 /obj/effect/turf_decal/darkpack/dirt/corner{
 	dir = 8
@@ -1932,7 +1949,7 @@
 	dir = 4
 	},
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "rp" = (
 /obj/effect/turf_decal/darkpack/dirt{
@@ -1991,7 +2008,7 @@
 /obj/effect/turf_decal/darkpack/rough/corner{
 	dir = 4
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "rU" = (
 /obj/effect/turf_decal/darkpack/grass{
@@ -2222,7 +2239,7 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 8
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "tI" = (
 /obj/effect/turf_decal/darkpack/cave/corner{
@@ -2231,7 +2248,7 @@
 /obj/effect/turf_decal/darkpack/cave/corner{
 	dir = 1
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "tL" = (
 /obj/effect/turf_decal/darkpack/dirt{
@@ -2350,7 +2367,7 @@
 "ux" = (
 /obj/effect/turf_decal/darkpack/cave/corner,
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "uC" = (
 /obj/structure/chair/sofa/left/brown{
@@ -2423,7 +2440,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/darkpack/cave,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "vd" = (
 /obj/effect/turf_decal/darkpack/sand/corner{
@@ -2478,7 +2495,7 @@
 /obj/effect/turf_decal/darkpack/cave/corner{
 	dir = 1
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "vP" = (
 /obj/effect/turf_decal/darkpack/cave{
@@ -2778,7 +2795,7 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 10
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "yk" = (
 /obj/item/flashlight/lantern{
@@ -2851,7 +2868,7 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 1
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "zc" = (
 /turf/open/floor/plating/rough/cave,
@@ -2869,7 +2886,7 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 5
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "zh" = (
 /obj/effect/turf_decal/darkpack/grass{
@@ -3006,16 +3023,6 @@
 	},
 /turf/open/misc/beach/vamp,
 /area/vtm/outside/forest)
-"Aw" = (
-/obj/structure/table/countertop/bubway,
-/obj/machinery/chem_dispenser/drinks{
-	dir = 4
-	},
-/obj/effect/turf_decal/darkpack/sand{
-	dir = 9
-	},
-/turf/open/floor/plating/concrete,
-/area/vtm/interior/forest)
 "AB" = (
 /mob/living/basic/pet/dog/wolf/kinfolk,
 /turf/open/misc/grass/random/grass,
@@ -3101,7 +3108,7 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 8
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Bt" = (
 /obj/structure/table/wood,
@@ -3117,7 +3124,7 @@
 /area/vtm/outside/forest)
 "Bx" = (
 /obj/effect/turf_decal/darkpack/cave,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "BC" = (
 /obj/effect/turf_decal/darkpack/dirt{
@@ -3247,7 +3254,7 @@
 	dir = 1
 	},
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Cq" = (
 /obj/structure/vampdoor/wood{
@@ -3333,7 +3340,7 @@
 /obj/effect/turf_decal/darkpack/rough{
 	dir = 5
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "CS" = (
 /obj/effect/decal/coastline/corner{
@@ -3344,6 +3351,9 @@
 	},
 /turf/open/misc/beach/vamp,
 /area/vtm/outside/forest)
+"CT" = (
+/turf/open/water/river/deep,
+/area/vtm/outside/forest)
 "CU" = (
 /obj/structure/glowshroom/glowcap,
 /turf/open/misc/grass,
@@ -3364,7 +3374,7 @@
 /obj/effect/turf_decal/darkpack/cave,
 /obj/effect/turf_decal/darkpack/rough/corner,
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Db" = (
 /obj/effect/turf_decal/darkpack/dirt{
@@ -3440,7 +3450,7 @@
 	base_icon_state = "ocean";
 	alpha = 1
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/outside/forest/sept)
 "DU" = (
 /obj/structure/glowshroom,
@@ -3570,7 +3580,7 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 4
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Fi" = (
 /obj/effect/turf_decal/darkpack/grass/corner{
@@ -3580,7 +3590,7 @@
 /area/vtm/planetgeneration)
 "Fk" = (
 /obj/effect/turf_decal/darkpack/rough/corner,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Fu" = (
 /obj/transfer_point_vamp/forest/north/four,
@@ -3590,7 +3600,7 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 6
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "FD" = (
 /obj/item/bouquet/poppy{
@@ -3604,7 +3614,7 @@
 /turf/open/misc/grass,
 /area/vtm/outside/forest)
 "FK" = (
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "FN" = (
 /obj/effect/turf_decal/darkpack/cave/corner{
@@ -3754,7 +3764,7 @@
 /obj/effect/turf_decal/darkpack/cave/corner{
 	dir = 8
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Ho" = (
 /obj/effect/turf_decal/darkpack/dirt{
@@ -3768,7 +3778,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/darkpack/cave/corner,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Hq" = (
 /turf/open/floor/iron/stairs/black{
@@ -3786,7 +3796,7 @@
 	dir = 10
 	},
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Hz" = (
 /obj/structure/bed/dogbed,
@@ -3800,7 +3810,7 @@
 /obj/effect/turf_decal/darkpack/rough/corner{
 	dir = 1
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "HD" = (
 /obj/structure/flora/rock/darkpack,
@@ -3810,7 +3820,7 @@
 /obj/effect/turf_decal/darkpack/rough{
 	dir = 6
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "HI" = (
 /obj/effect/turf_decal/darkpack/grass/corner,
@@ -3959,12 +3969,6 @@
 	},
 /turf/open/misc/beach/vamp,
 /area/vtm/outside/forest/sept)
-"IN" = (
-/obj/effect/turf_decal/darkpack/cave{
-	dir = 6
-	},
-/turf/open/water/beach/vamp/deep,
-/area/vtm/outside/forest)
 "IO" = (
 /obj/effect/decal/remains/human,
 /turf/open/floor/plating/rough/cave,
@@ -4060,7 +4064,7 @@
 /obj/effect/turf_decal/darkpack/rough{
 	dir = 1
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "JX" = (
 /obj/effect/turf_decal/darkpack/grass/corner{
@@ -4138,12 +4142,6 @@
 /obj/structure/flora/rock/pile/darkpack,
 /turf/open/misc/dirt,
 /area/vtm/outside/forest)
-"KC" = (
-/obj/effect/turf_decal/darkpack/cave/corner{
-	dir = 4
-	},
-/turf/open/water/beach/vamp/deep,
-/area/vtm/outside/forest)
 "KD" = (
 /obj/effect/turf_decal/darkpack/dirt/corner,
 /obj/structure/bonfire/torch,
@@ -4215,7 +4213,7 @@
 	},
 /obj/effect/turf_decal/darkpack/cave/corner,
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "LA" = (
 /obj/effect/decal/pallet,
@@ -4511,6 +4509,12 @@
 	},
 /turf/open/misc/dirt,
 /area/vtm/outside/forest/sept)
+"Oa" = (
+/obj/effect/turf_decal/darkpack/cave/corner{
+	dir = 4
+	},
+/turf/open/water/river/deep,
+/area/vtm/outside/forest)
 "Od" = (
 /obj/effect/turf_decal/darkpack/dirt{
 	dir = 9
@@ -4531,7 +4535,7 @@
 /area/vtm/outside/forest/sept)
 "Oj" = (
 /obj/effect/turf_decal/darkpack/cave/corner,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Ok" = (
 /obj/effect/turf_decal/darkpack/grass/corner{
@@ -4593,7 +4597,7 @@
 /turf/open/misc/beach/vamp,
 /area/vtm/outside/forest)
 "OQ" = (
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/outside/forest)
 "OR" = (
 /obj/effect/turf_decal/darkpack/dirt{
@@ -4720,7 +4724,7 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 8
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "PW" = (
 /obj/effect/spawner/random/trash/garbage,
@@ -4885,7 +4889,7 @@
 /obj/effect/turf_decal/darkpack/rough{
 	dir = 10
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Ru" = (
 /obj/effect/turf_decal/darkpack/dirt{
@@ -4923,7 +4927,7 @@
 	},
 /obj/effect/turf_decal/darkpack/rough/corner,
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "RJ" = (
 /obj/structure/glowshroom,
@@ -4971,7 +4975,7 @@
 /obj/effect/turf_decal/darkpack/rough/corner{
 	dir = 1
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Sc" = (
 /obj/structure/flora/bush/flowers_yw/style_random,
@@ -5022,7 +5026,7 @@
 	dir = 5
 	},
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Sz" = (
 /obj/structure/bonfire/prelit{
@@ -5185,6 +5189,12 @@
 	},
 /turf/open/genturf,
 /area/vtm/planetgeneration)
+"TT" = (
+/obj/effect/turf_decal/darkpack/cave{
+	dir = 4
+	},
+/turf/open/water/river/deep,
+/area/vtm/outside/forest)
 "TW" = (
 /obj/effect/decal/remains/human,
 /turf/open/misc/beach/vamp,
@@ -5410,7 +5420,7 @@
 	dir = 8
 	},
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Wc" = (
 /obj/structure/chair/stool/bar/darkpack/red,
@@ -5420,7 +5430,7 @@
 /obj/effect/turf_decal/darkpack/cave/corner{
 	dir = 4
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Wf" = (
 /obj/effect/realistic_fog/dense,
@@ -5455,7 +5465,7 @@
 /obj/effect/turf_decal/darkpack/rough/corner{
 	dir = 8
 	},
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "Wu" = (
 /obj/structure/table/wood,
@@ -5478,12 +5488,6 @@
 	},
 /turf/open/misc/grass/random/grass,
 /area/vtm/outside/forest/sept)
-"WI" = (
-/obj/effect/turf_decal/darkpack/cave{
-	dir = 4
-	},
-/turf/open/water/beach/vamp/deep,
-/area/vtm/outside/forest)
 "WK" = (
 /mob/living/basic/cockroach/apoc,
 /turf/open/floor/plating/rough/cave,
@@ -5586,7 +5590,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/darkpack/cave,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "XX" = (
 /obj/effect/turf_decal/darkpack/grass{
@@ -5821,7 +5825,7 @@
 /area/vtm/outside/forest)
 "ZF" = (
 /obj/effect/realistic_fog/dense,
-/turf/open/water/beach/vamp,
+/turf/open/water/river,
 /area/vtm/interior/forest/cave)
 "ZG" = (
 /obj/effect/turf_decal/darkpack/dirt{
@@ -6413,15 +6417,15 @@ sm
 Vj
 EH
 EH
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 Vj
 sm
@@ -6610,16 +6614,16 @@ Vj
 Vj
 Vj
 EH
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 Vj
 sm
@@ -6808,16 +6812,16 @@ Vj
 Vj
 EH
 EH
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 Vj
 sm
@@ -7006,16 +7010,16 @@ EH
 EH
 EH
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 Vj
 sm
@@ -7204,15 +7208,15 @@ us
 us
 EH
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 Vj
@@ -7402,15 +7406,15 @@ us
 WC
 gG
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 Vj
 Vj
@@ -7600,14 +7604,14 @@ WC
 gG
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 Vj
@@ -7797,10 +7801,10 @@ WC
 gG
 OQ
 OQ
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
 OQ
 OQ
 OQ
@@ -7994,10 +7998,10 @@ us
 by
 OQ
 OQ
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
 OQ
 OQ
 tD
@@ -8191,11 +8195,11 @@ hs
 WC
 gG
 OQ
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
 OQ
 tD
 Lt
@@ -8389,11 +8393,11 @@ us
 by
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
 OQ
 OF
 us
@@ -8586,11 +8590,11 @@ us
 WC
 gG
 OQ
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
 OQ
 OQ
 OF
@@ -8784,11 +8788,11 @@ us
 by
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
 OQ
 tD
 Lt
@@ -8981,11 +8985,11 @@ us
 us
 by
 OQ
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
 OQ
 OQ
 OF
@@ -9179,11 +9183,11 @@ us
 WC
 gG
 OQ
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
 OQ
 tD
 Lt
@@ -9377,10 +9381,10 @@ us
 by
 OQ
 OQ
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
 OQ
 OQ
 OF
@@ -9574,11 +9578,11 @@ us
 us
 by
 OQ
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
 OQ
 tD
 Lt
@@ -9772,10 +9776,10 @@ us
 WC
 gG
 OQ
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
 OQ
 OQ
 OF
@@ -9970,9 +9974,9 @@ us
 by
 OQ
 OQ
-pX
-pX
-pX
+CT
+CT
+CT
 OQ
 OQ
 tD
@@ -10167,10 +10171,10 @@ us
 us
 by
 OQ
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
 OQ
 tD
 Lt
@@ -10365,10 +10369,10 @@ us
 WC
 gG
 OQ
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
 OQ
 OF
 us
@@ -10563,9 +10567,9 @@ us
 by
 OQ
 OQ
-pX
-pX
-pX
+CT
+CT
+CT
 OQ
 tD
 Lt
@@ -10760,9 +10764,9 @@ bJ
 us
 by
 OQ
-pX
-pX
-pX
+CT
+CT
+CT
 OQ
 OQ
 OF
@@ -10958,9 +10962,9 @@ bJ
 us
 by
 OQ
-pX
-pX
-pX
+CT
+CT
+CT
 OQ
 tD
 Lt
@@ -11156,8 +11160,8 @@ IV
 us
 by
 OQ
-pX
-pX
+CT
+CT
 OQ
 OQ
 OF
@@ -11354,8 +11358,8 @@ us
 hs
 by
 OQ
-pX
-pX
+CT
+CT
 OQ
 tD
 Lt
@@ -11552,14 +11556,14 @@ us
 WC
 gG
 OQ
-pX
-pX
+CT
+CT
 OQ
 OF
 us
 us
 us
-Aw
+fg
 xR
 SK
 SK
@@ -11750,8 +11754,8 @@ us
 by
 OQ
 OQ
-pX
-pX
+CT
+CT
 OQ
 OF
 sJ
@@ -11947,9 +11951,9 @@ bJ
 us
 by
 OQ
-pX
-pX
-pX
+CT
+CT
+CT
 OQ
 OF
 ex
@@ -12146,8 +12150,8 @@ us
 by
 OQ
 OQ
-pX
-pX
+CT
+CT
 OQ
 OF
 sJ
@@ -12344,8 +12348,8 @@ us
 hw
 ph
 OQ
-pX
-pX
+CT
+CT
 OQ
 OF
 us
@@ -12542,8 +12546,8 @@ us
 us
 by
 OQ
-pX
-pX
+CT
+CT
 OQ
 OF
 us
@@ -12740,8 +12744,8 @@ Mj
 us
 by
 OQ
-pX
-pX
+CT
+CT
 OQ
 OF
 us
@@ -12938,8 +12942,8 @@ bJ
 us
 by
 OQ
-pX
-pX
+CT
+CT
 OQ
 nF
 zQ
@@ -13137,7 +13141,7 @@ us
 by
 OQ
 OQ
-pX
+CT
 OQ
 OQ
 OF
@@ -13335,8 +13339,8 @@ us
 hw
 ph
 OQ
-pX
-pX
+CT
+CT
 OQ
 OF
 us
@@ -13533,8 +13537,8 @@ us
 hs
 by
 OQ
-pX
-pX
+CT
+CT
 OQ
 nF
 zQ
@@ -13732,7 +13736,7 @@ us
 by
 OQ
 OQ
-pX
+CT
 OQ
 OQ
 OF
@@ -13930,8 +13934,8 @@ us
 hw
 ph
 OQ
-pX
-pX
+CT
+CT
 OQ
 OF
 us
@@ -14129,7 +14133,7 @@ FP
 by
 OQ
 OQ
-pX
+CT
 OQ
 OF
 us
@@ -14326,9 +14330,9 @@ je
 OO
 Uz
 Qy
-pX
-pX
-pX
+CT
+CT
+CT
 tu
 Ar
 ZG
@@ -14544,8 +14548,8 @@ OQ
 OQ
 OQ
 OQ
-pX
-pX
+CT
+CT
 OQ
 OQ
 OQ
@@ -14739,14 +14743,14 @@ gG
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 Hd
 dL
 oV
@@ -14936,15 +14940,15 @@ OQ
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 Hd
 Nr
 Nr
@@ -15118,9 +15122,9 @@ xG
 je
 LC
 ld
-pX
-pX
-pX
+CT
+CT
+CT
 wb
 Sn
 Ns
@@ -15134,14 +15138,14 @@ OQ
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 Hd
 Hd
 WK
@@ -15318,7 +15322,7 @@ Cl
 by
 OQ
 OQ
-pX
+CT
 OQ
 OF
 hs
@@ -15330,16 +15334,16 @@ OQ
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 Hd
 hl
 Nr
@@ -15516,7 +15520,7 @@ Cl
 hw
 ph
 OQ
-pX
+CT
 OQ
 OF
 us
@@ -15526,18 +15530,18 @@ OQ
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 Hd
 Nr
 Nr
@@ -15714,7 +15718,7 @@ OO
 FP
 by
 OQ
-pX
+CT
 OQ
 nF
 zQ
@@ -15723,19 +15727,19 @@ gG
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 Hd
 hl
 Nr
@@ -15912,7 +15916,7 @@ je
 Cl
 by
 OQ
-pX
+CT
 OQ
 OQ
 nF
@@ -15920,20 +15924,20 @@ gG
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 Hd
 Nr
 Nr
@@ -16110,7 +16114,7 @@ lt
 Cl
 by
 OQ
-pX
+CT
 OQ
 OQ
 OQ
@@ -16118,20 +16122,20 @@ OQ
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 Hd
 Nr
 Nr
@@ -16308,27 +16312,27 @@ lt
 NQ
 by
 OQ
-pX
+CT
 OQ
 OQ
 OQ
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 Hd
 Hd
 hl
@@ -16506,26 +16510,26 @@ je
 NQ
 by
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-KC
-WI
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+Oa
+TT
 Hd
 Hd
 bR
@@ -16705,24 +16709,24 @@ Cl
 by
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-KC
-IN
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+Oa
+cZ
 Nr
 TH
 Nr
@@ -16903,23 +16907,23 @@ Ho
 by
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-KC
-IN
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+Oa
+cZ
 Nr
 Nr
 Nr
@@ -17101,26 +17105,26 @@ mT
 by
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 Hd
 aX
 lT
 Nr
-hB
+rf
 Nr
 CJ
 Nr
@@ -17299,17 +17303,17 @@ WC
 gG
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 EH
@@ -17497,13 +17501,13 @@ by
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 EH
@@ -17675,8 +17679,8 @@ HI
 by
 OQ
 OQ
-pX
-pX
+CT
+CT
 OQ
 OQ
 OQ
@@ -17695,10 +17699,10 @@ gG
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
 EH
 EH
 EH
@@ -17873,13 +17877,13 @@ WC
 yw
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 OQ
 OQ
 nF
@@ -17892,10 +17896,10 @@ gG
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
 EH
 EH
 Vj
@@ -18071,14 +18075,14 @@ by
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 OQ
 OQ
 OQ
@@ -18089,9 +18093,9 @@ OQ
 OQ
 OQ
 OQ
-pX
-pX
-pX
+CT
+CT
+CT
 EH
 EH
 EH
@@ -18270,14 +18274,14 @@ ph
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 OQ
 OQ
 OQ
@@ -18286,9 +18290,9 @@ OQ
 OQ
 OQ
 OQ
-pX
-pX
-pX
+CT
+CT
+CT
 EH
 EH
 Vj
@@ -18468,23 +18472,23 @@ hw
 ph
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 EH
@@ -18667,21 +18671,21 @@ hw
 ph
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 Vj
@@ -18866,18 +18870,18 @@ hw
 ph
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 EH
@@ -19064,16 +19068,16 @@ us
 hw
 ph
 OQ
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 EH
@@ -19265,11 +19269,11 @@ OQ
 OQ
 OQ
 OQ
-pX
-pX
-pX
-pX
-pX
+CT
+CT
+CT
+CT
+CT
 EH
 EH
 EH
@@ -19463,7 +19467,7 @@ MA
 MA
 ph
 OQ
-pX
+CT
 EH
 EH
 EH
diff --git a/_maps/map_files/Vampire/special_fran/residential.dmm b/_maps/map_files/Vampire/special_fran/residential.dmm
index 87fe8c15bd98..4e19397f47fe 100644
--- a/_maps/map_files/Vampire/special_fran/residential.dmm
+++ b/_maps/map_files/Vampire/special_fran/residential.dmm
@@ -1965,6 +1965,10 @@
 	},
 /turf/open/floor/carpet/darkpack,
 /area/vtm/interior/apartment)
+"pD" = (
+/obj/effect/spawner/random/structure/billboard/darkpack,
+/turf/open/misc/grass,
+/area/vtm/outside/fishermanswharf)
 "pG" = (
 /obj/effect/turf_decal/asphaltline/alt{
 	dir = 8
@@ -5029,6 +5033,10 @@
 /obj/structure/platform/lowwall/junk/window,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/shop/gummaguts)
+"Nt" = (
+/obj/structure/chair/plastic/darkpack,
+/turf/open/misc/beach/vamp,
+/area/vtm/outside/northbeach)
 "Nu" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
@@ -6546,16 +6554,6 @@
 /obj/structure/bookcase/random/reference,
 /turf/open/floor/carpet/darkpack/blackgold,
 /area/vtm/interior/ghetto)
-"Zs" = (
-/obj/effect/turf_decal/asphaltline/alt{
-	dir = 8
-	},
-/obj/effect/turf_decal/asphaltline/alt{
-	dir = 8
-	},
-/obj/structure/retail/gummaguts_menu,
-/turf/open/floor/plating/asphalt,
-/area/vtm/outside/fishermanswharf/ghetto)
 "Zv" = (
 /obj/structure/chair/plastic/darkpack{
 	dir = 8
@@ -9696,7 +9694,7 @@ iw
 vE
 Sh
 Sh
-mo
+Nt
 Sh
 Xf
 Sh
@@ -11018,10 +11016,10 @@ OY
 OY
 rk
 xb
-MY
-MY
-MY
-MY
+jy
+WZ
+WZ
+jy
 MY
 WZ
 WZ
@@ -11125,10 +11123,10 @@ OY
 OY
 rk
 xb
+pD
 MY
-jy
-jy
 WZ
+MY
 WZ
 WZ
 pP
@@ -11233,9 +11231,9 @@ OY
 rk
 xb
 MY
-jy
-WZ
-pP
+MY
+MY
+MY
 WZ
 WZ
 WZ
@@ -14388,7 +14386,7 @@ jk
 bA
 jk
 Ll
-Zs
+jk
 Ll
 hk
 xX
diff --git a/_maps/map_files/Vampire/special_fran/special_fran_umbra.dmm b/_maps/map_files/Vampire/special_fran/special_fran_umbra.dmm
index 2c83df61a82d..3b8b2fa1f693 100644
--- a/_maps/map_files/Vampire/special_fran/special_fran_umbra.dmm
+++ b/_maps/map_files/Vampire/special_fran/special_fran_umbra.dmm
@@ -6,6 +6,10 @@
 	},
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/outside/penumbra)
+"aj" = (
+/obj/effect/landmark/teleport_mark/gaia,
+/turf/open/misc/dirt,
+/area/vtm/outside/penumbra)
 "ap" = (
 /obj/structure/chair/comfy/darkpack{
 	dir = 8
@@ -533,10 +537,6 @@
 /obj/structure/bed/medical/anchored,
 /turf/open/floor/city/plating_stone,
 /area/vtm/outside/penumbra)
-"uc" = (
-/obj/effect/landmark/teleport_mark/wyld,
-/turf/open/misc/dirt,
-/area/vtm/outside/penumbra)
 "uq" = (
 /turf/closed/wall/vampwall/rich,
 /area/vtm/outside/penumbra)
@@ -4491,7 +4491,7 @@ gr
 gr
 Oa
 Jr
-uc
+Jr
 dd
 dd
 dd
@@ -4598,7 +4598,7 @@ gr
 gr
 Jr
 Jr
-Jr
+aj
 Jr
 dd
 dd
diff --git a/_maps/map_files/Vampire/special_fran/special_francisco.dmm b/_maps/map_files/Vampire/special_fran/special_francisco.dmm
index 4645287c9a16..76e5e8e6c3dd 100644
--- a/_maps/map_files/Vampire/special_fran/special_francisco.dmm
+++ b/_maps/map_files/Vampire/special_fran/special_francisco.dmm
@@ -25,10 +25,7 @@
 /area/vtm/voivodate)
 "abs" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 14;
-	pixel_x = -2
-	},
+/obj/machinery/microwave,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/ghetto)
 "aby" = (
@@ -79,9 +76,7 @@
 /area/vtm)
 "acN" = (
 /obj/structure/table/wood,
-/obj/machinery/microwave{
-	pixel_y = 13
-	},
+/obj/machinery/microwave,
 /obj/item/reagent_containers/cup/glass/dry_ramen{
 	pixel_x = -1;
 	pixel_y = 27
@@ -331,6 +326,10 @@
 /obj/item/pen/fourcolor,
 /turf/open/floor/wood/smooth,
 /area/vtm/interior/endron_facility/restricted)
+"alB" = (
+/obj/item/toy/basketball,
+/turf/open/floor/plating/sidewalk/poor,
+/area/vtm/outside/unionsquare)
 "alD" = (
 /obj/structure/closet/crate,
 /obj/effect/decal/pallet,
@@ -838,7 +837,7 @@
 "aBp" = (
 /obj/machinery/light/directional/west,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/interior/shop/bacotell)
 "aBC" = (
 /obj/effect/turf_decal/siding/white,
 /obj/structure/vampdoor/simple,
@@ -913,7 +912,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "aDK" = (
 /obj/structure/chair/sofa/corp,
 /obj/effect/landmark/start/darkpack/ocean/ganger,
@@ -1075,7 +1074,7 @@
 	pixel_y = 8
 	},
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "aHb" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/flare/candle/infinite{
@@ -1159,7 +1158,7 @@
 	},
 /obj/structure/hydrant,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "aJQ" = (
 /obj/effect/turf_decal/bordur{
 	dir = 1
@@ -1217,7 +1216,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "aKw" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/structure/vampdoor/simple,
@@ -1272,7 +1271,7 @@
 "aMe" = (
 /obj/structure/hydrant,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "aMG" = (
 /obj/structure/flora/rock/darkpack,
 /turf/open/misc/beach/vamp,
@@ -1502,7 +1501,7 @@
 	},
 /obj/structure/closet/cardboard,
 /turf/open/misc/beach/vamp,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "aUC" = (
 /obj/item/rag{
 	pixel_x = -6;
@@ -1552,10 +1551,6 @@
 	},
 /turf/open/floor/fakebasalt,
 /area/vtm/interior/voivodate/cave)
-"aVJ" = (
-/obj/structure/retail/antique,
-/turf/open/space/basic,
-/area/space)
 "aVK" = (
 /obj/structure/table,
 /obj/effect/decal/wallpaper/paper/darkred/low,
@@ -2180,7 +2175,7 @@
 "bqu" = (
 /obj/effect/turf_decal/bordur/inverse,
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "bqx" = (
 /obj/effect/decal/wallpaper/light,
 /turf/closed/wall/vampwall/old,
@@ -2240,7 +2235,7 @@
 "brl" = (
 /obj/effect/decal/cleanable/blood/oil/slippery,
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "brm" = (
 /obj/structure/chair/wood/darkpack{
 	dir = 1
@@ -2295,15 +2290,12 @@
 /turf/open/floor/plating/rough,
 /area/vtm/interior/sewer)
 "buR" = (
-/obj/structure/railing{
-	dir = 4
-	},
 /obj/effect/landmark/npcwall,
 /obj/structure/sign/city/store/bacotell/directional/north{
 	pixel_y = 39
 	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "bva" = (
 /turf/open/floor/carpet/darkpack/cyan,
 /area/vtm/interior/clinic)
@@ -2430,6 +2422,12 @@
 /obj/item/tank/internals/anesthetic,
 /obj/item/clothing/mask/breath,
 /obj/item/clothing/mask/breath,
+/obj/item/stack/medical/bone_gel,
+/obj/item/stack/medical/wrap/sticky_tape/surgical,
+/obj/item/stack/medical/wrap/gauze/twelve,
+/obj/item/storage/medkit/darkpack/standard,
+/obj/item/clothing/gloves/vampire/latex,
+/obj/item/clothing/suit/apron/surgical,
 /turf/open/floor/iron/showroomfloor,
 /area/vtm/interior/clinic)
 "byO" = (
@@ -2512,7 +2510,7 @@
 "bBZ" = (
 /obj/effect/spawner/random/stray_animal,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "bCd" = (
 /obj/effect/turf_decal/darkpack/cave,
 /turf/open/floor/fakebasalt,
@@ -2597,10 +2595,6 @@
 /obj/machinery/light/prince/directional/east,
 /turf/open/floor/plating/sidewalk/old,
 /area/vtm/interior/voivodate/sanctum)
-"bDH" = (
-/obj/effect/landmark/latejoin,
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "bEb" = (
 /obj/structure/bookcase/random/kindred,
 /turf/open/floor/wood/smooth/old,
@@ -2752,10 +2746,6 @@
 /obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/city/plating,
 /area/vtm/interior/endron_facility/restricted)
-"bHh" = (
-/obj/structure/bonfire/fire_barrel,
-/turf/open/misc/grass,
-/area/vtm/interior)
 "bHi" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/plating/sidewalk/poor,
@@ -2918,13 +2908,6 @@
 /obj/machinery/light/prince/directional/west,
 /turf/open/floor/city/clinic,
 /area/vtm/interior/apartment)
-"bLq" = (
-/obj/effect/turf_decal/weather/dirt{
-	dir = 1
-	},
-/obj/structure/bonfire/fire_barrel,
-/turf/open/misc/dirt,
-/area/vtm/interior)
 "bLx" = (
 /obj/structure/bodycontainer/crematorium{
 	dir = 8;
@@ -2936,7 +2919,7 @@
 /obj/effect/decal/cleanable/trash,
 /obj/item/cigbutt,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "bLR" = (
 /obj/structure/vampdoor/simple,
 /obj/effect/mapping_helpers/door/access/npc,
@@ -2952,8 +2935,7 @@
 /turf/open/floor/carpet/darkpack/redsilver,
 /area/vtm/interior/voivodate)
 "bMa" = (
-/obj/structure/table,
-/obj/structure/platform/lowwall/brick,
+/obj/structure/table/countertop/bubway,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/supply)
 "bMb" = (
@@ -3009,7 +2991,7 @@
 	},
 /mob/living/carbon/human/npc/walkby,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "bPg" = (
 /obj/structure/vampfence/corner/rich{
 	dir = 8;
@@ -3019,7 +3001,7 @@
 	},
 /obj/effect/turf_decal/bordur,
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "bPl" = (
 /turf/open/openspace,
 /area/vtm/outside/chinatown)
@@ -3147,12 +3129,6 @@
 "bTa" = (
 /turf/closed/wall/vampwall/rich,
 /area/vtm/interior/millennium_tower/f4)
-"bTi" = (
-/obj/effect/turf_decal/bordur/inverse{
-	dir = 4
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "bTk" = (
 /obj/effect/turf_decal/siding/white,
 /obj/structure/vampdoor,
@@ -3202,7 +3178,7 @@
 /obj/effect/decal/cleanable/trash,
 /obj/effect/decal/cleanable/cardboard,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "bUU" = (
 /obj/structure/chair/plastic/darkpack,
 /turf/open/floor/plating/sidewalk/old,
@@ -3352,7 +3328,8 @@
 	pixel_y = 38
 	},
 /obj/machinery/chem_dispenser/drinks{
-	pixel_y = 11
+	pixel_y = 0;
+	pixel_x = 0
 	},
 /turf/open/floor/city/bacotell,
 /area/vtm/interior/shop/bacotell)
@@ -3615,7 +3592,7 @@
 /area/vtm/interior/voivodate)
 "cfr" = (
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cfB" = (
 /obj/structure/railing{
 	dir = 8
@@ -3930,7 +3907,7 @@
 "coe" = (
 /obj/effect/decal/cleanable/vomit,
 /turf/open/misc/beach/vamp,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "coS" = (
 /obj/structure/roofstuff/vent/autotiling,
 /obj/structure/roofstuff/vent/autotiling,
@@ -4029,11 +4006,6 @@
 /obj/structure/closet/crate/dumpster,
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/outside/pacificheights)
-"crV" = (
-/obj/machinery/light/small/directional/north,
-/obj/structure/bonfire/fire_barrel,
-/turf/open/floor/plating/canal,
-/area/vtm/interior/sewer)
 "csh" = (
 /obj/effect/landmark/npcactivity,
 /turf/open/floor/plating/sidewalkalt,
@@ -4092,7 +4064,7 @@
 "ctA" = (
 /obj/structure/barrels/rand,
 /turf/open/misc/beach/vamp,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "ctB" = (
 /obj/structure/rack/food/rand,
 /turf/open/floor/plating/concrete,
@@ -4116,6 +4088,10 @@
 /obj/item/gas_can/full,
 /turf/open/floor/city/toilet/large,
 /area/vtm/interior/sewer)
+"cuo" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "cuw" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -4145,7 +4121,7 @@
 	pixel_y = -21
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cvb" = (
 /obj/structure/chair/sofa/corp{
 	color = "#CD5C5C"
@@ -4212,7 +4188,7 @@
 	pixel_y = 11
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cwA" = (
 /obj/structure/table/glass,
 /obj/structure/fluff/tv{
@@ -4238,7 +4214,7 @@
 /obj/effect/decal/cleanable/cardboard,
 /obj/effect/decal/cleanable/garbage,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cxn" = (
 /obj/structure/rack/clothing_hanger,
 /turf/open/floor/city/plating,
@@ -4301,10 +4277,6 @@
 	},
 /turf/open/floor/plating/concrete,
 /area/vtm/outside/park)
-"czf" = (
-/obj/effect/decal/cleanable/trash,
-/turf/open/floor/plating/sidewalk,
-/area/vtm)
 "czt" = (
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 1
@@ -4488,7 +4460,7 @@
 	pixel_y = 8
 	},
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cEQ" = (
 /obj/machinery/light/dim/directional/east,
 /turf/open/floor/plating/rough,
@@ -4656,7 +4628,7 @@
 /obj/effect/turf_decal/bordur,
 /obj/effect/landmark/npcwall,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cIN" = (
 /obj/structure/table/countertop/bubway,
 /obj/item/storage/fancy/cigarettes/cigpack_xeno{
@@ -4759,7 +4731,7 @@
 /obj/effect/turf_decal/darkpack/dirt,
 /obj/effect/decal/cleanable/trash,
 /turf/open/misc/beach/vamp,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cLd" = (
 /obj/item/guts,
 /turf/open/floor/plating/rough/cave{
@@ -4781,7 +4753,7 @@
 	},
 /obj/structure/barrels/rand,
 /turf/open/misc/beach/vamp,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cLF" = (
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 1
@@ -4827,6 +4799,10 @@
 /obj/underplate/stuff{
 	pixel_y = 8
 	},
+/obj/item/knife/kitchen{
+	pixel_x = 10;
+	pixel_y = 7
+	},
 /turf/open/floor/city/bacotell,
 /area/vtm/interior/shop/bubway)
 "cMA" = (
@@ -4941,7 +4917,7 @@
 /obj/structure/closet/crate/dumpster,
 /obj/effect/spawner/random/occult/artifact,
 /turf/open/misc/dirt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cQF" = (
 /obj/structure/chair/office/darkpack/green,
 /obj/effect/landmark/start/darkpack/hospital/doctor,
@@ -5138,7 +5114,7 @@
 "cVz" = (
 /obj/structure/closet/cardboard,
 /turf/open/misc/dirt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "cVU" = (
 /obj/effect/decal/wallpaper/lightpadded,
 /turf/closed/wall/vampwall/old,
@@ -5312,14 +5288,6 @@
 	},
 /turf/open/floor/plating/concrete,
 /area/vtm/interior/clinic)
-"daq" = (
-/obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 7;
-	pixel_x = -2
-	},
-/turf/open/floor/wood/smooth/old,
-/area/vtm/interior/ghetto)
 "dat" = (
 /obj/structure/table/glass,
 /obj/item/storage/ashtray{
@@ -5596,7 +5564,7 @@
 /obj/effect/landmark/npcability,
 /obj/effect/landmark/npcactivity,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "dmo" = (
 /obj/effect/turf_decal/bordur{
 	dir = 8
@@ -5803,9 +5771,6 @@
 /turf/open/floor/plating/rough/cave,
 /area/vtm/interior/voivodate/cave)
 "dtM" = (
-/obj/effect/turf_decal/bordur{
-	dir = 8
-	},
 /obj/machinery/light/directional/north,
 /obj/structure/platform/lowwall/market,
 /turf/open/floor/plating/rough,
@@ -6000,10 +5965,6 @@
 /obj/effect/decal/shadow,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/sewer)
-"dyR" = (
-/obj/item/kirbyplants/darkpack/random,
-/turf/open/floor/city/bacotell,
-/area/vtm/interior/shop/bubway)
 "dyX" = (
 /turf/closed/indestructible/the_matrix,
 /area/vtm/interior/sewer)
@@ -6084,7 +6045,9 @@
 "dCA" = (
 /obj/structure/table/countertop/bubway,
 /obj/structure/sink/directional/north{
-	icon_state = "basin"
+	icon_state = "basin";
+	pixel_x = 0;
+	pixel_y = -9
 	},
 /obj/item/reagent_containers/cup/glass/mug{
 	pixel_x = -20;
@@ -6145,7 +6108,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "dDM" = (
 /obj/structure/vampdoor/simple{
 	dir = 4
@@ -6242,10 +6205,6 @@
 	icon_state = "basin"
 	},
 /obj/structure/platform/lowwall/painted,
-/obj/item/clothing/gloves/vampire/latex{
-	pixel_x = 9;
-	pixel_y = 30
-	},
 /obj/item/storage/box/masks{
 	pixel_y = 24;
 	pixel_x = -8
@@ -6358,7 +6317,7 @@
 "dJw" = (
 /obj/effect/turf_decal/darkpack/dirt,
 /turf/open/misc/beach/vamp,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "dJy" = (
 /obj/structure/table,
 /obj/vampire_computer{
@@ -6530,8 +6489,9 @@
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/laundromat)
 "dPG" = (
-/obj/machinery/vending/cola{
-	pixel_y = 20;
+/obj/machinery/vending/cola/starkist{
+	pixel_x = 0;
+	pixel_y = 22;
 	density = 0
 	},
 /turf/open/floor/city/toilet/large,
@@ -6684,7 +6644,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "dUw" = (
 /obj/structure/table/wood,
 /obj/item/kirbyplants/darkpack/plant4{
@@ -6908,11 +6868,7 @@
 /area/vtm/interior/museum)
 "ebL" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_x = -3;
-	pixel_y = 5
-	},
+/obj/machinery/microwave,
 /turf/open/floor/city/toilet/large,
 /area/vtm/interior/ghetto)
 "ebR" = (
@@ -7031,6 +6987,14 @@
 	},
 /turf/open/floor/city/plating_stone,
 /area/vtm/interior/apartment)
+"eea" = (
+/obj/machinery/vending/cola/starkist{
+	density = 0;
+	pixel_x = 2;
+	pixel_y = 22
+	},
+/turf/open/floor/wood/smooth/old,
+/area/vtm/interior/gang)
 "ees" = (
 /obj/structure/curtain/cloth/fancy/mechanical/luxurious{
 	id = "endron_iaa_curtains";
@@ -7117,10 +7081,6 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/city/toilet/large,
 /area/vtm/interior/sewer)
-"egP" = (
-/obj/structure/bonfire/fire_barrel,
-/turf/open/floor/plating/rough/cave,
-/area/vtm/interior/sewer)
 "ehj" = (
 /obj/structure/table/wood,
 /obj/machinery/microwave,
@@ -7294,7 +7254,7 @@
 "elV" = (
 /obj/effect/decal/cleanable/trash,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "eml" = (
 /obj/effect/turf_decal/bordur/corner,
 /turf/open/floor/plating/sidewalk/old,
@@ -7410,7 +7370,7 @@
 /obj/effect/decal/cleanable/trash,
 /mob/living/carbon/human/npc/hobo,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "eqA" = (
 /obj/machinery/light/prince/directional/north,
 /turf/open/floor/wood/smooth/old,
@@ -7660,10 +7620,7 @@
 /area/vtm/interior/wyrm_corrupted)
 "exk" = (
 /obj/structure/coclock,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /obj/structure/table,
 /turf/open/floor/city/clinic,
 /area/vtm/interior/millennium_tower)
@@ -7883,7 +7840,7 @@
 /obj/item/reagent_containers/cup/bottle/nutrient/ez,
 /obj/item/reagent_containers/cup/bottle/nutrient/ez,
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "eGC" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 8
@@ -7940,7 +7897,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "eJc" = (
 /obj/structure/chair/sofa/corp/right{
 	dir = 8
@@ -7969,7 +7926,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "eJG" = (
 /obj/structure/sink/directional/south,
 /obj/structure/mirror{
@@ -8127,6 +8084,10 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/carpet/darkpack/redsilver,
 /area/vtm/interior/tattoo)
+"eOh" = (
+/obj/structure/bonfire/fire_barrel,
+/turf/open/floor/plating/canal,
+/area/vtm/interior/sewer)
 "eOr" = (
 /obj/effect/turf_decal/bordur/inverse,
 /turf/open/floor/plating/asphalt,
@@ -8287,9 +8248,7 @@
 /area/vtm/interior/ghetto)
 "eSG" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 8
-	},
+/obj/machinery/microwave,
 /obj/item/reagent_containers/cup/glass/dry_ramen{
 	pixel_x = -1;
 	pixel_y = 21
@@ -8456,7 +8415,7 @@
 	},
 /obj/effect/turf_decal/darkpack/rough,
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "eWh" = (
 /obj/structure/vampdoor/oldwood,
 /obj/effect/mapping_helpers/door/access/voivodate,
@@ -8602,16 +8561,18 @@
 /turf/open/floor/carpet/royalblack,
 /area/vtm/interior/apartment)
 "faU" = (
-/obj/machinery/vending/cola{
-	pixel_y = 20
-	},
 /obj/machinery/light/directional/north,
+/obj/machinery/vending/cola/shamblers{
+	pixel_x = 0;
+	pixel_y = 22;
+	density = 0
+	},
 /turf/open/floor/plating/concrete,
 /area/vtm/interior/police)
 "faZ" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "fbd" = (
 /obj/machinery/light/directional/south,
 /obj/structure/table/countertop/yellow,
@@ -8691,7 +8652,7 @@
 	},
 /obj/structure/roadsign/parking,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "feD" = (
 /obj/effect/turf_decal/trimline/red/warning{
 	dir = 1
@@ -8862,7 +8823,7 @@
 	pixel_y = 8
 	},
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "fju" = (
 /obj/effect/landmark/npcwall,
 /obj/effect/landmark/navigate_destination,
@@ -8932,7 +8893,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "fkD" = (
 /obj/structure/chair/comfy/darkpack{
 	color = "#FFECD5";
@@ -9049,7 +9010,7 @@
 /obj/structure/table,
 /obj/effect/food_cart_stand,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "flG" = (
 /obj/structure/table,
 /obj/machinery/recharger{
@@ -9063,12 +9024,6 @@
 /obj/item/smartphone/emergency,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/police)
-"fmn" = (
-/obj/effect/turf_decal/bordur/inverse{
-	dir = 6
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "fmw" = (
 /obj/structure/table/wood,
 /obj/vampire_computer,
@@ -9112,12 +9067,6 @@
 	},
 /turf/open/misc/grass,
 /area/vtm/interior/voivodate/sanctum)
-"fnM" = (
-/obj/effect/turf_decal/crosswalk,
-/obj/effect/landmark/npcability,
-/obj/effect/turf_decal/bordur/inverse,
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "fnW" = (
 /obj/effect/turf_decal/bordur{
 	dir = 8
@@ -9362,11 +9311,7 @@
 /area/vtm/outside/financialdistrict)
 "fui" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_x = -3;
-	pixel_y = 5
-	},
+/obj/machinery/microwave,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/endron_facility/restricted)
 "fuH" = (
@@ -9380,6 +9325,12 @@
 /obj/machinery/light/small/red/directional/south,
 /turf/open/floor/city/circled/large,
 /area/vtm/interior/endron_facility/restricted)
+"fuU" = (
+/obj/effect/turf_decal/bordur/corner{
+	dir = 4
+	},
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "fuX" = (
 /turf/open/floor/iron/stairs,
 /area/vtm/interior/clinic)
@@ -9439,9 +9390,7 @@
 /area/vtm/interior/millennium_tower)
 "fwv" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /obj/effect/decal/wallpaper/stone/low,
 /obj/structure/platform/lowwall/rich,
 /turf/open/floor/plating/rough,
@@ -9604,7 +9553,7 @@
 "fAg" = (
 /obj/effect/decal/cleanable/trash,
 /turf/open/misc/dirt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "fAz" = (
 /obj/structure/table,
 /obj/structure/retail/costume_store{
@@ -9731,7 +9680,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "fFo" = (
 /obj/structure/chair/wood/darkpack/red{
 	dir = 8
@@ -9891,7 +9840,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "fJN" = (
 /obj/structure/hedge{
 	density = 0
@@ -9999,10 +9948,6 @@
 /obj/structure/sink/basin/directional/east,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/ghetto)
-"fMI" = (
-/obj/effect/spawner/random/structure/billboard/roadsigns,
-/turf/open/misc/dirt,
-/area/vtm)
 "fMK" = (
 /obj/structure/extinguisher_cabinet/directional/north,
 /obj/effect/turf_decal/trimline/red/warning{
@@ -10139,12 +10084,18 @@
 	alpha = 1
 	},
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "fSq" = (
 /mob/living/carbon/human/npc/illegal,
 /obj/structure/chair/darkpack,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/supply)
+"fSt" = (
+/obj/effect/turf_decal/bordur{
+	dir = 4
+	},
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "fSI" = (
 /obj/machinery/light/small/directional/east,
 /obj/structure/bed,
@@ -10202,11 +10153,14 @@
 	desc = "An old stool. Seems a bit unstable."
 	},
 /obj/structure/rack/tall/wood_shelf{
-	pixel_y = 24
+	pixel_y = 12;
+	pixel_x = 0;
+	density = 0
 	},
 /obj/item/toy/mecha/ripley{
-	pixel_y = 54;
-	anchored = 1
+	pixel_y = 34;
+	anchored = 1;
+	pixel_x = 0
 	},
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/mallarcade)
@@ -10226,9 +10180,8 @@
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/voivodate)
 "fUT" = (
-/obj/structure/table,
 /obj/machinery/computer/cargo/express,
-/obj/structure/platform/lowwall/brick,
+/obj/structure/table/countertop/bubway,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/supply)
 "fUX" = (
@@ -10400,7 +10353,7 @@
 	pixel_y = 7
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "gai" = (
 /obj/structure/table/wood{
 	pixel_y = -1
@@ -10461,7 +10414,7 @@
 	pixel_y = 15
 	},
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "gcO" = (
 /obj/item/toy/plush/snakeplushie,
 /mob/living/basic/pet/cat/jerry,
@@ -10779,6 +10732,13 @@
 	},
 /turf/open/floor/plating/stone,
 /area/vtm/interior/voivodate/sanctum)
+"gko" = (
+/obj/effect/turf_decal/weather/dirt{
+	dir = 1
+	},
+/obj/structure/bonfire/fire_barrel,
+/turf/open/misc/dirt,
+/area/vtm/interior)
 "gkr" = (
 /mob/living/carbon/human/npc/hobo,
 /turf/open/floor/plating/sidewalk/poor,
@@ -11020,7 +10980,9 @@
 /obj/structure/chair/office/darkpack/green{
 	dir = 1
 	},
-/mob/living/carbon/human/npc/endronsecurity,
+/mob/living/carbon/human/npc/endronsecurity{
+	dir = 1
+	},
 /turf/open/floor/city/plating,
 /area/vtm/interior/endron_facility/restricted)
 "gsy" = (
@@ -11028,7 +10990,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "gsI" = (
 /obj/structure/table,
 /obj/vampire_computer,
@@ -11206,10 +11168,7 @@
 /obj/effect/turf_decal/siding/white{
 	dir = 4
 	},
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_y = 15
-	},
+/obj/machinery/microwave,
 /obj/structure/table,
 /obj/machinery/light/directional/north,
 /turf/open/floor/city/bacotell,
@@ -11553,13 +11512,13 @@
 	dir = 10
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "gHB" = (
 /obj/effect/turf_decal/darkpack/rough/corner{
 	dir = 1
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "gHF" = (
 /obj/effect/turf_decal/siding/brown{
 	dir = 4;
@@ -11860,6 +11819,12 @@
 /obj/machinery/light/prince/directional/west,
 /turf/open/floor/carpet/darkpack/blacksilver,
 /area/vtm/interior/bianchiBank)
+"gPv" = (
+/obj/effect/turf_decal/bordur{
+	dir = 4
+	},
+/turf/open/floor/plating/sidewalk/poor,
+/area/vtm/outside/financialdistrict)
 "gPy" = (
 /obj/effect/decal/cleanable/cardboard,
 /turf/open/floor/plating/sidewalk/poor,
@@ -12011,7 +11976,7 @@
 	},
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "gSF" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#4a3925";
@@ -12103,6 +12068,11 @@
 "gUU" = (
 /turf/open/water/beach/vamp,
 /area/vtm/interior/voivodate/cave)
+"gUY" = (
+/obj/machinery/light/directional/north,
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/city/plating_mono,
+/area/vtm/interior/endron_facility/restricted)
 "gVo" = (
 /obj/structure/filingcabinet/medical,
 /turf/open/floor/wood/old,
@@ -12268,10 +12238,7 @@
 /area/vtm/interior/police)
 "gZI" = (
 /obj/structure/table/countertop/bubway,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_y = 13
-	},
+/obj/machinery/microwave,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/hotel)
 "gZJ" = (
@@ -12354,7 +12321,7 @@
 	},
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "hbW" = (
 /turf/open/floor/carpet/black,
 /area/vtm/interior/laundromat)
@@ -12558,7 +12525,9 @@
 /turf/open/floor/plating/sidewalk/old,
 /area/vtm/voivodate)
 "hiB" = (
-/mob/living/carbon/human/npc/endronsecurity,
+/mob/living/carbon/human/npc/endronsecurity{
+	dir = 4
+	},
 /turf/open/floor/city/plating,
 /area/vtm/interior/endron_facility)
 "hiW" = (
@@ -12671,7 +12640,7 @@
 /obj/effect/turf_decal/darkpack/dirt,
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "hoh" = (
 /obj/structure/table/wood,
 /obj/item/stack/cable_coil/five,
@@ -12933,13 +12902,20 @@
 	},
 /turf/open/floor/plating/sidewalk,
 /area/vtm/outside/financialdistrict)
+"hxI" = (
+/obj/effect/spawner/random/structure/billboard/darkpack{
+	pixel_x = 0;
+	pixel_y = 3
+	},
+/turf/open/misc/dirt,
+/area/vtm/outside/financialdistrict)
 "hxS" = (
 /obj/effect/turf_decal/bordur{
 	dir = 1
 	},
 /obj/effect/turf_decal/bordur/corner,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "hxY" = (
 /obj/structure/sign/city/chinese/alt/directional/west,
 /turf/open/floor/plating/sidewalkalt,
@@ -13355,7 +13331,7 @@
 /obj/machinery/light/directional/north,
 /obj/structure/city_map,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "hJF" = (
 /obj/structure/table,
 /obj/item/vamp/keys/hack{
@@ -13599,13 +13575,6 @@
 /obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/smoke)
-"hQy" = (
-/obj/effect/turf_decal/weather/dirt{
-	dir = 4
-	},
-/obj/structure/bonfire/fire_barrel,
-/turf/open/misc/dirt,
-/area/vtm/interior)
 "hQB" = (
 /obj/item/mop,
 /obj/structure/mop_bucket/janitorialcart,
@@ -13755,6 +13724,8 @@
 	},
 /obj/item/gas_can/full,
 /obj/item/melee/vamp/tire,
+/obj/item/storage/medkit/darkpack/standard,
+/obj/item/storage/medkit/darkpack/standard,
 /turf/open/floor/plating/concrete,
 /area/vtm/interior/clinic)
 "hUy" = (
@@ -13835,7 +13806,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "hWt" = (
 /obj/structure/table,
 /obj/item/paper_bin{
@@ -13908,9 +13879,6 @@
 /obj/effect/decal/cleanable/blood/splatter/oil,
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/interior/ghetto)
-"hYA" = (
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "hYE" = (
 /obj/machinery/light/directional/east,
 /turf/open/floor/plating/concrete,
@@ -13929,7 +13897,7 @@
 "hZs" = (
 /obj/darkpack_car/rand,
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "hZv" = (
 /obj/underplate,
 /obj/structure/table/countertop/bubway,
@@ -14079,7 +14047,7 @@
 	},
 /obj/item/kirbyplants/darkpack/random{
 	pixel_x = 3;
-	pixel_y = 24
+	pixel_y = 21
 	},
 /turf/open/floor/plating/concrete,
 /area/vtm/interior/supply)
@@ -14349,12 +14317,11 @@
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/outside/unionsquare)
 "ikL" = (
-/obj/structure/table,
 /obj/item/melee/vamp/tire{
 	pixel_x = 5;
 	pixel_y = 1
 	},
-/obj/structure/platform/lowwall/brick,
+/obj/structure/table/countertop/bubway,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/supply)
 "ikM" = (
@@ -14492,7 +14459,6 @@
 "ioR" = (
 /obj/effect/decal/cleanable/trash,
 /obj/machinery/light/directional/west,
-/obj/machinery/vending/cola,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/gang)
 "ioV" = (
@@ -14582,6 +14548,10 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/city/plating,
 /area/vtm/interior/clinic)
+"iqv" = (
+/obj/structure/bonfire/fire_barrel,
+/turf/open/floor/plating/sidewalkalt,
+/area/vtm/outside/financialdistrict)
 "iqA" = (
 /obj/structure/vampdoor/simple{
 	dir = 4
@@ -14619,7 +14589,7 @@
 "isg" = (
 /obj/effect/turf_decal/darkpack/dirt/corner,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "isk" = (
 /obj/structure/bookcase/random/lupine,
 /turf/open/floor/wood/smooth/old,
@@ -14873,7 +14843,7 @@
 	},
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "iAs" = (
 /obj/structure/closet/crate/coffin{
 	pixel_y = 6
@@ -14981,10 +14951,6 @@
 /obj/structure/pole,
 /turf/open/floor/carpet/darkpack/greengold,
 /area/vtm/interior/endron_facility/restricted)
-"iDE" = (
-/obj/structure/platform/lowwall/market/window,
-/turf/open/floor/plating/rough,
-/area/vtm)
 "iDY" = (
 /obj/structure/table,
 /obj/effect/turf_decal/siding,
@@ -15001,14 +14967,16 @@
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/shop/pawnshop)
 "iEU" = (
-/obj/item/pizzabox/meat{
-	pixel_y = 7
-	},
-/obj/item/pizzabox/mushroom{
-	pixel_y = 10
-	},
 /obj/item/knife/plastic,
 /obj/structure/table,
+/obj/item/pizzabox{
+	pixel_x = 0;
+	pixel_y = 13
+	},
+/obj/item/pizzabox{
+	pixel_x = 0;
+	pixel_y = 13
+	},
 /turf/open/floor/city/bacotell,
 /area/vtm/interior/police)
 "iFe" = (
@@ -15059,9 +15027,7 @@
 /area/vtm/interior/police)
 "iHN" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /obj/structure/platform/lowwall/rich,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/apartment)
@@ -15395,10 +15361,7 @@
 /area/vtm/interior/clinic)
 "iTG" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /obj/structure/platform/lowwall/brick,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/ghetto)
@@ -15703,7 +15666,7 @@
 	},
 /obj/effect/turf_decal/darkpack/rough,
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jbS" = (
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/hotel)
@@ -15717,6 +15680,12 @@
 /obj/effect/landmark/start/darkpack/pentex/sec,
 /turf/open/floor/wood/smooth,
 /area/vtm/interior/endron_facility/restricted)
+"jcr" = (
+/obj/effect/turf_decal/bordur{
+	dir = 8
+	},
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "jcC" = (
 /obj/effect/turf_decal/bordur,
 /turf/open/floor/plating/roofwalk,
@@ -15762,7 +15731,7 @@
 	icon_state = "police4"
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jeA" = (
 /obj/structure/mop_bucket,
 /obj/item/mop,
@@ -15895,10 +15864,6 @@
 	},
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/voivodate/sanctum)
-"jin" = (
-/obj/structure/lamppost/sidewalk,
-/turf/open/floor/plating/sidewalkalt,
-/area/vtm)
 "jiN" = (
 /obj/structure/sign/city/hotel/directional/west,
 /turf/open/floor/plating/sidewalk/old,
@@ -15978,7 +15943,8 @@
 /area/vtm/interior/sewer)
 "jkG" = (
 /mob/living/carbon/human/npc/shop{
-	resistant_to_disciplines = 1
+	resistant_to_disciplines = 1;
+	dir = 1
 	},
 /turf/open/floor/city/circled/large,
 /area/vtm/interior/shop/newspaper)
@@ -16219,7 +16185,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jrM" = (
 /obj/effect/turf_decal/bordur{
 	dir = 4
@@ -16272,6 +16238,12 @@
 	},
 /turf/open/floor/wood/old,
 /area/vtm/interior/chantry)
+"jtK" = (
+/obj/effect/turf_decal/bordur{
+	dir = 9
+	},
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "jtP" = (
 /obj/effect/landmark/navigate_destination,
 /turf/open/floor/plating/sidewalk/old,
@@ -16360,7 +16332,7 @@
 	},
 /obj/effect/landmark/npcwall,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jwU" = (
 /obj/effect/decal/wallpaper/gold/alt,
 /turf/closed/wall/vampwall/old,
@@ -16803,7 +16775,7 @@
 	pixel_y = 8
 	},
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jKP" = (
 /obj/structure/platform/lowwall/brick/window,
 /turf/open/floor/plating/rough,
@@ -16833,7 +16805,7 @@
 	},
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jLY" = (
 /obj/structure/table/wood,
 /obj/structure/retail/costume_store{
@@ -16962,7 +16934,7 @@
 	},
 /obj/structure/bricks,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jPc" = (
 /obj/structure/hedge{
 	pixel_y = 6
@@ -17127,7 +17099,7 @@
 "jTH" = (
 /mob/living/carbon/human/npc/hobo,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jTN" = (
 /obj/structure/railing{
 	dir = 1
@@ -17260,7 +17232,7 @@
 	icon_state = "rock5"
 	},
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jWX" = (
 /turf/open/floor/city/toilet/large,
 /area/vtm/interior/millennium_tower/f4)
@@ -17347,7 +17319,7 @@
 /obj/effect/decal/cleanable/trash,
 /obj/effect/decal/cleanable/trash,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "jZQ" = (
 /obj/effect/turf_decal/bordur{
 	dir = 6
@@ -17635,6 +17607,10 @@
 	},
 /turf/open/floor/iron/smooth_large,
 /area/vtm/interior)
+"khX" = (
+/obj/structure/bonfire/fire_barrel,
+/turf/open/misc/grass,
+/area/vtm/interior)
 "kig" = (
 /obj/structure/bed,
 /obj/item/bedsheet/ian,
@@ -17648,7 +17624,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "kin" = (
 /obj/structure/curtain,
 /obj/machinery/shower/directional/south,
@@ -17692,7 +17668,7 @@
 "kiU" = (
 /obj/structure/sign/city/police_department/directional/north,
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "kjb" = (
 /obj/effect/turf_decal/bordur{
 	dir = 8
@@ -17863,12 +17839,6 @@
 /obj/structure/vampdoor/old,
 /turf/open/floor/plating/canal,
 /area/vtm/interior/mallunderground)
-"koa" = (
-/obj/effect/turf_decal/bordur/corner/inverse{
-	dir = 4
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "kop" = (
 /obj/effect/turf_decal/bordur/corner{
 	dir = 4
@@ -17919,7 +17889,7 @@
 "kpl" = (
 /obj/effect/decal/cleanable/cardboard,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "kpn" = (
 /obj/structure/vampfence/corner/rich{
 	dir = 1;
@@ -17929,7 +17899,7 @@
 	dir = 10
 	},
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "kpv" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
@@ -18141,7 +18111,7 @@
 "kwV" = (
 /obj/structure/closet/crate/dumpster,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "kxx" = (
 /obj/structure/lamppost/one{
 	dir = 1
@@ -18373,7 +18343,7 @@
 "kDs" = (
 /obj/structure/ladder/manhole/down,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "kDH" = (
 /obj/structure/table,
 /obj/vampire_computer{
@@ -18411,6 +18381,12 @@
 	},
 /turf/open/floor/carpet/darkpack/old,
 /area/vtm/interior/shop/ishu)
+"kEZ" = (
+/obj/effect/turf_decal/bordur{
+	dir = 6
+	},
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "kFs" = (
 /obj/machinery/button/door{
 	id = "endron_cell_2_doors";
@@ -18532,7 +18508,7 @@
 	},
 /obj/effect/turf_decal/bordur,
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "kKw" = (
 /obj/structure/dresser,
 /obj/machinery/light/prince/directional/east,
@@ -18592,7 +18568,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "kMY" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 6
@@ -18628,7 +18604,7 @@
 	pixel_x = 10
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "kNL" = (
 /obj/structure/vampfence/corner/rich{
 	dir = 4;
@@ -18778,12 +18754,6 @@
 	},
 /turf/open/floor/plating/sidewalk/old,
 /area/vtm/voivodate)
-"kSu" = (
-/obj/effect/turf_decal/asphaltline/alt{
-	dir = 8
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "kSv" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin{
@@ -18893,10 +18863,6 @@
 	},
 /turf/open/indestructible/necropolis/air,
 /area/vtm/interior/wyrm_corrupted)
-"kVM" = (
-/obj/effect/turf_decal/crosswalk,
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "kWc" = (
 /obj/machinery/light/prince/directional/west,
 /obj/structure/sink/directional/south,
@@ -19045,11 +19011,7 @@
 	},
 /obj/effect/spawner/random/occult/artifact,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
-"lbu" = (
-/obj/structure/bonfire/fire_barrel,
-/turf/open/floor/plating/canal,
-/area/vtm/interior/sewer)
+/area/vtm/outside/financialdistrict)
 "lbA" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#4a3925"
@@ -19286,21 +19248,12 @@
 /turf/open/openspace,
 /area/vtm/interior/clinic)
 "liN" = (
-/obj/item/gun/ballistic/automatic/darkpack/aug{
-	desc = "A specialty Steyr AUG, a holdover from your days in the SWAT unit. For when the freaks come out to riot, you'll be ready.";
-	name = "SFPD Captain's AUG"
-	},
 /obj/structure/closet/cabinet,
 /obj/item/ammo_box/darkpack/c556,
 /obj/item/gun/ballistic/revolver/darkpack/magnum,
 /obj/item/ammo_box/darkpack/c44,
 /obj/item/storage/box/teargas,
 /obj/item/melee/baton/telescopic,
-/obj/item/storage/fancy/hardcase,
-/obj/item/ammo_box/magazine/darkpackaug,
-/obj/item/ammo_box/magazine/darkpackaug,
-/obj/item/ammo_box/magazine/darkpackaug,
-/obj/item/ammo_box/magazine/darkpackaug,
 /obj/item/megaphone,
 /turf/open/floor/wood/ornate,
 /area/vtm/interior/police)
@@ -19318,10 +19271,7 @@
 /area/vtm/interior/laundromat)
 "ljm" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /turf/open/floor/city/toilet/large,
 /area/vtm/interior/shop/bubway)
 "ljD" = (
@@ -19395,7 +19345,7 @@
 	dir = 10
 	},
 /turf/open/misc/beach/vamp,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "lnp" = (
 /obj/structure/hedge{
 	pixel_y = 6
@@ -19714,6 +19664,12 @@
 	},
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/interior/radio)
+"lvB" = (
+/obj/effect/turf_decal/bordur/corner{
+	dir = 8
+	},
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "lvL" = (
 /obj/structure/table,
 /obj/vampire_computer{
@@ -19765,9 +19721,7 @@
 /area/vtm/interior/vet)
 "lxQ" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 8
-	},
+/obj/machinery/microwave,
 /obj/item/reagent_containers/cup/glass/mug/tea{
 	pixel_x = 7;
 	pixel_y = 18
@@ -19802,7 +19756,13 @@
 	icon_state = "police2"
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
+"lyB" = (
+/obj/effect/turf_decal/bordur{
+	dir = 6
+	},
+/turf/open/floor/plating/sidewalk/poor,
+/area/vtm/outside/financialdistrict)
 "lyK" = (
 /obj/structure/vampipe{
 	icon_state = "piping35"
@@ -19968,7 +19928,7 @@
 /obj/effect/decal/cleanable/cardboard,
 /obj/effect/decal/cleanable/garbage,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "lEY" = (
 /obj/machinery/light/directional/east,
 /obj/structure/closet/crate/bin{
@@ -20139,7 +20099,7 @@
 "lKx" = (
 /obj/effect/turf_decal/darkpack/rough/corner,
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "lKT" = (
 /obj/structure/table/wood,
 /obj/item/newspaper,
@@ -20184,7 +20144,7 @@
 	icon_state = "police3"
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "lMR" = (
 /obj/effect/turf_decal/siding{
 	dir = 1
@@ -20246,7 +20206,7 @@
 	pixel_x = -10;
 	pixel_y = 8
 	},
-/obj/structure/platform/lowwall/brick,
+/obj/structure/table/countertop/bubway,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/supply)
 "lNZ" = (
@@ -20269,7 +20229,7 @@
 "lPm" = (
 /obj/darkpack_car/track/volkswagen,
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "lPv" = (
 /obj/effect/turf_decal/darkpack/cave/corner{
 	dir = 4
@@ -20387,7 +20347,7 @@
 "lRL" = (
 /obj/machinery/hydroponics/soil,
 /turf/open/misc/dirt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "lRW" = (
 /obj/structure/roofstuff/vent/autotiling,
 /turf/open/floor/plating/sidewalk/poor,
@@ -20839,7 +20799,7 @@
 	icon_state = "rock5"
 	},
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "mgt" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/turf_decal/siding/thinplating/dark,
@@ -21018,12 +20978,10 @@
 	dir = 1
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "mmn" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /obj/structure/platform/lowwall/old,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/voivodate)
@@ -21074,11 +21032,6 @@
 /obj/effect/decal/rugs,
 /turf/open/floor/plating/asphalt,
 /area/vtm/interior/millennium_tower)
-"mop" = (
-/obj/item/reagent_containers/cup/glass/bottle/beer/vampire,
-/obj/structure/bonfire/fire_barrel,
-/turf/open/floor/plating/rough/cave,
-/area/vtm/interior/sewer)
 "mox" = (
 /obj/structure/chair/office/darkpack/green{
 	dir = 4
@@ -21121,7 +21074,7 @@
 "mpy" = (
 /obj/effect/turf_decal/bordur,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "mqe" = (
 /obj/structure/railing{
 	dir = 4
@@ -21138,7 +21091,7 @@
 "mqi" = (
 /obj/darkpack_car/police,
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "mqm" = (
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/mallarcade)
@@ -21149,10 +21102,6 @@
 /obj/effect/turf_decal/bordur,
 /turf/open/floor/plating/roofwalk,
 /area/vtm)
-"mrg" = (
-/obj/structure/bonfire/fire_barrel,
-/turf/open/floor/plating/sidewalkalt,
-/area/vtm/interior)
 "mrm" = (
 /turf/open/floor/city/plating,
 /area/vtm/interior/millennium_tower/f4)
@@ -21346,7 +21295,7 @@
 /obj/effect/turf_decal/bordur,
 /obj/structure/fuelstation,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "mvJ" = (
 /obj/effect/turf_decal/bordur{
 	dir = 8
@@ -21393,7 +21342,7 @@
 "mxw" = (
 /obj/structure/bricks,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "mxH" = (
 /obj/structure/chair/office/darkpack/green{
 	dir = 1
@@ -21408,7 +21357,6 @@
 /area/vtm/interior/millennium_tower)
 "mym" = (
 /obj/structure/bed/medical/emergency,
-/obj/item/storage/medkit/darkpack/standard,
 /turf/open/floor/plating/concrete,
 /area/vtm/interior/clinic)
 "myr" = (
@@ -21648,6 +21596,10 @@
 	icon_state = "stone8"
 	},
 /area/vtm/interior/voivodate/sanctum)
+"mEQ" = (
+/obj/effect/landmark/npcwall,
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "mEV" = (
 /obj/structure/table,
 /obj/item/storage/box/beakers{
@@ -21674,10 +21626,6 @@
 	},
 /turf/open/floor/plating/rough,
 /area/vtm/interior/anarch/basement)
-"mFE" = (
-/obj/structure/bonfire/fire_barrel,
-/turf/open/floor/plating/sidewalkalt,
-/area/vtm/outside/financialdistrict)
 "mFX" = (
 /obj/machinery/light/directional/east,
 /obj/structure/table/countertop/red,
@@ -21785,6 +21733,15 @@
 /obj/item/storage/fancy/hardcase/mag_556,
 /obj/item/storage/fancy/hardcase/mag_556,
 /obj/item/storage/fancy/hardcase/mag_556,
+/obj/item/storage/fancy/hardcase,
+/obj/item/gun/ballistic/automatic/darkpack/aug{
+	desc = "A specialty Steyr AUG, a holdover from your days in the SWAT unit. For when the freaks come out to riot, you'll be ready.";
+	name = "SFPD Captain's AUG"
+	},
+/obj/item/ammo_box/magazine/darkpackaug,
+/obj/item/ammo_box/magazine/darkpackaug,
+/obj/item/ammo_box/magazine/darkpackaug,
+/obj/item/ammo_box/magazine/darkpackaug,
 /turf/open/floor/city/toilet/large,
 /area/vtm/interior/police)
 "mII" = (
@@ -22135,7 +22092,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "mQU" = (
 /obj/structure/chair/comfy/darkpack{
 	color = "#FFECD5";
@@ -22159,7 +22116,9 @@
 "mSi" = (
 /obj/structure/table/reinforced,
 /obj/structure/sink/directional/east{
-	icon_state = "basin"
+	icon_state = "basin";
+	pixel_x = -5;
+	pixel_y = 0
 	},
 /turf/open/floor/plating/canal,
 /area/vtm/interior/sewer)
@@ -22345,12 +22304,6 @@
 /obj/item/ammo_box/magazine/m44,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/sewer)
-"mWS" = (
-/obj/effect/turf_decal/bordur/corner/inverse{
-	dir = 1
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "mXa" = (
 /obj/effect/turf_decal/trimline/yellow/filled/warning{
 	dir = 8
@@ -22496,6 +22449,10 @@
 /obj/effect/decal/pallet,
 /turf/open/misc/dirt,
 /area/vtm/outside/pacificheights)
+"nbz" = (
+/obj/effect/turf_decal/bordur,
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "nbE" = (
 /turf/open/openspace,
 /area/vtm/interior/hotel)
@@ -22766,7 +22723,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "nls" = (
 /turf/open/floor/carpet/darkpack,
 /area/vtm/interior/millennium_tower/f4)
@@ -22977,13 +22934,6 @@
 /obj/item/storage/medkit/darkpack/standard,
 /turf/open/floor/city/toilet/large,
 /area/vtm/interior/police)
-"nqt" = (
-/obj/structure/table/countertop/bubway,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow."
-	},
-/turf/open/floor/wood/smooth/old,
-/area/vtm/interior/hotel)
 "nqv" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin{
@@ -23100,21 +23050,31 @@
 	},
 /turf/open/floor/plating/concrete,
 /area/vtm/interior/ghetto)
+"nuU" = (
+/obj/structure/bonfire/fire_barrel,
+/turf/open/floor/plating/sidewalkalt,
+/area/vtm/interior)
 "nvn" = (
 /obj/structure/rack/tall/wood_shelf{
-	pixel_y = 24
+	pixel_y = 12;
+	pixel_x = 0;
+	density = 0
 	},
 /obj/item/toy/plush/moth{
-	pixel_y = 50;
+	pixel_y = 36;
 	anchored = 1;
-	name = "Cloth Eatron"
+	name = "Cloth Eatron";
+	pixel_x = 0
 	},
 /obj/item/toy/mecha/firefighter{
-	pixel_y = 27
+	pixel_y = 17;
+	pixel_x = 0;
+	anchored = 1
 	},
 /obj/item/clothing/head/costume/kitty{
-	pixel_y = 34;
-	anchored = 1
+	pixel_y = 23;
+	anchored = 1;
+	pixel_x = 0
 	},
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/mallarcade)
@@ -23237,7 +23197,7 @@
 	resistant_to_disciplines = 1
 	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "nyf" = (
 /obj/structure/chair/sofa/corp/left{
 	dir = 8
@@ -23278,7 +23238,7 @@
 /obj/effect/decal/cleanable/cardboard,
 /obj/effect/decal/cleanable/garbage,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "nzu" = (
 /obj/effect/turf_decal/bordur{
 	dir = 1
@@ -23291,12 +23251,6 @@
 "nzB" = (
 /turf/closed/wall/vampwall/market,
 /area/vtm/interior/sewer)
-"nzJ" = (
-/obj/effect/turf_decal/bordur/inverse{
-	dir = 9
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "nzX" = (
 /obj/machinery/light/red/directional/east,
 /turf/open/floor/city/toilet/large,
@@ -23327,10 +23281,6 @@
 	icon_state = "stone4"
 	},
 /area/vtm/interior/voivodate/sanctum)
-"nBI" = (
-/obj/effect/decal/cleanable/cardboard,
-/turf/open/floor/plating/sidewalk,
-/area/vtm)
 "nBY" = (
 /obj/structure/rack,
 /turf/open/floor/plating/rough,
@@ -23344,7 +23294,7 @@
 	dir = 1
 	},
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "nCx" = (
 /turf/open/floor/city/plating,
 /area/vtm/interior/endron_facility)
@@ -23438,12 +23388,12 @@
 	},
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "nGX" = (
 /obj/structure/closet/cardboard,
 /obj/effect/decal/pallet,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "nHg" = (
 /obj/effect/turf_decal/trimline/red/warning{
 	dir = 1
@@ -23645,7 +23595,7 @@
 "nMG" = (
 /obj/effect/landmark/npcability,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "nMJ" = (
 /obj/structure/table/wood/fancy/red,
 /obj/structure/retail/library{
@@ -23796,9 +23746,6 @@
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/endron_facility/restricted)
 "nRn" = (
-/obj/effect/turf_decal/bordur{
-	dir = 8
-	},
 /obj/structure/platform/lowwall/market,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/police)
@@ -24330,7 +24277,7 @@
 	},
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "ohW" = (
 /obj/machinery/light/small/directional/east,
 /obj/item/instrument/eguitar/vamp{
@@ -24369,7 +24316,7 @@
 	pixel_y = 18
 	},
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "oig" = (
 /obj/structure/retail/black_market{
 	dir = 8
@@ -24469,7 +24416,7 @@
 /area/vtm/outside/chinatown)
 "okl" = (
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "okq" = (
 /obj/structure/table/greyscale{
 	name = "metal table"
@@ -24514,7 +24461,7 @@
 	dir = 10
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "okT" = (
 /obj/machinery/griddle,
 /obj/structure/table,
@@ -24682,7 +24629,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "opE" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 4
@@ -24820,6 +24767,18 @@
 	},
 /turf/open/floor/plating/asphalt,
 /area/vtm/outside/financialdistrict)
+"otl" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1;
+	color = "#570090"
+	},
+/obj/machinery/vending/cola/pwr_game{
+	pixel_x = 0;
+	pixel_y = 22;
+	density = 0
+	},
+/turf/open/floor/city/plating_mono,
+/area/vtm/interior/strip)
 "otm" = (
 /obj/effect/spawner/random/occult/artifact,
 /obj/structure/rack,
@@ -25442,6 +25401,9 @@
 	},
 /turf/open/floor/city/plating,
 /area/vtm/interior/mallunderground)
+"oJB" = (
+/turf/closed/wall/vampwall/market,
+/area/vtm/outside/financialdistrict)
 "oJY" = (
 /obj/item/storage/box/masks{
 	pixel_y = 10
@@ -25592,7 +25554,7 @@
 "oPS" = (
 /obj/effect/landmark/npcwall,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "oPT" = (
 /obj/structure/chair/wood/darkpack{
 	dir = 8
@@ -25633,7 +25595,7 @@
 /area/vtm/interior/chantry)
 "oQC" = (
 /turf/open/misc/dirt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "oQG" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 1
@@ -25665,7 +25627,7 @@
 "oRS" = (
 /obj/structure/lamppost/four,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "oSa" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 8
@@ -25686,20 +25648,23 @@
 /area/vtm/interior/mallarcade)
 "oSs" = (
 /obj/structure/rack/tall/wood_shelf{
-	pixel_y = 24
+	pixel_y = 12;
+	pixel_x = 0;
+	density = 0
 	},
 /obj/item/toy/katana{
-	pixel_x = 2;
-	pixel_y = 35;
+	pixel_x = 1;
+	pixel_y = 16;
 	anchored = 1
 	},
 /obj/item/toy/plush/human{
-	pixel_y = 52;
+	pixel_y = 40;
 	anchored = 1;
-	name = "Runescape Matthews"
+	name = "Runescape Matthews";
+	pixel_x = 0
 	},
 /obj/item/toy/figure/ian{
-	pixel_y = 27;
+	pixel_y = 16;
 	pixel_x = 8;
 	anchored = 1;
 	name = "\improper Clifford action figure";
@@ -25874,6 +25839,14 @@
 /obj/effect/mapping_helpers/door/lock,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/endron_facility/restricted)
+"oWp" = (
+/obj/machinery/vending/cola/shamblers{
+	density = 0;
+	pixel_x = 0;
+	pixel_y = 22
+	},
+/turf/open/floor/city/plating_mono,
+/area/vtm/interior/endron_facility/restricted)
 "oWx" = (
 /obj/structure/closet/crate/freezer/blood,
 /obj/item/reagent_containers/blood,
@@ -25937,7 +25910,7 @@
 "oYa" = (
 /obj/item/cigbutt,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "oYC" = (
 /obj/structure/platform/lowwall/market/window,
 /turf/open/floor/plating/rough,
@@ -26113,7 +26086,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "pdI" = (
 /obj/structure/table/wood,
 /obj/vampire_computer,
@@ -26236,7 +26209,7 @@
 /obj/structure/closet/crate/dumpster,
 /obj/item/cigbutt,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "pjf" = (
 /obj/effect/turf_decal/weather/dirt,
 /obj/structure/bed/maint{
@@ -26509,7 +26482,7 @@
 	pixel_y = 12
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "ppv" = (
 /turf/open/floor/city/plating,
 /area/vtm/interior/strip)
@@ -26856,7 +26829,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "pzW" = (
 /obj/structure/vampdoor/old,
 /obj/effect/mapping_helpers/door/access/church,
@@ -26873,10 +26846,6 @@
 /obj/item/vamp/keys/veterinarian,
 /turf/open/floor/wood/smooth,
 /area/vtm/interior/vet)
-"pAW" = (
-/obj/effect/turf_decal/bordur,
-/turf/open/floor/plating/sidewalkalt,
-/area/vtm)
 "pBc" = (
 /obj/effect/turf_decal/siding/red{
 	dir = 1
@@ -26924,10 +26893,7 @@
 /area/vtm/interior/anarch/basement)
 "pCz" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /obj/machinery/light/small/directional/north,
 /obj/structure/platform/lowwall/bar,
 /turf/open/floor/plating/rough,
@@ -27271,7 +27237,7 @@
 "pNo" = (
 /obj/effect/decal/graffiti,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "pNF" = (
 /obj/machinery/light/cold/directional/east,
 /turf/open/floor/city/toilet/large,
@@ -27544,12 +27510,6 @@
 	},
 /turf/open/floor/city/plating_stone,
 /area/vtm/interior/apartment)
-"pWy" = (
-/obj/effect/turf_decal/bordur/inverse{
-	dir = 8
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "pWE" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
@@ -27925,7 +27885,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "qhn" = (
 /turf/open/floor/city/plating_mono,
 /area/vtm/voivodate)
@@ -27975,7 +27935,7 @@
 	id = "umb_police"
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "qiZ" = (
 /obj/effect/turf_decal/bordur{
 	dir = 6
@@ -28012,12 +27972,6 @@
 /obj/structure/coclock,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/endron_facility/restricted)
-"qka" = (
-/obj/effect/turf_decal/bordur/inverse{
-	dir = 1
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "qke" = (
 /obj/structure/closet/cabinet,
 /obj/item/clothing/head/costume/bearpelt{
@@ -28061,6 +28015,11 @@
 /obj/effect/landmark/start/darkpack/law_enforcement/fbi,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/police)
+"qkH" = (
+/obj/effect/decal/pallet,
+/obj/structure/bonfire/fire_barrel,
+/turf/open/floor/plating/sidewalk/poor,
+/area/vtm/outside/pacificheights)
 "qkO" = (
 /obj/effect/turf_decal/bordur{
 	dir = 10
@@ -28148,6 +28107,12 @@
 /obj/effect/landmark/start/darkpack/chantry/regent,
 /turf/open/floor/carpet/lone,
 /area/vtm/interior/chantry)
+"qmF" = (
+/obj/effect/turf_decal/bordur{
+	dir = 5
+	},
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "qmU" = (
 /obj/item/flashlight/lantern{
 	light_on = 1;
@@ -28899,10 +28864,7 @@
 /obj/effect/turf_decal/siding/white{
 	dir = 4
 	},
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_y = 15
-	},
+/obj/machinery/microwave,
 /obj/structure/table,
 /obj/item/storage/box/donkpockets{
 	pixel_y = -4
@@ -28932,7 +28894,7 @@
 "qKe" = (
 /obj/effect/decal/cleanable/garbage,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "qKl" = (
 /obj/structure/sink/directional/south,
 /obj/structure/mirror/directional/north,
@@ -29155,6 +29117,9 @@
 /obj/item/reagent_containers/cup/glass/bottle/champagne,
 /turf/open/floor/wood/smooth,
 /area/vtm/interior/millennium_tower/f4)
+"qOy" = (
+/turf/open/floor/plating/sidewalk/poor,
+/area/vtm/outside/financialdistrict)
 "qOA" = (
 /obj/structure/table,
 /obj/item/flashlight/lamp,
@@ -29958,7 +29923,7 @@
 /obj/effect/decal/cleanable/trash,
 /obj/effect/decal/cleanable/cardboard,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "rjV" = (
 /turf/open/floor/iron/stairs/black/right,
 /area/vtm/interior/voivodate/sanctum)
@@ -30049,12 +30014,6 @@
 /area/vtm/interior/sewer)
 "rmh" = (
 /obj/structure/table,
-/obj/item/storage/medkit/darkpack/standard{
-	pixel_y = 11
-	},
-/obj/item/stack/medical/wrap/gauze/twelve,
-/obj/item/stack/medical/wrap/sticky_tape/surgical,
-/obj/item/stack/medical/bone_gel,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 5
 	},
@@ -30264,15 +30223,6 @@
 	},
 /turf/open/floor/city/toilet/large,
 /area/vtm/interior/police/fed)
-"rsx" = (
-/obj/structure/table,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_x = -3;
-	pixel_y = 5
-	},
-/turf/open/floor/city/bacotell,
-/area/vtm/interior/ghetto)
 "rsK" = (
 /obj/structure/fluff/tv/order/three{
 	pixel_x = -15;
@@ -30299,10 +30249,6 @@
 	},
 /turf/open/floor/city/plating,
 /area/vtm/interior/endron_facility/restricted)
-"rtn" = (
-/obj/effect/landmark/npc_spawn_point,
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "rto" = (
 /obj/structure/chair/sofa/corp/left,
 /obj/effect/turf_decal/siding/white{
@@ -30589,7 +30535,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "rzW" = (
 /obj/structure/lamppost/sidewalk,
 /turf/open/floor/plating/sidewalkalt,
@@ -30600,10 +30546,6 @@
 	},
 /turf/open/misc/dirt,
 /area/vtm/interior)
-"rAs" = (
-/obj/structure/platform/lowwall/brick,
-/turf/open/floor/plating/rough,
-/area/vtm/interior/supply)
 "rAM" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 5
@@ -31392,9 +31334,6 @@
 	},
 /turf/open/floor/plating/granite,
 /area/vtm/interior/endron_facility/restricted)
-"rYQ" = (
-/turf/open/floor/plating/sidewalkalt,
-/area/vtm)
 "rZd" = (
 /obj/effect/turf_decal/bordur,
 /obj/effect/turf_decal/stripes/line{
@@ -31726,10 +31665,10 @@
 /turf/open/floor/plating/rough,
 /area/vtm/interior/mallbank)
 "smZ" = (
-/obj/machinery/vending/cola{
-	pixel_x = -6;
-	pixel_y = 22;
-	density = 0
+/obj/machinery/vending/cola/shamblers{
+	density = 0;
+	pixel_x = 0;
+	pixel_y = 22
 	},
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior)
@@ -31762,6 +31701,10 @@
 /obj/machinery/light/prince/directional/west,
 /turf/open/floor/carpet/darkpack/blacksilver,
 /area/vtm/interior/millennium_tower/f2)
+"snq" = (
+/obj/effect/turf_decal/bordur,
+/turf/open/floor/plating/sidewalk/poor,
+/area/vtm/outside/financialdistrict)
 "snz" = (
 /obj/structure/sign/poster/city_large/blade/old,
 /obj/effect/decal/wallpaper/grey,
@@ -31838,6 +31781,12 @@
 /obj/warehouse_generator,
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/interior/supply)
+"sqm" = (
+/obj/effect/turf_decal/bordur{
+	dir = 8
+	},
+/turf/open/floor/plating/sidewalk/poor,
+/area/vtm/outside/financialdistrict)
 "sqw" = (
 /obj/effect/turf_decal/bordur/inverse{
 	dir = 4
@@ -31867,12 +31816,6 @@
 	},
 /turf/open/floor/iron/grimy,
 /area/vtm/interior/millennium_tower/f4)
-"sqX" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 1
-	},
-/turf/closed/wall/vampwall/brick,
-/area/vtm)
 "srx" = (
 /obj/machinery/light/directional/east,
 /obj/effect/decal/rugs,
@@ -31913,7 +31856,7 @@
 /obj/structure/lamppost/sidewalk,
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "ssE" = (
 /obj/structure/flora/bush/lavendergrass/style_random{
 	pixel_y = 12;
@@ -32111,7 +32054,6 @@
 /turf/open/floor/plating/canal,
 /area/vtm/interior/sewer)
 "swO" = (
-/obj/structure/table,
 /obj/vampire_computer{
 	owner = "Supply Technician"
 	},
@@ -32131,7 +32073,7 @@
 	pixel_y = 25;
 	pixel_x = -4
 	},
-/obj/structure/platform/lowwall/brick,
+/obj/structure/table/countertop/bubway,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/supply)
 "sxc" = (
@@ -32458,9 +32400,7 @@
 /area/vtm/interior/bianchiBank)
 "sFV" = (
 /obj/structure/table/wood,
-/obj/machinery/microwave{
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /turf/open/floor/city/plating_stone,
 /area/vtm/interior/apartment)
 "sGd" = (
@@ -32861,8 +32801,11 @@
 /area/vtm/voivodate)
 "sRt" = (
 /obj/effect/landmark/npcwall,
+/obj/structure/railing{
+	dir = 4
+	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "sRy" = (
 /turf/closed/wall/vampwall/brick,
 /area/vtm/interior/coffee)
@@ -33091,9 +33034,7 @@
 /turf/open/floor/city/plating,
 /area/vtm/interior/endron_facility/restricted)
 "sYd" = (
-/obj/machinery/microwave{
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /obj/structure/table,
 /turf/open/floor/city/plating_stone,
 /area/vtm/interior/voivodate)
@@ -33586,7 +33527,7 @@
 	dir = 4
 	},
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "tpK" = (
 /obj/effect/decal/pallet{
 	pixel_x = 3;
@@ -34104,7 +34045,7 @@
 "tCc" = (
 /mob/living/carbon/human/npc/walkby,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "tCd" = (
 /turf/open/floor/city/plating_stone,
 /area/vtm/interior)
@@ -34173,10 +34114,6 @@
 	},
 /turf/open/floor/plating/rough,
 /area/vtm/interior/gangbasement)
-"tEv" = (
-/obj/effect/turf_decal/bordur/inverse,
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "tEy" = (
 /obj/structure/rack,
 /obj/item/clothing/mask/gas/vampire,
@@ -34488,11 +34425,6 @@
 	},
 /turf/open/floor/plating/asphalt,
 /area/vtm/voivodate)
-"tMn" = (
-/obj/effect/decal/pallet,
-/obj/structure/bonfire/fire_barrel,
-/turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
 "tMF" = (
 /obj/effect/turf_decal/siding/white{
 	color = "#434343"
@@ -34574,10 +34506,6 @@
 	},
 /obj/machinery/light/directional/west,
 /obj/structure/platform/lowwall/painted,
-/obj/item/clothing/suit/apron/surgical{
-	pixel_y = 6;
-	pixel_x = 9
-	},
 /turf/open/floor/plating/rough,
 /area/vtm/interior/clinic)
 "tOI" = (
@@ -34611,7 +34539,7 @@
 	},
 /obj/effect/turf_decal/bordur,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "tPJ" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/turf_decal/siding/white{
@@ -34898,6 +34826,14 @@
 /obj/item/toy/snappop,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/sewer)
+"tWe" = (
+/obj/machinery/vending/cola/shamblers{
+	pixel_x = 0;
+	pixel_y = 22;
+	density = 0
+	},
+/turf/open/floor/city/plating,
+/area/vtm/interior/mallunderground)
 "tWy" = (
 /obj/structure/stairs/north,
 /obj/structure/railing{
@@ -35021,7 +34957,7 @@
 /obj/effect/decal/cleanable/trash,
 /obj/effect/decal/cleanable/garbage,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "uaw" = (
 /obj/effect/turf_decal/trimline/red/warning{
 	dir = 8
@@ -35040,7 +34976,7 @@
 "uaV" = (
 /obj/effect/turf_decal/bordur/corner,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "uaZ" = (
 /obj/effect/turf_decal/siding/brown{
 	dir = 8;
@@ -35210,7 +35146,7 @@
 /obj/machinery/chem_dispenser/drinks{
 	dir = 1;
 	pixel_x = -1;
-	pixel_y = 10
+	pixel_y = 0
 	},
 /obj/structure/table/countertop/purple,
 /turf/open/floor/city/plating,
@@ -35275,9 +35211,10 @@
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/bianchiBank)
 "ujt" = (
-/obj/machinery/vending/cola{
-	density = 0;
-	pixel_y = 22
+/obj/machinery/vending/cola/pwr_game{
+	pixel_x = 0;
+	pixel_y = 22;
+	density = 0
 	},
 /turf/open/floor/eighties,
 /area/vtm/interior/mallarcade)
@@ -35351,7 +35288,7 @@
 	pixel_y = 30
 	},
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "ulA" = (
 /obj/effect/decal/kopatich{
 	pixel_x = -17;
@@ -35384,9 +35321,7 @@
 /area/vtm/outside/pacificheights)
 "una" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 9
-	},
+/obj/machinery/microwave,
 /turf/open/floor/plating/concrete,
 /area/vtm/interior/radio)
 "unj" = (
@@ -35498,7 +35433,7 @@
 /obj/effect/turf_decal/bordur,
 /obj/effect/landmark/npcwall,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "urW" = (
 /obj/structure/railing{
 	dir = 8
@@ -35812,7 +35747,7 @@
 	},
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "uzE" = (
 /obj/structure/toilet{
 	dir = 8
@@ -35969,9 +35904,7 @@
 /area/vtm/interior/voivodate)
 "uCZ" = (
 /obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_x = -1;
-	pixel_y = 6
+	desc = "Cooks and boils stuff, somehow."
 	},
 /obj/machinery/light/directional/west,
 /obj/structure/table,
@@ -36240,11 +36173,6 @@
 /obj/effect/turf_decal/asphaltline,
 /turf/open/floor/plating/asphalt,
 /area/vtm/interior)
-"uKR" = (
-/obj/effect/decal/wallpaper/paper/darkred,
-/obj/effect/decal/wallpaper/paper/stripe,
-/turf/closed/wall/vampwall/rich,
-/area/vtm/interior/apartment)
 "uKV" = (
 /obj/effect/decal/wallpaper/paper/green,
 /turf/closed/wall/vampwall/junk,
@@ -36765,7 +36693,7 @@
 	},
 /obj/effect/decal/cleanable/trash,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "vbw" = (
 /obj/structure/curtain/bounty/start_closed,
 /turf/open/floor/city/toilet/large,
@@ -36972,6 +36900,13 @@
 	},
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/outside/pacificheights)
+"viC" = (
+/obj/effect/turf_decal/bordur{
+	dir = 1
+	},
+/obj/effect/turf_decal/bordur,
+/turf/open/floor/plating/sidewalk/poor,
+/area/vtm/outside/financialdistrict)
 "viI" = (
 /obj/structure/table,
 /obj/item/papercutter,
@@ -37079,7 +37014,7 @@
 "vmo" = (
 /obj/effect/turf_decal/asphaltline/alt,
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "vna" = (
 /obj/effect/decal/cleanable/litter,
 /obj/structure/table/countertop/bubway,
@@ -37125,11 +37060,6 @@
 /area/vtm/interior/ghetto)
 "vnA" = (
 /obj/machinery/light/directional/south,
-/obj/structure/table/wood,
-/obj/item/knife/kitchen{
-	pixel_x = 10;
-	pixel_y = 7
-	},
 /turf/open/floor/city/bacotell,
 /area/vtm/interior/shop/bubway)
 "vnZ" = (
@@ -37340,7 +37270,7 @@
 /obj/effect/landmark/npc_spawn_point,
 /obj/effect/turf_decal/bordur/inverse,
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "vtI" = (
 /obj/structure/vampdoor/reinf,
 /obj/effect/mapping_helpers/door/access/cleaning,
@@ -37475,7 +37405,7 @@
 	dir = 9
 	},
 /turf/open/floor/plating/asphalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "vwd" = (
 /obj/effect/decal/wallpaper/paper/darkred,
 /turf/closed/wall/vampwall/old,
@@ -37511,7 +37441,7 @@
 /obj/effect/decal/cleanable/cardboard,
 /obj/structure/closet/cardboard,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "vxl" = (
 /obj/effect/decal/carpet{
 	pixel_x = 16;
@@ -37949,7 +37879,7 @@
 	},
 /obj/structure/lamppost/one,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "vOC" = (
 /obj/structure/vampdoor/simple{
 	dir = 4
@@ -38061,9 +37991,8 @@
 /turf/open/floor/plating/sidewalk/old,
 /area/vtm/outside/chinatown)
 "vRO" = (
-/obj/structure/table,
 /obj/machinery/light/directional/north,
-/obj/structure/platform/lowwall/brick,
+/obj/structure/table/countertop/bubway,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/supply)
 "vRV" = (
@@ -38372,7 +38301,7 @@
 	},
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "wbR" = (
 /obj/structure/vampipe{
 	icon_state = "piping35"
@@ -38418,7 +38347,7 @@
 /obj/effect/decal/pallet,
 /obj/structure/closet/crate/wooden/communitygardens/seeds,
 /turf/open/floor/plating/sidewalkalt,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "wcx" = (
 /obj/structure/chair/sofa/corner/brown{
 	dir = 4
@@ -38502,7 +38431,7 @@
 	},
 /obj/effect/decal/cleanable/cardboard,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "weU" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 4
@@ -38561,7 +38490,8 @@
 	},
 /obj/structure/table/countertop/red,
 /obj/machinery/chem_dispenser/drinks{
-	pixel_y = 11
+	pixel_y = 0;
+	pixel_x = 0
 	},
 /turf/open/floor/city/bacotell,
 /area/vtm/interior/pizza)
@@ -38852,6 +38782,11 @@
 /obj/effect/mapping_helpers/door/access/wolftech,
 /turf/open/floor/city/toilet/large,
 /area/vtm/interior/radio)
+"wpG" = (
+/obj/machinery/light/small/directional/north,
+/obj/structure/bonfire/fire_barrel,
+/turf/open/floor/plating/canal,
+/area/vtm/interior/sewer)
 "wpR" = (
 /obj/effect/turf_decal/bordur/corner{
 	dir = 8
@@ -38925,7 +38860,8 @@
 /area/vtm/interior/chantry)
 "wsQ" = (
 /mob/living/carbon/human/npc/shop{
-	resistant_to_disciplines = 1
+	resistant_to_disciplines = 1;
+	dir = 8
 	},
 /turf/open/floor/carpet/darkpack/old,
 /area/vtm/interior/shop/ishu)
@@ -38933,12 +38869,11 @@
 /turf/open/floor/iron/stairs,
 /area/vtm/interior/voivodate)
 "wsY" = (
-/obj/structure/table,
 /obj/item/paper_bin{
 	pixel_y = 6
 	},
 /obj/item/pen,
-/obj/structure/platform/lowwall/brick,
+/obj/structure/table/countertop/bubway,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/supply)
 "wtr" = (
@@ -39110,7 +39045,6 @@
 /obj/effect/decal/wallpaper/stone/low,
 /obj/machinery/microwave{
 	icon_state = "mwb";
-	pixel_y = 10;
 	broken = 1
 	},
 /obj/structure/platform/lowwall/rich,
@@ -39227,12 +39161,6 @@
 	},
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/coffee)
-"wBS" = (
-/obj/effect/turf_decal/bordur/inverse{
-	dir = 5
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "wCa" = (
 /obj/structure/vampdoor/wood,
 /obj/effect/mapping_helpers/door/access/npc,
@@ -39267,6 +39195,10 @@
 	},
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm)
+"wDh" = (
+/obj/structure/bonfire/fire_barrel,
+/turf/open/floor/plating/rough/cave,
+/area/vtm/interior/sewer)
 "wDo" = (
 /obj/structure/dresser,
 /turf/open/floor/city/plating,
@@ -39521,6 +39453,11 @@
 "wLa" = (
 /turf/open/floor/plating/concrete,
 /area/vtm/interior/police)
+"wLd" = (
+/obj/effect/decal/pallet,
+/obj/structure/bonfire/fire_barrel,
+/turf/open/floor/plating/sidewalk/poor,
+/area/vtm/outside/financialdistrict)
 "wLW" = (
 /obj/structure/chair/wood/darkpack/red{
 	dir = 8
@@ -39681,6 +39618,10 @@
 "wPX" = (
 /turf/open/floor/wood/old,
 /area/vtm/interior/apartment)
+"wPY" = (
+/obj/effect/turf_decal/bordur/corner,
+/turf/open/floor/plating/sidewalk,
+/area/vtm/outside/financialdistrict)
 "wQb" = (
 /turf/closed/wall/vampwall/metal/reinforced{
 	density = 0;
@@ -39699,7 +39640,7 @@
 /obj/effect/turf_decal/darkpack/dirt,
 /obj/effect/spawner/random/flora/grass,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "wQA" = (
 /obj/effect/decal/coastline/corner{
 	dir = 1
@@ -39865,6 +39806,16 @@
 	},
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/outside/pacificheights)
+"wVV" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/trimline/red/warning{
+	dir = 8
+	},
+/turf/open/floor/wood/smooth/old,
+/area/vtm/interior/gang)
 "wVY" = (
 /obj/effect/decal/wallpaper/paper/darkred/low,
 /obj/structure/curtain/cloth/fancy/mechanical/luxurious{
@@ -39915,11 +39866,6 @@
 /obj/structure/flora/bush/flowers_pp/style_random,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior)
-"wXT" = (
-/obj/effect/decal/cleanable/trash,
-/obj/effect/decal/cleanable/cardboard,
-/turf/open/floor/plating/sidewalk,
-/area/vtm)
 "wYh" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin{
@@ -39944,7 +39890,7 @@
 	},
 /obj/structure/lamppost/sidewalk,
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "wYB" = (
 /obj/structure/table/wood/fancy/royalblack,
 /obj/machinery/button/curtain{
@@ -39967,7 +39913,7 @@
 	icon_state = "rock5"
 	},
 /turf/open/misc/grass/nosmooth,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "wZb" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#4a3925"
@@ -39983,12 +39929,6 @@
 /obj/structure/platform/lowwall/old,
 /turf/open/floor/plating/rough,
 /area/vtm/interior/radio)
-"wZy" = (
-/obj/effect/turf_decal/bordur{
-	dir = 8
-	},
-/turf/open/floor/plating/sidewalkalt,
-/area/vtm)
 "wZH" = (
 /obj/fusebox,
 /turf/open/floor/plating/concrete,
@@ -40238,6 +40178,13 @@
 	},
 /turf/open/floor/wood/old,
 /area/vtm/interior/chantry)
+"xhk" = (
+/obj/effect/turf_decal/weather/dirt{
+	dir = 4
+	},
+/obj/structure/bonfire/fire_barrel,
+/turf/open/misc/dirt,
+/area/vtm/interior)
 "xhm" = (
 /obj/machinery/atm{
 	dir = 8;
@@ -40247,10 +40194,7 @@
 /area/vtm/outside/financialdistrict)
 "xhv" = (
 /obj/structure/table,
-/obj/machinery/microwave{
-	desc = "Cooks and boils stuff, somehow.";
-	pixel_y = 10
-	},
+/obj/machinery/microwave,
 /turf/open/floor/city/bacotell,
 /area/vtm/interior/ghetto)
 "xhx" = (
@@ -40360,10 +40304,6 @@
 "xjm" = (
 /turf/open/floor/plating/concrete,
 /area/vtm/interior/vjanitor)
-"xjx" = (
-/obj/effect/landmark/npcwall,
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "xkJ" = (
 /turf/open/openspace,
 /area/vtm/voivodate)
@@ -40378,13 +40318,13 @@
 	dir = 4
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "xmf" = (
 /obj/effect/turf_decal/bordur/corner/inverse{
 	dir = 1
 	},
 /turf/open/floor/plating/rough,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "xmC" = (
 /obj/structure/lamppost/four,
 /turf/open/floor/plating/sidewalk,
@@ -40392,11 +40332,11 @@
 "xmH" = (
 /obj/structure/lamppost/one,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "xmP" = (
 /obj/effect/landmark/npcactivity,
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "xnj" = (
 /obj/structure/chair/comfy/darkpack/dark{
 	dir = 8
@@ -40642,19 +40582,14 @@
 /obj/effect/decal/wallpaper,
 /turf/closed/wall/vampwall/market,
 /area/vtm/interior/shop/bacotell)
-"xut" = (
-/obj/effect/turf_decal/crosswalk{
-	dir = 4
-	},
-/turf/open/floor/plating/asphalt,
-/area/vtm)
 "xvj" = (
 /obj/structure/vampfence/rich,
 /obj/effect/turf_decal/bordur/corner,
 /turf/open/misc/grass,
 /area/vtm/outside/financialdistrict)
 "xvN" = (
-/obj/machinery/vending/cola{
+/obj/machinery/vending/cola/pwr_game{
+	pixel_x = 0;
 	pixel_y = 22;
 	density = 0
 	},
@@ -40905,7 +40840,7 @@
 /obj/machinery/light/directional/north,
 /obj/effect/landmark/npcwall,
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "xEu" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -40976,7 +40911,7 @@
 /obj/machinery/chem_dispenser/drinks/beer{
 	dir = 1;
 	pixel_x = 3;
-	pixel_y = 10
+	pixel_y = 0
 	},
 /obj/structure/table/countertop/purple,
 /turf/open/floor/city/plating,
@@ -40987,7 +40922,7 @@
 	density = 0
 	},
 /turf/open/floor/plating/sidewalk,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "xHk" = (
 /obj/effect/turf_decal/siding/yellow/corner{
 	dir = 1
@@ -41072,9 +41007,10 @@
 "xJt" = (
 /obj/effect/decal/wallpaper/blue,
 /obj/item/toy/plush/horse{
-	pixel_y = -5;
+	pixel_y = -18;
 	anchored = 1;
-	name = "Petah"
+	name = "Petah";
+	pixel_x = 1
 	},
 /turf/closed/wall/vampwall/brick,
 /area/vtm/interior/shop/bubway)
@@ -41153,6 +41089,11 @@
 	density = 1
 	},
 /area/vtm/voivodate)
+"xKK" = (
+/obj/item/reagent_containers/cup/glass/bottle/beer/vampire,
+/obj/structure/bonfire/fire_barrel,
+/turf/open/floor/plating/rough/cave,
+/area/vtm/interior/sewer)
 "xKN" = (
 /obj/effect/turf_decal/bordur{
 	dir = 6
@@ -41410,13 +41351,14 @@
 /turf/open/floor/wood/smooth,
 /area/vtm/interior/endron_facility/restricted)
 "xPX" = (
-/obj/machinery/vending/cola{
-	pixel_y = 22;
-	density = 0
-	},
 /obj/effect/turf_decal/siding/white{
 	dir = 4
 	},
+/obj/machinery/vending/cola/shamblers{
+	pixel_x = 0;
+	pixel_y = 22;
+	density = 0
+	},
 /turf/open/floor/city/bacotell,
 /area/vtm/interior/police)
 "xQi" = (
@@ -41478,7 +41420,7 @@
 /obj/effect/decal/wallpaper/blue,
 /obj/item/reagent_containers/cup/glass/baggie/meth/cocaine{
 	pixel_x = -8;
-	pixel_y = 2;
+	pixel_y = -11;
 	name = "sherbert packet"
 	},
 /turf/closed/wall/vampwall/brick,
@@ -41879,11 +41821,6 @@
 	},
 /turf/open/floor/plating/sidewalk/poor,
 /area/vtm/interior/ghetto)
-"ygj" = (
-/obj/effect/decal/pallet,
-/obj/structure/bonfire/fire_barrel,
-/turf/open/floor/plating/sidewalk/poor,
-/area/vtm/outside/pacificheights)
 "ygx" = (
 /obj/effect/decal/wallpaper/red,
 /turf/closed/wall/vampwall/rich,
@@ -41919,7 +41856,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/sidewalk/poor,
-/area/vtm)
+/area/vtm/outside/financialdistrict)
 "yiF" = (
 /obj/effect/turf_decal/trimline/purple/filled/warning,
 /obj/machinery/door/poddoor{
@@ -42927,7 +42864,7 @@ qTM
 kzb
 hxj
 uHD
-crV
+wpG
 dUd
 dUd
 hxj
@@ -43149,7 +43086,7 @@ hxj
 hxj
 aAK
 kzb
-lbu
+eOh
 uHD
 uHD
 uHD
@@ -43784,7 +43721,7 @@ kzb
 hxj
 hxj
 uHD
-lbu
+eOh
 hxj
 hxj
 sGq
@@ -44326,7 +44263,7 @@ hxj
 uHD
 eYj
 eps
-lbu
+eOh
 uHD
 hxj
 lFH
@@ -46142,7 +46079,7 @@ hUM
 hUM
 hUM
 urj
-gtt
+otl
 bYN
 nPd
 jfS
@@ -46497,7 +46434,7 @@ lFH
 qTM
 kzb
 hxj
-jpJ
+hUM
 hUM
 hUM
 hUM
@@ -46604,7 +46541,7 @@ lFH
 qTM
 kzb
 hxj
-jpJ
+hUM
 hUM
 hUM
 hUM
@@ -46711,7 +46648,7 @@ lFH
 qTM
 kzb
 hxj
-jpJ
+hUM
 hUM
 hUM
 hUM
@@ -46818,7 +46755,7 @@ lFH
 qTM
 kzb
 hxj
-jpJ
+hUM
 hUM
 hUM
 hUM
@@ -46925,7 +46862,7 @@ lFH
 qTM
 kzb
 hxj
-jpJ
+hUM
 hUM
 hUM
 hUM
@@ -47032,7 +46969,7 @@ lFH
 qTM
 kzb
 hxj
-jpJ
+hUM
 hUM
 hUM
 hUM
@@ -47139,7 +47076,7 @@ aaP
 lFH
 kzb
 hxj
-jpJ
+hUM
 hUM
 hUM
 hUM
@@ -47161,7 +47098,7 @@ euo
 qcO
 "}
 (49,1,1) = {"
-mpg
+wrk
 mpg
 mpg
 mpg
@@ -47246,7 +47183,7 @@ aaP
 lFH
 kzb
 hxj
-jpJ
+hUM
 hUM
 hUM
 hUM
@@ -47268,12 +47205,12 @@ aSg
 qcO
 "}
 (50,1,1) = {"
+wrk
 ame
 oPI
 eMX
 dJr
 vKJ
-dyR
 mpg
 cKM
 bTS
@@ -47353,7 +47290,7 @@ aaP
 lFH
 kzb
 uGT
-jpJ
+hUM
 hUM
 hUM
 hUM
@@ -47375,11 +47312,11 @@ rzd
 qcO
 "}
 (51,1,1) = {"
+wrk
 ame
 tMU
 psP
 psP
-psP
 tMU
 aBC
 bgN
@@ -47482,12 +47419,12 @@ wwe
 wwe
 "}
 (52,1,1) = {"
+wrk
 ame
 hRz
 tMU
 tMU
 tMU
-tMU
 mpg
 enV
 bgN
@@ -47589,10 +47526,10 @@ rDC
 wwe
 "}
 (53,1,1) = {"
+wrk
 ame
 qVx
 hLL
-tMU
 cMy
 vnA
 mpg
@@ -47696,12 +47633,12 @@ eLw
 wwe
 "}
 (54,1,1) = {"
+wrk
 ame
 tsP
 rew
-tMU
-mpg
 mpg
+wnq
 mpg
 mpg
 mpg
@@ -47803,12 +47740,12 @@ wwe
 wwe
 "}
 (55,1,1) = {"
+wrk
 oGv
 ooO
 wnq
 wnq
 wnq
-wnq
 rbM
 dad
 kfS
@@ -47910,14 +47847,14 @@ ybx
 wwe
 "}
 (56,1,1) = {"
+wrk
 oGv
 wnq
 wnq
 wnq
 wnq
 wnq
-wnq
-sqX
+dad
 iOU
 njq
 mll
@@ -48017,12 +47954,12 @@ ybx
 wwe
 "}
 (57,1,1) = {"
+wrk
 oGv
 poF
 qmy
 wnq
 wnq
-wnq
 mpg
 dad
 iOU
@@ -48124,12 +48061,12 @@ ybx
 wwe
 "}
 (58,1,1) = {"
+wrk
 oGv
 nsc
 cdi
 wnq
 wnq
-wnq
 vUF
 edr
 uiY
@@ -48231,12 +48168,12 @@ ybx
 wwe
 "}
 (59,1,1) = {"
+wrk
 oGv
 oPT
 wqq
 wnq
 wnq
-wnq
 mfG
 cDO
 cDO
@@ -48338,11 +48275,11 @@ ybx
 wwe
 "}
 (60,1,1) = {"
+wrk
 oGv
 vLq
 wnq
 wnq
-wnq
 cDo
 vUF
 oeb
@@ -48387,7 +48324,7 @@ aIk
 hdl
 hdl
 hdl
-rsx
+xhv
 xyH
 pmL
 lea
@@ -48445,11 +48382,11 @@ ybx
 wwe
 "}
 (61,1,1) = {"
+wrk
 oGv
 lRK
 lUj
 wnq
-wnq
 pGD
 vUF
 oeb
@@ -48466,7 +48403,7 @@ bZM
 keg
 bZM
 bZM
-smE
+tWe
 tWb
 nbL
 dfQ
@@ -48552,11 +48489,11 @@ kIX
 wwe
 "}
 (62,1,1) = {"
+wrk
 oGv
 rny
 rny
 wnq
-wnq
 hbl
 vUF
 mzi
@@ -48659,7 +48596,7 @@ wwe
 wwe
 "}
 (63,1,1) = {"
-mpg
+wrk
 mpg
 mpg
 mpg
@@ -48768,10 +48705,10 @@ wwe
 (64,1,1) = {"
 wrk
 hUM
+hUM
 mpg
 fGA
 bgN
-bgN
 mpg
 aJU
 wgN
@@ -48875,10 +48812,10 @@ wwe
 (65,1,1) = {"
 wrk
 hUM
+hUM
 mpg
 lEu
 lfL
-bgN
 mpg
 wgU
 wgU
@@ -48982,7 +48919,7 @@ wwe
 (66,1,1) = {"
 wrk
 hUM
-mpg
+hUM
 mpg
 mpg
 mpg
@@ -51165,7 +51102,7 @@ nPE
 hUM
 hUM
 hfF
-mop
+xKK
 daa
 lfx
 daa
@@ -52137,7 +52074,7 @@ hUM
 xyB
 jWB
 jWB
-egP
+wDh
 jWB
 xyB
 hUM
@@ -52347,7 +52284,7 @@ hUM
 pXV
 daa
 jOZ
-egP
+wDh
 jWB
 jWB
 xyB
@@ -52460,7 +52397,7 @@ jWB
 hUM
 hUM
 hUM
-egP
+wDh
 kde
 hUM
 hxj
@@ -53385,7 +53322,7 @@ wrk
 wrk
 jBE
 vtD
-rtn
+dXP
 dXP
 tyg
 wdp
@@ -53491,8 +53428,8 @@ jBE
 jBE
 jBE
 jBE
-tEv
-bDH
+fLi
+muU
 muU
 aSP
 wdp
@@ -53590,16 +53527,16 @@ pth
 xLf
 lxo
 sWP
-rgY
-rgY
-rgY
-rgY
-rgY
-kSM
-qmj
-qmj
-tEv
-bDH
+qOy
+qOy
+qOy
+qOy
+qOy
+hxE
+aVS
+aVS
+fLi
+muU
 muU
 aSP
 wdp
@@ -53698,15 +53635,15 @@ pth
 pth
 sWP
 oPS
-mHR
-mHR
-mHR
-mHR
-vkQ
+gPv
+gPv
+gPv
+gPv
+byb
 xmH
-qmj
-tEv
-bDH
+aVS
+fLi
+muU
 muU
 aSP
 wdp
@@ -53810,10 +53747,10 @@ kMu
 okl
 kMu
 eJB
-tBG
-jrM
-tEv
-hYA
+kEZ
+fSt
+fLi
+vao
 vao
 aSP
 wdp
@@ -53875,7 +53812,7 @@ dIU
 dIU
 dIU
 hpw
-dIU
+alB
 dIU
 dIU
 dIU
@@ -53917,10 +53854,10 @@ kMu
 lPm
 kMu
 eJB
-vqi
+fuU
 okl
 fEZ
-hYA
+vao
 vao
 aSP
 wdp
@@ -54027,7 +53964,7 @@ okl
 brl
 vwa
 lKx
-hYA
+vao
 vao
 aSP
 wdp
@@ -54124,8 +54061,8 @@ pth
 pth
 pth
 rRR
-dTQ
-mHR
+lyB
+gPv
 bqu
 jbK
 okl
@@ -54134,7 +54071,7 @@ okl
 okl
 fkx
 gHB
-hYA
+vao
 vao
 aSP
 wdp
@@ -54231,7 +54168,7 @@ pth
 pth
 pth
 rRR
-yeV
+snq
 brl
 okl
 okl
@@ -54241,7 +54178,7 @@ okl
 gHe
 okl
 fEZ
-hYA
+vao
 vao
 aSP
 wdp
@@ -54307,7 +54244,7 @@ lUl
 xnJ
 alS
 jLk
-nqt
+gZI
 qBx
 lUl
 uoe
@@ -54338,7 +54275,7 @@ pth
 pth
 pth
 rRR
-yeV
+snq
 okl
 okl
 okl
@@ -54346,9 +54283,9 @@ hxS
 okl
 okl
 okl
-fBn
-tEv
-hYA
+lvB
+fLi
+vao
 vao
 aSP
 wdp
@@ -54445,17 +54382,17 @@ eMF
 qFg
 vge
 svg
-yeV
+snq
 vmo
 okl
 okl
-qkY
+oJB
 faZ
 okl
-fBn
-mmD
-tEv
-hYA
+lvB
+jtK
+fLi
+vao
 vao
 aSP
 wdp
@@ -54552,17 +54489,17 @@ bGn
 jCw
 lxo
 svg
-yeV
+snq
 eVW
 okl
 okl
 mvB
 okl
 okl
-kSM
-qmj
-tEv
-hYA
+hxE
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -54663,13 +54600,13 @@ hJE
 mme
 okl
 okl
-ayi
+viC
 okl
 okl
-kSM
-qmj
-tEv
-hYA
+hxE
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -54770,13 +54707,13 @@ urv
 vmo
 okl
 okl
-qkY
+oJB
 okl
 okl
 aJG
 xmP
-fnM
-kVM
+hMr
+qny
 qny
 stx
 evz
@@ -54877,13 +54814,13 @@ urv
 hZs
 okl
 okl
-ayi
+viC
 okl
 okl
-kSM
+hxE
 nMG
-tEv
-hYA
+fLi
+vao
 vao
 aSP
 nrz
@@ -54987,10 +54924,10 @@ okl
 mvB
 okl
 okl
-kSM
-qmj
-tEv
-hYA
+hxE
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -55091,13 +55028,13 @@ yip
 vmo
 okl
 okl
-qkY
+oJB
 faZ
 okl
-vkQ
-fDU
-tEv
-hYA
+byb
+qmF
+fLi
+vao
 vao
 aSP
 wdp
@@ -55193,7 +55130,7 @@ wrk
 jBE
 cLs
 lno
-fMI
+hxI
 yip
 brl
 okl
@@ -55202,9 +55139,9 @@ xlP
 okl
 okl
 okl
-vkQ
-tEv
-hYA
+byb
+fLi
+vao
 vao
 aSP
 wdp
@@ -55295,7 +55232,7 @@ qkY
 "}
 (20,1,2) = {"
 oFp
-aVJ
+oFp
 wrk
 jBE
 coe
@@ -55311,7 +55248,7 @@ gHe
 okl
 fkx
 gHB
-hYA
+vao
 vao
 aSP
 wdp
@@ -55409,7 +55346,7 @@ dUu
 dJw
 oQC
 qhi
-cmh
+sqm
 bqu
 aDu
 jrH
@@ -55418,7 +55355,7 @@ okl
 okl
 okl
 fEZ
-hYA
+vao
 vao
 aSP
 wdp
@@ -55516,7 +55453,7 @@ ctA
 aUB
 vbu
 isg
-rgY
+qOy
 bqu
 jbK
 okl
@@ -55525,7 +55462,7 @@ okl
 okl
 okl
 fEZ
-hYA
+vao
 vao
 aSP
 wdp
@@ -55621,18 +55558,18 @@ wrk
 jBE
 jPb
 ppr
-rgY
-rgY
-rgY
+qOy
+qOy
+qOy
 xmf
 pzI
 pzI
 pzI
 gsy
-tjB
+wPY
 okl
 fEZ
-hYA
+vao
 vao
 aSP
 evz
@@ -55729,17 +55666,17 @@ jBE
 kwV
 elV
 elV
-rgY
-rgY
-rgY
-rgY
-rgY
-rgY
-kSM
+qOy
+qOy
+qOy
+qOy
+qOy
+qOy
+hxE
 vOa
-xSX
-tEv
-hYA
+jcr
+fLi
+vao
 vao
 lWv
 mcR
@@ -55834,19 +55771,19 @@ wrk
 wrk
 jBE
 kwV
-rgY
-rgY
+qOy
+qOy
 elV
-rgY
-rgY
-rgY
-rgY
-rgY
+qOy
+qOy
+qOy
+qOy
+qOy
 bPc
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 vao
 mVa
@@ -55942,18 +55879,18 @@ jBE
 jBE
 fZO
 elV
-rgY
+qOy
 elV
 elV
 nGX
 nGX
-rgY
+qOy
 kNz
-kSM
-qmj
-qmj
-tEv
-hYA
+hxE
+aVS
+aVS
+fLi
+vao
 vao
 vao
 mVa
@@ -56047,9 +55984,9 @@ oFp
 wrk
 jBE
 vwW
-rgY
-rgY
-rgY
+qOy
+qOy
+qOy
 sRy
 sRy
 sRy
@@ -56057,10 +55994,10 @@ sRy
 sRy
 sRy
 sRy
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 vao
 mVa
@@ -56154,7 +56091,7 @@ oFp
 wrk
 jBE
 kpl
-rgY
+qOy
 kpl
 mxw
 oHU
@@ -56164,10 +56101,10 @@ igg
 igg
 vlM
 sRy
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 uPM
 toD
@@ -56260,8 +56197,8 @@ bMb
 wrk
 wrk
 jBE
-rgY
-rgY
+qOy
+qOy
 mxw
 sRy
 oHU
@@ -56271,10 +56208,10 @@ nMB
 jIU
 vlM
 sjB
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 evz
@@ -56379,9 +56316,9 @@ oYL
 vlM
 sjB
 aMe
-qmj
-tEv
-hYA
+aVS
+fLi
+vao
 vao
 aSP
 nrz
@@ -56485,10 +56422,10 @@ vlM
 vlM
 vlM
 sjB
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -56592,10 +56529,10 @@ sIU
 vlM
 vlM
 sRy
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -56699,10 +56636,10 @@ vlM
 vlM
 vJI
 oPH
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -56806,10 +56743,10 @@ uzn
 lGF
 vlM
 wnP
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -56914,9 +56851,9 @@ vlM
 vlM
 sjB
 xmH
-qmj
-tEv
-hYA
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -57020,10 +56957,10 @@ tVC
 fpp
 lGF
 sjB
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -57127,10 +57064,10 @@ sRy
 sRy
 sRy
 sRy
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -57223,21 +57160,21 @@ qUw
 tKb
 wrk
 dad
-wZy
-wZy
-wZy
-wZy
-wZy
-wZy
-wZy
+tDy
+tDy
+tDy
+tDy
+tDy
+tDy
+tDy
 wcs
 cEN
-qmj
+aVS
 flC
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -57330,21 +57267,21 @@ qUw
 tKb
 wrk
 dad
-rYQ
+hmb
 wYz
 wYV
 wYV
 uaV
-rYQ
-rYQ
-jin
+hmb
+hmb
+kCZ
 fjo
 nxO
 pdu
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -57437,21 +57374,21 @@ sli
 tKb
 wrk
 dad
-rYQ
+hmb
 jWS
 cfr
 oie
 mpy
-rYQ
-rYQ
+hmb
+hmb
 eFX
 fjo
-qmj
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -57544,21 +57481,21 @@ wrk
 tKb
 wrk
 dad
-rYQ
+hmb
 jWS
 cfr
 cfr
 mpy
-rYQ
-rYQ
-rYQ
+hmb
+hmb
+hmb
 kpn
 aGW
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -57651,21 +57588,21 @@ wrk
 tKb
 wrk
 dad
-rYQ
+hmb
 nCp
 mfY
 mfY
 tpv
-rYQ
-rYQ
-rYQ
-rYQ
-pAW
-qmj
-qmj
-qmj
-tEv
-hYA
+hmb
+hmb
+hmb
+hmb
+rWB
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 lWv
 kaU
@@ -57759,20 +57696,20 @@ tKb
 wrk
 dad
 ulu
-rYQ
-rYQ
-rYQ
-rYQ
-rYQ
-rYQ
-rYQ
-rYQ
-pAW
-qmj
-qmj
-qmj
-tEv
-hYA
+hmb
+hmb
+hmb
+hmb
+hmb
+hmb
+hmb
+hmb
+rWB
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 uPM
 eNb
@@ -57875,11 +57812,11 @@ wbI
 wbI
 hbH
 bPg
-qmj
+aVS
 xmH
-qmj
-tEv
-hYA
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -57982,11 +57919,11 @@ lRL
 oQC
 gSz
 kKm
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -58090,10 +58027,10 @@ lRL
 gSz
 kKm
 aMe
-qmj
+aVS
 nMG
-tEv
-hYA
+fLi
+vao
 vao
 aSP
 wdp
@@ -58196,11 +58133,11 @@ uzu
 uzu
 ssC
 kKm
-qmj
-qmj
+aVS
+aVS
 xmP
-fnM
-kVM
+hMr
+qny
 qny
 stx
 pol
@@ -58300,14 +58237,14 @@ mHq
 mHq
 mOd
 mOd
-qkY
+mHq
 gcL
 jKK
-qmj
-qmj
+aVS
+aVS
 nMG
-tEv
-hYA
+fLi
+vao
 vao
 aSP
 nrz
@@ -58360,7 +58297,7 @@ pgP
 oBT
 oBT
 oBT
-qdl
+wVV
 hFq
 hFq
 hFq
@@ -58409,12 +58346,12 @@ clD
 clD
 aBp
 tCc
-qmj
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -58514,14 +58451,14 @@ aoR
 mHq
 clD
 clD
-qmj
-qmj
-qmj
-qmj
-qmj
-qmj
-tEv
-hYA
+clD
+aVS
+aVS
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -58621,14 +58558,14 @@ ygK
 mHq
 clD
 fnd
-qkY
+mHq
 xGZ
-qmj
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -58726,16 +58663,16 @@ aoR
 aoR
 aoR
 enT
-clD
-clD
-aBp
-qmj
-qmj
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+cuo
+aVS
+aVS
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 rPX
@@ -58833,16 +58770,16 @@ aoR
 aoR
 aoR
 mHq
-clD
-clD
-qmj
-qmj
-qmj
-qmj
+aVS
+aVS
+aVS
+aVS
+aVS
+aVS
 xmH
-qmj
-tEv
-hYA
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -58939,17 +58876,17 @@ aoR
 aoR
 aoR
 aoR
-qkY
+mHq
 buR
-sRt
+mEQ
 sRt
 jwQ
-qmj
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -59046,17 +58983,17 @@ qmq
 aoR
 ofs
 ixg
-qkY
-rdj
-rdj
-rdj
-rdj
+mHq
+rOC
+rOC
+rOC
+rOC
 opv
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -59153,17 +59090,17 @@ vpi
 aoR
 ofs
 ixg
-iDE
-rdj
-rdj
-rdj
-rdj
+ctI
+rOC
+rOC
+rOC
+rOC
 opv
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -59260,17 +59197,17 @@ qEq
 aoR
 wUS
 tmx
-iDE
-rdj
-rdj
-rdj
-rdj
+ctI
+rOC
+rOC
+rOC
+rOC
 opv
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -59321,7 +59258,7 @@ wzz
 nFG
 vFP
 kSa
-eEa
+eea
 hFq
 hFq
 hFq
@@ -59367,17 +59304,17 @@ aoR
 aoR
 wUS
 voW
-iDE
-rdj
-rdj
-rdj
-rdj
+ctI
+rOC
+rOC
+rOC
+rOC
 opv
-qmj
-qmj
+aVS
+aVS
 nMG
-tEv
-hYA
+fLi
+vao
 vao
 aSP
 nrz
@@ -59474,17 +59411,17 @@ aoR
 aoR
 aoR
 aoR
-iDE
-rdj
-rdj
-rdj
-rdj
+ctI
+rOC
+rOC
+rOC
+rOC
 opv
-qmj
-qmj
+aVS
+aVS
 xmP
-fnM
-kVM
+hMr
+qny
 qny
 stx
 evz
@@ -59581,17 +59518,17 @@ qmq
 aoR
 wUS
 wMe
-iDE
-rdj
-rdj
-rdj
-rdj
+ctI
+rOC
+rOC
+rOC
+rOC
 opv
-qmj
-qmj
+aVS
+aVS
 nMG
-tEv
-hYA
+fLi
+vao
 vao
 aSP
 nrz
@@ -59688,17 +59625,17 @@ wMe
 aoR
 wUS
 clL
-iDE
-rdj
-rdj
-rdj
-rdj
+ctI
+rOC
+rOC
+rOC
+rOC
 opv
-qmj
+aVS
 aMe
-qmj
-tEv
-hYA
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -59759,7 +59696,7 @@ dST
 aXe
 cjN
 dST
-ygj
+qkH
 xdw
 vZX
 xdw
@@ -59770,7 +59707,7 @@ xdw
 qfK
 xdw
 aSa
-igS
+gdF
 xnW
 gdF
 gdF
@@ -59795,17 +59732,17 @@ qEq
 uVQ
 aoR
 aoR
-iDE
-rdj
-rdj
-rdj
-rdj
+ctI
+rOC
+rOC
+rOC
+rOC
 opv
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -59877,7 +59814,7 @@ xdw
 qfK
 xdw
 aSa
-igS
+gdF
 hzE
 gdF
 gdF
@@ -59902,17 +59839,17 @@ mHq
 mHq
 iQB
 mHq
-qkY
-rdj
-rdj
-rdj
-rdj
+mHq
+rOC
+rOC
+rOC
+rOC
 opv
-qmj
-qmj
-qmj
-tEv
-hYA
+aVS
+aVS
+aVS
+fLi
+vao
 vao
 aSP
 wdp
@@ -59984,7 +59921,7 @@ xdw
 pkn
 xdw
 aSa
-igS
+gdF
 gdF
 gdF
 gdF
@@ -60004,22 +59941,22 @@ bVY
 (64,1,2) = {"
 wrk
 jBE
-qmj
-qmj
-qmj
-qmj
-qmj
-qmj
+aVS
+aVS
+aVS
+aVS
+aVS
+aVS
 rzS
 rzS
 rzS
 rzS
-qmj
-qmj
+aVS
+aVS
 oRS
 nMG
-tEv
-hYA
+fLi
+vao
 vao
 aSP
 wdp
@@ -60070,7 +60007,7 @@ pmB
 rxY
 pmB
 kSa
-ygj
+qkH
 xdw
 ozq
 xdw
@@ -60091,7 +60028,7 @@ xdw
 qfK
 nRZ
 aSa
-igS
+gdF
 nbx
 gdF
 gdF
@@ -60112,21 +60049,21 @@ bVY
 wrk
 jBE
 jBE
-sRt
-qmj
-qmj
-qmj
-qmj
-qmj
-qmj
+mEQ
+aVS
+aVS
+aVS
+aVS
+aVS
+aVS
 dlX
 nMG
-qmj
-qmj
+aVS
+aVS
 nMG
 xmP
-tEv
-hYA
+fLi
+vao
 vao
 aSP
 qqQ
@@ -60198,7 +60135,7 @@ jsq
 jsq
 xdw
 nYB
-igS
+gdF
 gdF
 gdF
 gdF
@@ -60220,20 +60157,20 @@ wrk
 jBE
 ooK
 eIM
-bTi
-bTi
-bTi
-bTi
-bTi
-bTi
+kaU
+kaU
+kaU
+kaU
+kaU
+kaU
 kil
-bTi
-bTi
-bTi
-bTi
-bTi
-nzJ
-hYA
+kaU
+kaU
+kaU
+kaU
+kaU
+rCm
+vao
 vao
 aSP
 wdp
@@ -60305,7 +60242,7 @@ oay
 jsq
 xdw
 nYB
-igS
+gdF
 hzE
 gdF
 gdF
@@ -60326,21 +60263,21 @@ bVY
 wrk
 jBE
 wQG
-xjx
-hYA
-hYA
-hYA
-hYA
-hYA
-hYA
-xut
-hYA
-hYA
-hYA
-hYA
-hYA
-hYA
-hYA
+osI
+vao
+vao
+vao
+vao
+vao
+vao
+mVa
+vao
+vao
+vao
+vao
+vao
+vao
+vao
 vao
 aSP
 wdp
@@ -60412,7 +60349,7 @@ oay
 jsq
 xdw
 aSa
-igS
+iqf
 xnW
 gdF
 iqf
@@ -60433,21 +60370,21 @@ bVY
 wrk
 jBE
 ewR
-xjx
-hYA
-hYA
-hYA
-hYA
-hYA
-hYA
-xut
-hYA
-hYA
-hYA
-hYA
-hYA
-hYA
-hYA
+osI
+vao
+vao
+vao
+vao
+vao
+vao
+mVa
+vao
+vao
+vao
+vao
+vao
+vao
+vao
 vao
 aSP
 wdp
@@ -60541,20 +60478,20 @@ wrk
 jBE
 cTk
 fJL
-pWy
-pWy
-pWy
-pWy
-pWy
-pWy
+eNb
+eNb
+eNb
+eNb
+eNb
+eNb
 hWp
-wBS
-hYA
-hYA
-fmn
-pWy
-pWy
-pWy
+gpK
+vao
+vao
+uPM
+eNb
+eNb
+eNb
 eNb
 qBd
 wdp
@@ -60646,22 +60583,22 @@ bVY
 (70,1,2) = {"
 wrk
 mUc
-mUc
-sRt
-qmj
-qmj
-qmj
-qmj
-qmj
+jBE
+mEQ
+aVS
+aVS
+aVS
+aVS
+aVS
 nMG
-qmj
-mWS
-hYA
-hYA
-koa
-qmj
-qmj
-qmj
+aVS
+emq
+vao
+vao
+qBd
+aVS
+aVS
+aVS
 aVS
 aVS
 lyP
@@ -60753,23 +60690,23 @@ bVY
 (71,1,2) = {"
 wrk
 wrk
-eNi
+wcy
 dtM
 nRn
 nRn
-eNi
-qmj
-qmj
+wcy
+aVS
+aVS
 xmP
 nMG
-qlp
-hYA
-hYA
+nbz
+vao
+vao
 fet
-jrM
-jrM
-qmj
-qmj
+fSt
+fSt
+aVS
+aVS
 nMG
 vDG
 nrz
@@ -60865,19 +60802,19 @@ oec
 wLa
 wLa
 stg
-qmj
-qmj
-qmj
+aVS
+aVS
+aVS
 aMe
 tPH
-hYA
-hYA
-hYA
-kSu
-qka
+vao
+vao
+vao
+axU
+aSP
 dDy
-qmj
-qmj
+aVS
+aVS
 aJQ
 tDy
 tDy
@@ -60934,7 +60871,7 @@ dKS
 fYl
 swO
 adF
-rAs
+bMa
 bdL
 puI
 bdL
@@ -60972,19 +60909,19 @@ wLa
 wLa
 ePO
 hoQ
-qmj
-qmj
-qmj
-qmj
-qlp
-hYA
-hYA
-hYA
-kSu
-qka
-qmj
-qmj
-czf
+aVS
+aVS
+aVS
+aVS
+nbz
+vao
+vao
+vao
+axU
+aSP
+aVS
+aVS
+pkp
 jfl
 hmb
 hmb
@@ -61085,13 +61022,13 @@ wcy
 wcy
 wcy
 kiU
-hYA
-hYA
-hYA
-qka
-qmj
-qmj
-qmj
+vao
+vao
+vao
+aSP
+aVS
+aVS
+aVS
 jfl
 hmb
 hmb
@@ -61192,13 +61129,13 @@ wLa
 kdf
 wcy
 lyA
-hYA
-hYA
-hYA
-qka
-qmj
-qmj
-qmj
+vao
+vao
+vao
+aSP
+aVS
+aVS
+aVS
 jfl
 hmb
 kCZ
@@ -61299,13 +61236,13 @@ fwz
 dXd
 wcy
 lMK
-kSu
-hYA
-kSu
-qka
-wXT
-czf
-qmj
+axU
+vao
+axU
+aSP
+aza
+pkp
+aVS
 jfl
 hmb
 hmb
@@ -61406,13 +61343,13 @@ tFx
 qBl
 wcy
 jdV
-kSu
-hYA
-kSu
-qka
-czf
+axU
+vao
+axU
+aSP
+pkp
 tCc
-qmj
+aVS
 jfl
 hmb
 hmb
@@ -61512,14 +61449,14 @@ lVj
 cgy
 qbg
 wcy
-hYA
-hYA
-hYA
-hYA
-qka
-qmj
+vao
+vao
+vao
+vao
+aSP
+aVS
 oRS
-qmj
+aVS
 jfl
 hmb
 hmb
@@ -61619,14 +61556,14 @@ lVj
 lVj
 auS
 wcy
-hYA
-hYA
-hYA
-hYA
-qka
-qmj
-qmj
-czf
+vao
+vao
+vao
+vao
+aSP
+aVS
+aVS
+pkp
 jfl
 hmb
 hmb
@@ -61727,13 +61664,13 @@ lVj
 lVj
 wcy
 mqi
-kSu
+axU
 mqi
-kSu
-qka
-qmj
-qmj
-nBI
+axU
+aSP
+aVS
+aVS
+sAF
 jfl
 hmb
 hmb
@@ -61833,14 +61770,14 @@ wcy
 nIw
 wcy
 wcy
-hYA
-kSu
-hYA
-kSu
-qka
-qmj
-qmj
-czf
+vao
+axU
+vao
+axU
+aSP
+aVS
+aVS
+pkp
 jfl
 hmb
 kCZ
@@ -61940,14 +61877,14 @@ hDM
 qwB
 mNP
 wcy
-xSX
-xSX
-xSX
-xSX
+jcr
+jcr
+jcr
+jcr
 aKu
 bUK
-qmj
-qmj
+aVS
+aVS
 jfl
 hmb
 hmb
@@ -62047,14 +61984,14 @@ uia
 iTb
 iTb
 cqu
-qmj
-qmj
-qmj
-qmj
-qmj
-qmj
-qmj
-qmj
+aVS
+aVS
+aVS
+aVS
+aVS
+aVS
+aVS
+aVS
 jfl
 hmb
 hmb
@@ -62154,14 +62091,14 @@ nUJ
 qsW
 xNz
 wcy
-qmj
-czf
-qmj
-qmj
-qmj
-czf
-qmj
-qmj
+aVS
+pkp
+aVS
+aVS
+aVS
+pkp
+aVS
+aVS
 jfl
 hmb
 nPE
@@ -62261,13 +62198,13 @@ fvH
 reN
 cxN
 wcy
-qmj
-qmj
-qmj
-qmj
-qmj
-qmj
-qmj
+aVS
+aVS
+aVS
+aVS
+aVS
+aVS
+aVS
 fQV
 fQV
 fQV
@@ -62368,10 +62305,10 @@ wcy
 eVs
 wcy
 wcy
-jrM
+fSt
 nld
-jrM
-jrM
+fSt
+fSt
 rXZ
 bFf
 fQV
@@ -62477,8 +62414,8 @@ kYC
 wcy
 oYa
 oYa
-rgY
-rgY
+qOy
+qOy
 fQV
 goT
 pAg
@@ -62584,8 +62521,8 @@ kYC
 wcy
 piV
 epX
-rgY
-rgY
+qOy
+qOy
 iZL
 mlc
 mlc
@@ -62691,8 +62628,8 @@ wcy
 wcy
 kwV
 bLQ
-rgY
-rgY
+qOy
+qOy
 iZL
 mlc
 mlc
@@ -62796,9 +62733,9 @@ wLa
 wLa
 wLa
 wcy
-tMn
-rgY
-rgY
+wLd
+qOy
+qOy
 fQV
 fQV
 uvV
@@ -62904,7 +62841,7 @@ wLa
 wLa
 hwO
 qKe
-rgY
+qOy
 elV
 fQV
 pmu
@@ -63011,8 +62948,8 @@ wLa
 ieQ
 wcy
 cwl
-rgY
-rgY
+qOy
+qOy
 iZL
 snE
 mlc
@@ -63118,7 +63055,7 @@ wLa
 sCz
 hwO
 kpl
-rgY
+qOy
 elV
 iZL
 oHm
@@ -63225,7 +63162,7 @@ lik
 lik
 wcy
 kpl
-rgY
+qOy
 elV
 tNL
 rUn
@@ -63332,7 +63269,7 @@ wcy
 wcy
 wcy
 pNo
-rgY
+qOy
 jZL
 tNL
 miv
@@ -63428,7 +63365,7 @@ bVY
 (96,1,2) = {"
 wrk
 wDE
-rgY
+qOy
 qKe
 wcy
 aNJ
@@ -63437,10 +63374,10 @@ qJJ
 agH
 kbu
 wcy
-rgY
+qOy
 rjU
 elV
-rgY
+qOy
 fQV
 nQy
 mlc
@@ -63544,8 +63481,8 @@ oCV
 oCV
 xJD
 wcy
-rgY
-rgY
+qOy
+qOy
 rjU
 elV
 fQV
@@ -63592,7 +63529,7 @@ mAQ
 pVB
 hLw
 ndM
-daq
+abs
 hdl
 omL
 msK
@@ -63651,9 +63588,9 @@ oCV
 iHw
 xJD
 wcy
-rgY
-rgY
-rgY
+qOy
+qOy
+qOy
 uar
 wRd
 mLw
@@ -63685,7 +63622,7 @@ jQN
 iWz
 jQN
 gZX
-mrg
+nuU
 xZh
 hmb
 mOM
@@ -63720,7 +63657,7 @@ bmi
 brp
 bdA
 bdA
-bHh
+khX
 bdA
 lrP
 jiP
@@ -63749,8 +63686,8 @@ bVY
 (99,1,2) = {"
 wrk
 wDE
-tMn
-rgY
+wLd
+qOy
 wcy
 pSA
 pSA
@@ -63758,10 +63695,10 @@ aHc
 npO
 xJD
 wcy
-rgY
+qOy
 elV
 kDs
-rgY
+qOy
 wRd
 vjY
 udU
@@ -63857,7 +63794,7 @@ bVY
 wrk
 wDE
 elV
-rgY
+qOy
 wcy
 wcy
 wcy
@@ -63964,15 +63901,15 @@ bVY
 wrk
 wDE
 elV
-rgY
+qOy
 jZL
 elV
-rgY
+qOy
 kpl
 elV
-rgY
-rgY
-rgY
+qOy
+qOy
+qOy
 weP
 fQe
 fQe
@@ -64035,7 +63972,7 @@ evP
 lCl
 hdl
 hdl
-bLq
+gko
 bmi
 brp
 pjG
@@ -64070,14 +64007,14 @@ bVY
 (102,1,2) = {"
 wrk
 wDE
-rgY
+qOy
 lET
 kpl
 kpl
 jTH
 bBZ
-rgY
-rgY
+qOy
+qOy
 nze
 cuV
 lbr
@@ -64215,7 +64152,7 @@ nPE
 nPE
 nPE
 uxs
-mFE
+iqv
 hmb
 hmb
 hmb
@@ -64361,7 +64298,7 @@ tCd
 tCd
 nxK
 rAq
-hQy
+xhk
 rAq
 fwk
 rAq
@@ -65483,7 +65420,7 @@ rdj
 rdj
 rdj
 eeP
-gEn
+gUY
 eDm
 eDm
 dIN
@@ -65543,7 +65480,7 @@ lUl
 xnJ
 alS
 jLk
-nqt
+gZI
 qBx
 lUl
 uoe
@@ -65590,7 +65527,7 @@ rdj
 rdj
 rdj
 eeP
-pep
+oWp
 eDm
 eDm
 dIN
@@ -84052,7 +83989,7 @@ woU
 qec
 woU
 sPI
-uKR
+xbT
 ojQ
 xAO
 mRu
@@ -84266,7 +84203,7 @@ woU
 woU
 woU
 woU
-uKR
+xbT
 iWk
 cPB
 mRu
@@ -84480,7 +84417,7 @@ woU
 woU
 woU
 woU
-uKR
+xbT
 vue
 bJC
 bJC
diff --git a/modular_darkpack/modules/walls/code/floors/water.dm b/modular_darkpack/modules/walls/code/floors/water.dm
index 071baae6b100..1e5ecb709933 100644
--- a/modular_darkpack/modules/walls/code/floors/water.dm
+++ b/modular_darkpack/modules/walls/code/floors/water.dm
@@ -3,6 +3,17 @@
 	icon = 'modular_darkpack/modules/walls/icons/floors.dmi'
 	icon_state = "ocean"
 	baseturfs = /turf/open/water/river
+	fishing_datum = /datum/fish_source/river
+
+/turf/open/water/river/deep
+	name = "river"
+	icon = 'modular_darkpack/modules/walls/icons/floors.dmi'
+	icon_state = "ocean"
+	desc = "A little too deep for comfort"
+	immerse_overlay = "immerse_deep"
+	baseturfs = /turf/open/water/river/deep
+	is_swimming_tile = TRUE
+	color = "#979797"
 
 /turf/open/water/beach/vamp
 	name = "ocean"