diff --git a/_maps/map_files/daftmarsh/daftmarsh.dmm b/_maps/map_files/daftmarsh/daftmarsh.dmm
index 5db3c183b6c..6a45c170c7a 100644
--- a/_maps/map_files/daftmarsh/daftmarsh.dmm
+++ b/_maps/map_files/daftmarsh/daftmarsh.dmm
@@ -171,14 +171,6 @@
 "ais" = (
 /turf/open/water/cleanshallow,
 /area/under/town/sewer)
-"aiO" = (
-/obj/structure/bed/wool,
-/obj/effect/landmark/start/blacksmith{
-	dir = 8
-	},
-/obj/machinery/light/fueled/wallfire/candle/r,
-/turf/open/floor/wood,
-/area/indoors/town/smithy)
 "ajf" = (
 /obj/structure/bookcase/random/myths,
 /obj/machinery/light/fueled/wallfire/candle/blue{
@@ -2411,6 +2403,13 @@
 /obj/item/reagent_containers/glass/cup,
 /turf/open/floor/wood,
 /area/indoors/town/tavern)
+"bVq" = (
+/obj/structure/bed/wool,
+/obj/effect/landmark/start/blacksmith{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/indoors/town/smithy)
 "bVK" = (
 /obj/structure/table/wood/counter/end{
 	dir = 1
@@ -2846,10 +2845,6 @@
 	},
 /turf/open/openspace,
 /area/indoors/town/garrison)
-"cpJ" = (
-/obj/structure/fluff/clodpile/dirt,
-/turf/open/floor/grass/yel,
-/area/outdoors/town)
 "cpV" = (
 /obj/structure/fluff/walldeco/vinez,
 /turf/closed/wall/mineral/wooddark/vertical,
@@ -3443,10 +3438,6 @@
 /obj/item/instrument/harp,
 /turf/open/floor/ruinedwood/chevron,
 /area/indoors/town)
-"cOe" = (
-/obj/effect/landmark/start/blacksmith,
-/turf/open/floor/ruinedwood/spiral,
-/area/indoors/town/smithy)
 "cOr" = (
 /turf/open/floor/carpet,
 /area/indoors/town/keep/halls/e)
@@ -3865,13 +3856,6 @@
 "dcH" = (
 /turf/open/floor/wood,
 /area/outdoors/town)
-"ddo" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/water/marsh,
-/area/under/town/sewer)
 "ddz" = (
 /turf/open/floor/carpet/lord/right,
 /area/under/town/sewer)
@@ -3961,6 +3945,12 @@
 	},
 /turf/open/floor/ruinedwood/darker,
 /area/indoors/town/orphanage)
+"dji" = (
+/obj/effect/landmark/start/blacksmith{
+	dir = 8
+	},
+/turf/open/floor/ruinedwood/spiral,
+/area/indoors/town/smithy)
 "djo" = (
 /obj/structure/fluff/railing/wood{
 	dir = 8;
@@ -4357,13 +4347,6 @@
 /obj/structure/flora/grass/thorn_bush,
 /turf/open/water/marsh,
 /area/outdoors/town)
-"dCZ" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/hexstone,
-/area/under/town/sewer)
 "dDi" = (
 /obj/structure/door,
 /obj/effect/mapping_helpers/access/keyset/town/artificer,
@@ -4675,6 +4658,13 @@
 	},
 /turf/open/floor/church/purple,
 /area/indoors/town/church/inquisition)
+"dSH" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/open/floor/tile/bfloorz,
+/area/under/town/sewer)
 "dSL" = (
 /obj/structure/closet/crate/chest,
 /obj/item/rope/chain,
@@ -9006,6 +8996,13 @@
 /obj/structure/bars/cemetery,
 /turf/open/floor/cobble,
 /area/outdoors/town)
+"hIa" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/open/floor/hexstone,
+/area/under/town/sewer)
 "hIi" = (
 /turf/open/floor/greenstone,
 /area/indoors/town/clocktower)
@@ -10261,10 +10258,6 @@
 /obj/item/clothing/pants/tights/colored/black,
 /turf/open/floor/carpet/purple,
 /area/indoors/town/steward)
-"iNp" = (
-/obj/structure/fluff/clodpile/dirt,
-/turf/open/floor/dirt,
-/area/outdoors/town)
 "iNt" = (
 /obj/structure/fluff/traveltile{
 	aportalgoesto = "daftmarsh-outlands-to-cave";
@@ -11687,6 +11680,10 @@
 	},
 /turf/open/floor/blocks/stonered,
 /area/indoors/town/dwarfin)
+"kba" = (
+/obj/structure/fluff/clodpile/dirt,
+/turf/open/floor/grass/yel,
+/area/outdoors/town)
 "kbm" = (
 /obj/structure/window/openclose{
 	dir = 8
@@ -12000,12 +11997,6 @@
 /obj/effect/spawner/map_spawner/loot/coin,
 /turf/open/water/sewer,
 /area/under/town/sewer)
-"kou" = (
-/obj/effect/landmark/start/blacksmith{
-	dir = 8
-	},
-/turf/open/floor/ruinedwood/spiral,
-/area/indoors/town/smithy)
 "kpb" = (
 /turf/open/floor/grass,
 /area/outdoors/town)
@@ -16193,13 +16184,6 @@
 /obj/machinery/light/fueled/lanternpost/fixed,
 /turf/open/floor/woodturned/nosmooth,
 /area/outdoors/town)
-"nWi" = (
-/obj/structure/bed/wool,
-/obj/effect/landmark/start/blacksmith{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/indoors/town/smithy)
 "nWq" = (
 /obj/structure/chair/wood/alt,
 /obj/effect/landmark/start/adventurer,
@@ -16594,6 +16578,14 @@
 	},
 /turf/open/floor/tile,
 /area/indoors/town/keep/halls/w)
+"onL" = (
+/obj/structure/bed/wool,
+/obj/effect/landmark/start/blacksmith{
+	dir = 8
+	},
+/obj/machinery/light/fueled/wallfire/candle/r,
+/turf/open/floor/wood,
+/area/indoors/town/smithy)
 "onO" = (
 /obj/structure/table/wood/plain/alt,
 /obj/item/clothing/face/druid{
@@ -17100,6 +17092,10 @@
 	},
 /turf/open/floor/wood,
 /area/indoors/town/tavern)
+"oPl" = (
+/obj/effect/landmark/start/blacksmith,
+/turf/open/floor/ruinedwood/spiral,
+/area/indoors/town/smithy)
 "oPv" = (
 /turf/closed/wall/mineral/wood,
 /area/indoors/town/smithy)
@@ -18014,13 +18010,6 @@
 "pIw" = (
 /turf/open/floor/herringbone,
 /area/indoors/town/smithy)
-"pIE" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/tile/bfloorz,
-/area/under/town/sewer)
 "pJd" = (
 /obj/effect/landmark/hammer/dev_text{
 	name = "Maybe turn this into a run-down farm. Would be more interesting than nothing."
@@ -20080,6 +20069,12 @@
 /obj/structure/kneestingers,
 /turf/open/water/river/dirt,
 /area/under/town/sewer)
+"rAD" = (
+/obj/effect/landmark/start/blacksmith{
+	dir = 4
+	},
+/turf/open/floor/ruinedwood/spiral,
+/area/indoors/town/smithy)
 "rAE" = (
 /turf/open/floor/church,
 /area/indoors/town/church)
@@ -21271,6 +21266,13 @@
 /obj/structure/closet/crate/chest/crate,
 /turf/open/floor/twig,
 /area/outdoors/town)
+"sGT" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/open/water/marsh,
+/area/under/town/sewer)
 "sHj" = (
 /obj/structure/fake_machine/mail{
 	mailtag = "Wizard tower"
@@ -21428,12 +21430,6 @@
 	dir = 4
 	},
 /area/indoors/town/keep/throne)
-"sRt" = (
-/obj/effect/landmark/start/blacksmith{
-	dir = 4
-	},
-/turf/open/floor/ruinedwood/spiral,
-/area/indoors/town/smithy)
 "sSv" = (
 /turf/open/water/marsh,
 /area/outdoors/basin)
@@ -22757,6 +22753,10 @@
 	},
 /turf/open/water/bath,
 /area/indoors/town/church/inquisition)
+"tTL" = (
+/obj/structure/fluff/clodpile/dirt,
+/turf/open/floor/dirt,
+/area/outdoors/town)
 "tTS" = (
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town/clinic_large)
@@ -44610,7 +44610,7 @@ jEJ
 htS
 ikl
 haR
-pIE
+dSH
 htS
 afY
 hUL
@@ -44812,7 +44812,7 @@ jEJ
 htS
 dXn
 jvj
-dCZ
+hIa
 uDq
 fmw
 swM
@@ -45014,7 +45014,7 @@ jEJ
 htS
 hsM
 mJM
-dCZ
+hIa
 fmw
 raW
 htS
@@ -45822,7 +45822,7 @@ vZs
 htS
 fxH
 haR
-pIE
+dSH
 agw
 raW
 htS
@@ -46024,7 +46024,7 @@ vZs
 jEJ
 haR
 haR
-ddo
+sGT
 lGi
 iDZ
 iDZ
@@ -46226,7 +46226,7 @@ vZs
 htS
 haR
 haR
-ddo
+sGT
 htS
 afY
 hUL
@@ -92902,7 +92902,7 @@ bJI
 bJI
 bJI
 ebf
-iNp
+tTL
 bJI
 iqp
 iqp
@@ -95728,7 +95728,7 @@ ftQ
 ftQ
 iqp
 iqp
-iNp
+tTL
 ePk
 ePk
 ePk
@@ -96541,7 +96541,7 @@ hHl
 ePk
 vYG
 bJI
-cpJ
+kba
 bJI
 iqp
 stl
@@ -98152,7 +98152,7 @@ oab
 oab
 iqp
 bJI
-iNp
+tTL
 iqp
 iqp
 eRF
@@ -133553,13 +133553,13 @@ ofK
 ndM
 ndM
 vCp
-sRt
+rAD
 ndM
 ndM
 dHT
 ndM
 ndM
-cOe
+oPl
 sHs
 sHs
 fZb
@@ -133963,7 +133963,7 @@ ndM
 qhN
 qhN
 ndM
-cOe
+oPl
 eOi
 eOi
 iKw
@@ -134159,7 +134159,7 @@ sMQ
 oPv
 ndM
 ndM
-kou
+dji
 ndM
 pIw
 dFe
@@ -174365,7 +174365,7 @@ sMQ
 tGi
 sMQ
 bRZ
-nWi
+bVq
 xBT
 wLw
 wLw
@@ -174559,7 +174559,7 @@ vFt
 oUv
 wLw
 cCo
-aiO
+onL
 bRZ
 cCo
 dZD
diff --git a/_maps/map_files/rosewood/rosewood.dmm b/_maps/map_files/rosewood/rosewood.dmm
index adc79033267..27eaf1689f2 100644
--- a/_maps/map_files/rosewood/rosewood.dmm
+++ b/_maps/map_files/rosewood/rosewood.dmm
@@ -558,6 +558,28 @@
 	},
 /turf/open/floor/cobble,
 /area/outdoors/town)
+"aos" = (
+/obj/structure/fluff/railing/border{
+	dir = 1
+	},
+/obj/structure/fluff/railing/border{
+	dir = 4
+	},
+/obj/structure/fluff/railing/border{
+	dir = 5
+	},
+/obj/machinery/light/fueled/firebowl,
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = -6;
+	pixel_x = -7
+	},
+/obj/effect/decal/borderfall{
+	dir = 4;
+	pixel_y = -8
+	},
+/turf/open/floor/ruinedwood/turned,
+/area/indoors/town/tavern)
 "aow" = (
 /obj/machinery/light/fueled/wallfire{
 	pixel_x = -32
@@ -1561,6 +1583,18 @@
 /obj/structure/fake_machine/scomm/r,
 /turf/open/floor/blocks/stonered/tiny,
 /area/indoors/town/dwarfin)
+"aPt" = (
+/obj/effect/decal/shadow_floor,
+/obj/effect/decal/shadow_floor{
+	pixel_y = -14
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 0;
+	pixel_x = 18
+	},
+/turf/open/floor/carpet,
+/area/indoors/town/theatre)
 "aPy" = (
 /obj/structure/fluff/railing/border,
 /obj/structure/table/wood/plain,
@@ -1574,6 +1608,17 @@
 /obj/structure/closet/dirthole/closed,
 /turf/open/floor/dirt,
 /area/under/town/sewer)
+"aPE" = (
+/obj/structure/pillory,
+/obj/structure/fluff/railing/border{
+	dir = 1
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = -6
+	},
+/turf/open/floor/cobblerock,
+/area/outdoors/town)
 "aPG" = (
 /obj/structure/chair/wood/alt{
 	dir = 8
@@ -2193,11 +2238,6 @@
 "bbP" = (
 /turf/open/water/swamp/deep,
 /area/outdoors/basin)
-"bck" = (
-/obj/structure/toilet,
-/obj/structure/fluff/clodpile/dirt,
-/turf/open/floor/greenstone,
-/area/under/town/basement)
 "bcv" = (
 /turf/closed/wall/mineral/stone,
 /area/indoors/town/steward)
@@ -2578,17 +2618,6 @@
 /obj/structure/fake_machine/scomm,
 /turf/open/floor/churchmarble,
 /area/indoors/town/keep)
-"boK" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/shadow_floor,
-/obj/effect/decal/shadow_floor{
-	pixel_y = -14
-	},
-/turf/open/floor/ruinedwood/spiralfade,
-/area/indoors/town/theatre)
 "boM" = (
 /obj/effect/mapping_helpers/secret_door_creator/keep{
 	redstone_id = "RosewoodM10"
@@ -3165,6 +3194,14 @@
 /obj/structure/rack/shelf/biggest,
 /turf/open/floor/ruinedwood/turned/darker,
 /area/indoors/town/keep)
+"bDn" = (
+/obj/structure/fermentation_keg/random/beer,
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/wood,
+/area/indoors/town/keep)
 "bDB" = (
 /obj/structure/closet/crate/chest/gold,
 /obj/item/key/vault,
@@ -4326,6 +4363,29 @@
 	},
 /turf/open/floor/cobblerock/alt,
 /area/under/town/basement)
+"cco" = (
+/obj/effect/decal/shadow_floor{
+	dir = 4
+	},
+/obj/effect/decal/shadow_floor,
+/obj/effect/decal/shadow_floor{
+	pixel_y = -14;
+	pixel_x = 9
+	},
+/obj/machinery/light/fueled/wallfire/candle/lamp{
+	pixel_y = 6
+	},
+/obj/effect/decal/borderfall{
+	dir = 8;
+	pixel_y = 0
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 0;
+	pixel_x = 9
+	},
+/turf/open/floor/ruinedwood/spiralfade,
+/area/indoors/town/theatre)
 "ccF" = (
 /obj/item/storage/sack,
 /turf/open/floor/dirt,
@@ -4739,6 +4799,14 @@
 /obj/structure/mannequin/male/female,
 /turf/open/floor/ruinedwood/turned/darker,
 /area/indoors/town)
+"cno" = (
+/obj/machinery/light/fueled/hearth,
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/wood,
+/area/indoors/town/keep)
 "cnq" = (
 /obj/structure/door,
 /obj/effect/mapping_helpers/access/keyset/church/grave,
@@ -5557,6 +5625,10 @@
 	dir = 4
 	},
 /area/indoors/town)
+"cFy" = (
+/obj/effect/landmark/start/blacksmith,
+/turf/open/floor/blocks,
+/area/indoors/town/smithy)
 "cFM" = (
 /obj/structure/chair/wood/alt/chair_noble/red{
 	dir = 8
@@ -5866,16 +5938,6 @@
 /obj/machinery/essence/splitter,
 /turf/open/floor/cobble,
 /area/indoors/town/keep/magician)
-"cMr" = (
-/obj/structure/fluff/railing/border{
-	dir = 1
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/carpet,
-/area/indoors/town/tavern)
 "cMC" = (
 /obj/machinery/light/fueledstreet/blue,
 /turf/open/floor/snow,
@@ -6015,6 +6077,29 @@
 	},
 /turf/open/floor/wood,
 /area/indoors/town/orphanage)
+"cQS" = (
+/obj/structure/fluff/railing/border{
+	dir = 1
+	},
+/obj/structure/fluff/railing/border{
+	dir = 8
+	},
+/obj/structure/fluff/railing/border{
+	dir = 9
+	},
+/obj/machinery/light/fueled/firebowl,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/borderfall{
+	dir = 8;
+	pixel_y = -8
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = -6;
+	pixel_x = 8
+	},
+/turf/open/floor/ruinedwood/turned/darker,
+/area/indoors/town/tavern)
 "cQW" = (
 /obj/structure/closet/crate/drawer,
 /obj/item/key/apartments/apartment14,
@@ -6479,14 +6564,6 @@
 	},
 /turf/open/openspace,
 /area/indoors/villagegarrison)
-"cZh" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fake_machine/musicbox/mannor,
-/turf/open/floor/tile,
-/area/indoors/town/keep)
 "cZl" = (
 /obj/machinery/light/fueledstreet/blue/wall{
 	pixel_y = -6;
@@ -6948,6 +7025,16 @@
 /obj/structure/bed/sleepingbag,
 /turf/open/floor/cobble/alt,
 /area/indoors/town/cell)
+"dmN" = (
+/obj/structure/fluff/railing/border{
+	dir = 5
+	},
+/obj/effect/decal/borderfall{
+	dir = 4;
+	pixel_y = 10
+	},
+/turf/open/floor/ruinedwood/turned/darker,
+/area/indoors/town/tavern)
 "dmO" = (
 /obj/structure/door/violet{
 	name = "Head Servant's Quarters"
@@ -6994,24 +7081,6 @@
 "doa" = (
 /turf/open/floor/hexstone,
 /area/indoors/town/steward)
-"dol" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/closet/crate/crafted_closet,
-/obj/item/book/law,
-/obj/item/paper,
-/obj/item/paper,
-/obj/item/paper,
-/obj/item/paper,
-/obj/item/paper,
-/obj/item/paper,
-/obj/item/paper,
-/obj/item/paper,
-/obj/item/natural/feather,
-/turf/open/floor/tile,
-/area/indoors/town/keep)
 "dor" = (
 /obj/structure/stairs{
 	dir = 8
@@ -7318,13 +7387,6 @@
 	dir = 4
 	},
 /area/outdoors/town/roofs)
-"dwb" = (
-/obj/effect/decal/cobbleedge{
-	icon_state = "borderfall";
-	dir = 1
-	},
-/turf/open/floor/cobble/snow,
-/area/outdoors/town)
 "dwc" = (
 /obj/structure/stairs{
 	dir = 4
@@ -7499,6 +7561,21 @@
 /obj/structure/fluff/walldeco/vinez/blue,
 /turf/closed/wall/mineral/wood,
 /area/outdoors/town)
+"dzm" = (
+/obj/effect/decal/shadow_floor,
+/obj/effect/decal/shadow_floor{
+	pixel_y = -14
+	},
+/obj/machinery/light/fueled/wallfire/candle/lamp{
+	pixel_y = 6
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 0;
+	pixel_x = 18
+	},
+/turf/open/floor/ruinedwood/turned/darker,
+/area/indoors/town/theatre)
 "dzH" = (
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town/noble_manor/red)
@@ -7870,6 +7947,16 @@
 "dLh" = (
 /turf/open/floor/wood/nosmooth,
 /area/indoors)
+"dLo" = (
+/obj/structure/fluff/railing/border{
+	dir = 1
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = -6
+	},
+/turf/open/floor/carpet,
+/area/indoors/town/tavern)
 "dLw" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/greenstone,
@@ -8340,16 +8427,6 @@
 "dXO" = (
 /turf/open/floor/cobblerock,
 /area/indoors/town/tavern)
-"dYe" = (
-/obj/structure/fluff/statue/astrata{
-	pixel_y = 1
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/church,
-/area/indoors/town/church/chapel)
 "dYl" = (
 /turf/open/floor/metal/barograte,
 /area/indoors/town/clocktower)
@@ -9166,6 +9243,23 @@
 /obj/structure/flora/grass/water/reeds,
 /turf/open/water,
 /area/under/cavewet)
+"etu" = (
+/obj/structure/fluff/railing/border{
+	dir = 1
+	},
+/obj/machinery/light/fueled/wallfire/candle/r,
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = -6;
+	pixel_x = 8
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = -6;
+	pixel_x = -8
+	},
+/turf/open/floor/ruinedwood/turned/darker,
+/area/indoors/town/tavern)
 "etA" = (
 /obj/structure/hotspring,
 /obj/structure/flora/hotspring_rocks/grassy,
@@ -10671,19 +10765,6 @@
 /obj/structure/bars/alt,
 /turf/open/floor/ruinedwood/turned/darker,
 /area/indoors/town)
-"ffx" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/stairs{
-	dir = 1
-	},
-/obj/structure/fluff/railing/border{
-	dir = 8
-	},
-/turf/open/floor/tile/masonic,
-/area/indoors/town/keep)
 "ffK" = (
 /obj/structure/meathook,
 /obj/item/reagent_containers/glass/bucket/wooden,
@@ -10964,6 +11045,16 @@
 /obj/structure/fluff/clock,
 /turf/open/floor/ruinedwood/darker,
 /area/indoors/town)
+"flz" = (
+/obj/structure/fluff/statue/astrata{
+	pixel_y = 1
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/church,
+/area/indoors/town/church/chapel)
 "flB" = (
 /obj/structure/stairs/stone/reddish{
 	dir = 1
@@ -11511,13 +11602,6 @@
 	},
 /turf/open/floor/carpet,
 /area/indoors/town/tavern)
-"fzE" = (
-/obj/effect/decal/cobbleedge{
-	icon_state = "borderfall";
-	dir = 1
-	},
-/turf/closed/wall/mineral/stone,
-/area/outdoors/town)
 "fzH" = (
 /obj/structure/bars/pipe{
 	dir = 4
@@ -11690,6 +11774,29 @@
 /obj/machinery/light/fueled/wallfire/candle/blue,
 /turf/open/floor/wood,
 /area/indoors/town/keep/magician)
+"fFv" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/shadow_floor{
+	dir = 5;
+	pixel_y = 32;
+	pixel_x = 32
+	},
+/obj/effect/decal/shadow_floor{
+	pixel_y = -14;
+	pixel_x = 16
+	},
+/obj/effect/decal/shadow_floor{
+	dir = 8;
+	pixel_x = -14;
+	pixel_y = 15
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 0;
+	pixel_x = 18
+	},
+/turf/open/floor/ruinedwood/spiralfade,
+/area/indoors/town/theatre)
 "fFw" = (
 /obj/structure/window/stained/silver/alt,
 /turf/open/floor/cobble,
@@ -11725,26 +11832,6 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/indoors/town/keep)
-"fGJ" = (
-/obj/effect/decal/cobbleedge{
-	dir = 4;
-	icon_state = "borderfall";
-	pixel_y = -14
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 4;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/shadow_floor{
-	dir = 8
-	},
-/obj/effect/decal/shadow_floor{
-	dir = 8;
-	pixel_x = -14;
-	pixel_y = 15
-	},
-/turf/open/floor/ruinedwood/spiralfade,
-/area/indoors/town/theatre)
 "fGS" = (
 /obj/machinery/light/fueled/wallfire/candle,
 /turf/open/floor/tile/masonic,
@@ -12085,13 +12172,6 @@
 /obj/structure/bars,
 /turf/open/floor/cobble,
 /area/under/town/basement)
-"fPW" = (
-/obj/effect/decal/cobbleedge{
-	icon_state = "borderfall";
-	dir = 1
-	},
-/turf/open/floor/cobblerock/snow,
-/area/outdoors/town)
 "fQb" = (
 /obj/structure/fluff/walldeco/church/line{
 	dir = 1
@@ -12197,10 +12277,6 @@
 "fTm" = (
 /turf/open/floor/naturalstone,
 /area/under/town/sewer)
-"fTG" = (
-/obj/effect/landmark/start/blacksmith,
-/turf/open/floor/blocks,
-/area/indoors/town/smithy)
 "fTI" = (
 /obj/machinery/light/fueled/hearth,
 /obj/machinery/light/fueled/oven/east,
@@ -12337,6 +12413,13 @@
 /obj/machinery/light/fueled/torchholder/l,
 /turf/open/floor/tile,
 /area/indoors/town/shop)
+"fWP" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/tile/masonic,
+/area/indoors/town/keep)
 "fWZ" = (
 /turf/open/floor/ruinedwood/turned/darker,
 /area/under/town/basement)
@@ -12402,35 +12485,6 @@
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/cobble,
 /area/indoors/town/church/inquisition)
-"fYr" = (
-/obj/effect/decal/cobbleedge{
-	dir = 4;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall";
-	pixel_y = 0;
-	pixel_x = -9
-	},
-/obj/effect/decal/shadow_floor,
-/obj/effect/decal/shadow_floor{
-	dir = 8
-	},
-/obj/effect/decal/shadow_floor{
-	pixel_y = -14;
-	pixel_x = -9
-	},
-/obj/effect/decal/shadow_floor{
-	dir = 8;
-	pixel_x = -14;
-	pixel_y = -6
-	},
-/obj/machinery/light/fueled/wallfire/candle/lamp{
-	pixel_y = 6
-	},
-/turf/open/floor/ruinedwood/spiralfade,
-/area/indoors/town/theatre)
 "fYt" = (
 /obj/structure/bookcase/random,
 /turf/open/floor/carpet/purple,
@@ -12898,6 +12952,19 @@
 	},
 /turf/open/floor/dirt/road,
 /area/outdoors/town)
+"gix" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/shadow_floor,
+/obj/effect/decal/shadow_floor{
+	pixel_y = -14
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 0;
+	pixel_x = 16
+	},
+/turf/open/floor/ruinedwood/spiralfade,
+/area/indoors/town/theatre)
 "giI" = (
 /obj/structure/fermentation_keg/random/water,
 /turf/open/floor/ruinedwood/spiral,
@@ -14954,21 +15021,6 @@
 "hii" = (
 /turf/open/floor/blocks/paving,
 /area/indoors/town/garrison)
-"hir" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/stairs{
-	dir = 1
-	},
-/obj/structure/fluff/railing/border{
-	dir = 8
-	},
-/turf/open/floor/tile/masonic{
-	dir = 4
-	},
-/area/indoors/town/keep)
 "his" = (
 /obj/structure/flora/grass/bush/tundra,
 /obj/effect/landmark/start/vagrant,
@@ -15472,18 +15524,6 @@
 	},
 /turf/open/floor/cobble,
 /area/outdoors/town)
-"hvk" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/shadow_floor,
-/obj/effect/decal/shadow_floor{
-	pixel_y = -14
-	},
-/turf/open/floor/ruinedwood/spiralfade,
-/area/indoors/town/theatre)
 "hvA" = (
 /obj/structure/stairs/stone{
 	dir = 1
@@ -16128,24 +16168,6 @@
 	},
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town/church/chapel)
-"hLs" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/shadow_floor{
-	dir = 5;
-	pixel_y = 32;
-	pixel_x = 32
-	},
-/obj/effect/decal/shadow_floor{
-	pixel_y = -14;
-	pixel_x = 16
-	},
-/obj/effect/decal/shadow_floor{
-	dir = 8;
-	pixel_x = -14;
-	pixel_y = 15
-	},
-/turf/open/floor/ruinedwood/spiralfade,
-/area/indoors/town/theatre)
 "hLJ" = (
 /obj/structure/fluff/railing/border{
 	dir = 4
@@ -17426,6 +17448,18 @@
 /obj/item/servant_bell,
 /turf/open/floor/ruinedwood/turned/darker,
 /area/indoors/town/noble_manor/blue)
+"iuL" = (
+/obj/structure/fluff/railing/border{
+	dir = 4
+	},
+/obj/structure/fluff/railing/border{
+	dir = 8
+	},
+/obj/structure/industrial_lift/tram{
+	icon_state = "vertw"
+	},
+/turf/open/openspace,
+/area/outdoors/mountains)
 "iuV" = (
 /obj/effect/spawner/map_spawner/hauntz_random,
 /turf/open/floor/cobble,
@@ -18686,6 +18720,16 @@
 /obj/effect/mapping_helpers/access/locker,
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town)
+"iZG" = (
+/obj/effect/landmark/start/blacksmith{
+	dir = 1
+	},
+/obj/effect/decal/carpet/square/black{
+	pixel_x = -2;
+	pixel_y = 16
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town/smithy)
 "iZK" = (
 /turf/open/floor/cobble,
 /area/outdoors/town/noble_manor/blue)
@@ -18865,6 +18909,13 @@
 /obj/structure/closet/crate/chest/crate,
 /turf/open/floor/tile/tilerg,
 /area/indoors/town)
+"jew" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/cobblerock/snow,
+/area/outdoors/town)
 "jeH" = (
 /obj/structure/table/map{
 	dir = 9
@@ -19665,6 +19716,9 @@
 	},
 /turf/open/floor/blocks,
 /area/indoors/town/cell)
+"jAC" = (
+/turf/closed/wall/mineral/stone,
+/area/outdoors/town)
 "jAM" = (
 /turf/open/floor/grass/cold,
 /area/indoors/town/theatre)
@@ -19820,10 +19874,6 @@
 /obj/machinery/light/fueled/wallfire/candle/blue/l,
 /turf/open/floor/metal/barograte,
 /area/indoors/town/clocktower)
-"jFd" = (
-/obj/effect/landmark/start/blacksmith,
-/turf/open/floor/ruinedwood,
-/area/indoors/town/smithy)
 "jFk" = (
 /obj/machinery/light/fueled/torchholder{
 	dir = 8
@@ -19878,6 +19928,24 @@
 /obj/structure/window/openclose,
 /turf/open/floor/grass/cold,
 /area/indoors/soilsons)
+"jGN" = (
+/obj/structure/closet/crate/crafted_closet,
+/obj/item/book/law,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/paper,
+/obj/item/natural/feather,
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/tile,
+/area/indoors/town/keep)
 "jGZ" = (
 /obj/structure/fluff/walldeco/bigpainting/lake,
 /obj/structure/bed/inn/double,
@@ -20747,6 +20815,14 @@
 "kbc" = (
 /turf/open/floor/blocks,
 /area/indoors/town/keep/magician)
+"kbg" = (
+/obj/structure/fake_machine/musicbox/mannor,
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/wood,
+/area/indoors/town/keep)
 "kby" = (
 /obj/structure/fermentation_keg/water,
 /turf/open/floor/herringbone,
@@ -21241,17 +21317,6 @@
 "kpX" = (
 /turf/closed/wall/mineral/pipe,
 /area/indoors/town)
-"kqe" = (
-/obj/effect/decal/cobbleedge{
-	icon_state = "borderfall";
-	dir = 1
-	},
-/obj/structure/pillory,
-/obj/structure/fluff/railing/border{
-	dir = 1
-	},
-/turf/open/floor/cobblerock,
-/area/outdoors/town)
 "kqj" = (
 /obj/structure/chair/wood/alt/chair3{
 	dir = 1
@@ -22005,30 +22070,6 @@
 	},
 /turf/open/floor/wood/nosmooth/saiga,
 /area/indoors/town/shop)
-"kHO" = (
-/obj/effect/decal/cobbleedge{
-	dir = 8;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall";
-	pixel_y = 0;
-	pixel_x = 7
-	},
-/obj/effect/decal/shadow_floor{
-	dir = 4
-	},
-/obj/effect/decal/shadow_floor,
-/obj/effect/decal/shadow_floor{
-	pixel_y = -14;
-	pixel_x = 7
-	},
-/obj/machinery/light/fueled/wallfire/candle/lamp{
-	pixel_y = 6
-	},
-/turf/open/floor/ruinedwood/spiralfade,
-/area/indoors/town/theatre)
 "kHP" = (
 /obj/machinery/light/fueled/wallfire/candle/r,
 /obj/structure/fluff/statue/knight/interior/r,
@@ -22570,6 +22611,34 @@
 	dir = 8
 	},
 /area/indoors/town)
+"kTW" = (
+/obj/effect/decal/shadow_floor,
+/obj/effect/decal/shadow_floor{
+	dir = 8
+	},
+/obj/effect/decal/shadow_floor{
+	pixel_y = -14;
+	pixel_x = -9
+	},
+/obj/effect/decal/shadow_floor{
+	dir = 8;
+	pixel_x = -14;
+	pixel_y = -6
+	},
+/obj/machinery/light/fueled/wallfire/candle/lamp{
+	pixel_y = 6
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 0;
+	pixel_x = -9
+	},
+/obj/effect/decal/borderfall{
+	dir = 4;
+	pixel_y = 0
+	},
+/turf/open/floor/ruinedwood/spiralfade,
+/area/indoors/town/theatre)
 "kUa" = (
 /obj/machinery/light/fueled/firebowl/standing/blue,
 /turf/open/floor/naturalstone,
@@ -22786,13 +22855,6 @@
 /obj/structure/fake_machine/drugmachine,
 /turf/open/floor/twig,
 /area/indoors/town/bath)
-"kZD" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/wood,
-/area/indoors/town/keep)
 "kZG" = (
 /obj/structure/closet/crate/crafted_closet/dark,
 /obj/item/rope/chain,
@@ -23081,6 +23143,23 @@
 	},
 /turf/open/floor/ruinedwood/chevron,
 /area/indoors/town/merc_guild)
+"lgM" = (
+/obj/structure/fluff/railing/border{
+	dir = 1
+	},
+/obj/machinery/light/fueled/wallfire/candle/l,
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = -6;
+	pixel_x = -8
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = -6;
+	pixel_x = 8
+	},
+/turf/open/floor/ruinedwood/turned/darker,
+/area/indoors/town/tavern)
 "lgN" = (
 /turf/open/floor/carpet/royalblack,
 /area/indoors/town/merc_guild)
@@ -23410,17 +23489,6 @@
 /obj/effect/mapping_helpers/access/locker,
 /turf/open/floor/blocks,
 /area/indoors/town/church/inquisition)
-"lqH" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/shadow_floor,
-/obj/effect/decal/shadow_floor{
-	pixel_y = -14
-	},
-/turf/open/floor/carpet,
-/area/indoors/town/theatre)
 "lqI" = (
 /obj/structure/fluff/railing/border{
 	dir = 10
@@ -23557,6 +23625,26 @@
 	},
 /turf/open/floor/wood,
 /area/indoors/town/keep)
+"luY" = (
+/obj/structure/fluff/railing/border{
+	dir = 9;
+	pixel_x = -11;
+	pixel_y = -24
+	},
+/obj/effect/decal/shadow_floor{
+	dir = 4
+	},
+/obj/effect/decal/shadow_floor{
+	dir = 4;
+	pixel_x = 14;
+	pixel_y = 18
+	},
+/obj/effect/decal/borderfall{
+	dir = 8;
+	pixel_y = 0
+	},
+/turf/open/floor/ruinedwood/spiralfade,
+/area/indoors/town/theatre)
 "lvq" = (
 /obj/effect/decal/carpet/square{
 	pixel_y = 9;
@@ -23600,14 +23688,6 @@
 /obj/machinery/light/fueled/wallfire/candle/r,
 /turf/open/floor/ruinedwood/turned/darker,
 /area/indoors/town/orphanage)
-"lxc" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fermentation_keg/random/beer,
-/turf/open/floor/wood,
-/area/indoors/town/keep)
 "lxy" = (
 /obj/machinery/light/fueled/wallfire/candle,
 /turf/open/floor/blocks/green,
@@ -23701,6 +23781,11 @@
 	},
 /turf/open/floor/ruinedwood/darker,
 /area/indoors/town)
+"lzS" = (
+/obj/structure/toilet,
+/obj/structure/fluff/clodpile/dirt,
+/turf/open/floor/greenstone,
+/area/under/town/basement)
 "lAo" = (
 /obj/structure/door,
 /turf/open/floor/ruinedwood/darker,
@@ -23798,6 +23883,17 @@
 /obj/item/lockpick,
 /turf/open/floor/hexstone,
 /area/under/town/basement)
+"lCT" = (
+/obj/machinery/light/fueled/firebowl/church{
+	pixel_x = 2;
+	pixel_y = 1
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/church,
+/area/indoors/town/church/chapel)
 "lCU" = (
 /obj/structure/chair/bench/church{
 	dir = 1
@@ -23942,21 +24038,6 @@
 /obj/machinery/light/fueled/wallfire/candle,
 /turf/open/floor/blocks/newstone/alt,
 /area/indoors/town)
-"lFT" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/stairs{
-	dir = 1
-	},
-/obj/structure/fluff/railing/border{
-	dir = 4
-	},
-/turf/open/floor/tile/masonic{
-	dir = 1
-	},
-/area/indoors/town/keep)
 "lGf" = (
 /obj/structure/table/wood/plain,
 /obj/item/toy/cards/deck,
@@ -24708,17 +24789,6 @@
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/cobblerock/alt,
 /area/indoors/town/church/inquisition)
-"mbC" = (
-/obj/machinery/light/fueled/firebowl/church{
-	pixel_x = -3;
-	pixel_y = 1
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/church,
-/area/indoors/town/church/chapel)
 "mbJ" = (
 /obj/machinery/light/fueled/forge,
 /turf/open/floor/hexstone,
@@ -25367,6 +25437,13 @@
 /obj/machinery/light/fueled/torchholder/l,
 /turf/open/floor/dirt/road,
 /area/outdoors/basin)
+"mqm" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/cobble/snow,
+/area/outdoors/town)
 "mqo" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/water/cleanshallow,
@@ -25398,16 +25475,6 @@
 /obj/structure/fermentation_keg/random/water,
 /turf/open/floor/herringbone,
 /area/under/town/basement)
-"mrS" = (
-/obj/effect/landmark/start/blacksmith{
-	dir = 1
-	},
-/obj/effect/decal/carpet/square/black{
-	pixel_x = -2;
-	pixel_y = 16
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town/smithy)
 "mrV" = (
 /obj/structure/lever/hidden/keep{
 	redstone_id = "RosewoodM22"
@@ -25788,6 +25855,12 @@
 /obj/structure/fluff/walldeco/chains,
 /turf/open/floor/metal/barograte,
 /area/indoors/town/garrison)
+"mEG" = (
+/obj/effect/landmark/start/blacksmith{
+	dir = 1
+	},
+/turf/open/floor/cobble,
+/area/indoors/town/smithy)
 "mEI" = (
 /obj/machinery/light/fueled/wallfire/candle/blue/l,
 /turf/open/floor/tile/bath,
@@ -26230,6 +26303,17 @@
 	},
 /turf/open/floor/cobblerock/snow,
 /area/outdoors/basin/safe)
+"mNx" = (
+/obj/structure/stairs{
+	dir = 1
+	},
+/obj/structure/fluff/railing/border{
+	dir = 8
+	},
+/turf/open/floor/tile/masonic{
+	dir = 4
+	},
+/area/indoors/town/keep)
 "mNz" = (
 /obj/structure/fireaxecabinet{
 	pixel_y = 30
@@ -26562,6 +26646,15 @@
 /obj/structure/bed/shit,
 /turf/open/floor/metal/barograte,
 /area/indoors/town/garrison)
+"mXh" = (
+/obj/structure/stairs{
+	dir = 1
+	},
+/obj/structure/fluff/railing/border{
+	dir = 8
+	},
+/turf/open/floor/tile/masonic,
+/area/indoors/town/keep)
 "mXx" = (
 /obj/structure/fluff/railing/border,
 /turf/open/floor/snow/patchy,
@@ -27205,13 +27298,6 @@
 /obj/effect/mapping_helpers/access/locker,
 /turf/open/floor/wood,
 /area/indoors/town/tavern)
-"nlu" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/tile/masonic,
-/area/indoors/town/keep)
 "nlA" = (
 /turf/open/floor/cobble,
 /area/indoors/town/keep/magician)
@@ -27393,6 +27479,18 @@
 	},
 /turf/open/floor/wood,
 /area/indoors/town/keep)
+"npq" = (
+/obj/effect/decal/shadow_floor,
+/obj/effect/decal/shadow_floor{
+	pixel_y = -14
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 0;
+	pixel_x = 18
+	},
+/turf/open/floor/ruinedwood/spiralfade,
+/area/indoors/town/theatre)
 "nps" = (
 /obj/structure/rack,
 /obj/item/clothing/cloak/stabard{
@@ -28856,12 +28954,13 @@
 	},
 /turf/open/floor/wood,
 /area/outdoors/town)
-"nXW" = (
-/obj/effect/landmark/start/blacksmith{
-	dir = 1
+"nXF" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
 	},
-/turf/open/floor/cobble,
-/area/indoors/town/smithy)
+/turf/open/floor/wood,
+/area/indoors/town/keep)
 "nXY" = (
 /obj/structure/table/wood/plain_alt,
 /obj/item/paper{
@@ -29689,14 +29788,6 @@
 /obj/structure/chair/stool/crafted,
 /turf/open/floor/ruinedwood/turned/darker,
 /area/indoors/town)
-"ood" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/machinery/light/fueled/hearth,
-/turf/open/floor/wood,
-/area/indoors/town/keep)
 "oog" = (
 /obj/structure/apiary/starter,
 /turf/open/floor/dirt/road,
@@ -29905,12 +29996,6 @@
 	},
 /turf/open/floor/tile,
 /area/indoors/town/keep)
-"osa" = (
-/obj/effect/landmark/start/blacksmith{
-	dir = 1
-	},
-/turf/open/floor/ruinedwood,
-/area/indoors/town/smithy)
 "osO" = (
 /obj/structure/fluff/signage{
 	dir = 8;
@@ -30264,6 +30349,16 @@
 	},
 /turf/open/floor/grass/cold,
 /area/outdoors/town/noble_manor/blue)
+"oDK" = (
+/obj/structure/fluff/railing/border{
+	dir = 1
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = -6
+	},
+/turf/open/floor/cobblerock,
+/area/outdoors/town)
 "oDL" = (
 /obj/structure/bed/shit,
 /turf/open/floor/cobble/alt,
@@ -30716,22 +30811,6 @@
 	},
 /turf/open/floor/cobblerock/alt,
 /area/outdoors/town)
-"oOC" = (
-/obj/effect/decal/cobbleedge{
-	icon_state = "jagged";
-	dir = 4
-	},
-/obj/structure/fluff/railing/border{
-	dir = 4
-	},
-/obj/structure/fluff/railing/border{
-	dir = 8
-	},
-/obj/structure/industrial_lift/tram{
-	icon_state = "vertw"
-	},
-/turf/open/openspace,
-/area/outdoors/mountains)
 "oOO" = (
 /obj/effect/mapping_helpers/secret_door_creator/keep{
 	redstone_id = "RosewoodM23"
@@ -31523,6 +31602,17 @@
 "phO" = (
 /turf/open/floor/metal/alt,
 /area/outdoors/basin/safe)
+"phR" = (
+/obj/structure/fluff/railing/border{
+	dir = 9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/borderfall{
+	dir = 8;
+	pixel_y = 10
+	},
+/turf/open/floor/ruinedwood/turned/darker,
+/area/indoors/town/tavern)
 "phS" = (
 /obj/structure/fluff/railing/border,
 /turf/open/floor/metal,
@@ -31582,6 +31672,14 @@
 "piL" = (
 /turf/open/floor/carpet,
 /area/indoors/town/clocktower)
+"piM" = (
+/obj/structure/fermentation_keg/water,
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/wood,
+/area/indoors/town/keep)
 "piQ" = (
 /obj/structure/closet/crate/crafted_closet/inn,
 /obj/item/broom,
@@ -32291,14 +32389,6 @@
 	},
 /turf/open/floor/rooftop,
 /area/outdoors/town/roofs)
-"pBI" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fake_machine/musicbox/mannor,
-/turf/open/floor/wood,
-/area/indoors/town/keep)
 "pBM" = (
 /obj/structure/fluff/railing/border,
 /obj/structure/chair/wood/alt/chair_noble,
@@ -33646,14 +33736,6 @@
 /obj/machinery/light/fueled/wallfire/big_fireplace,
 /turf/closed/wall/mineral/stonebrick/reddish,
 /area/indoors/town/shop)
-"qqR" = (
-/obj/structure/closet/crate/drawer,
-/obj/item/natural/clod/dirt,
-/obj/machinery/light/fueled/wallfire/candle/l{
-	pixel_x = 32
-	},
-/turf/open/floor/ruinedwood/turned/darker,
-/area/indoors/town/orphanage)
 "qrd" = (
 /obj/structure/closet/crate/chest/crate,
 /obj/item/natural/cloth,
@@ -35592,13 +35674,6 @@
 	},
 /turf/open/floor/cobble,
 /area/under/town/sewer)
-"rmj" = (
-/obj/structure/fluff/railing/border{
-	dir = 9
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/ruinedwood/turned/darker,
-/area/indoors/town/tavern)
 "rmv" = (
 /obj/structure/table/map{
 	dir = 9
@@ -35787,6 +35862,21 @@
 /mob/living/carbon/human/species/skeleton/npc/peasant,
 /turf/open/floor/herringbone,
 /area/indoors/town)
+"rts" = (
+/obj/structure/fluff/railing/border{
+	dir = 4
+	},
+/obj/structure/fluff/railing/border{
+	dir = 8
+	},
+/obj/machinery/light/fueled/torchholder{
+	pixel_y = -10
+	},
+/obj/structure/industrial_lift/tram{
+	icon_state = "vertw"
+	},
+/turf/open/openspace,
+/area/outdoors/mountains)
 "rtt" = (
 /obj/machinery/light/fueled/firebowl,
 /turf/open/floor/snow/patchy,
@@ -36537,17 +36627,6 @@
 /obj/item/coin/silver/pile,
 /turf/open/floor/tile/masonic/spiral,
 /area/indoors/town)
-"rJk" = (
-/obj/machinery/light/fueled/firebowl/church{
-	pixel_x = 2;
-	pixel_y = 1
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/church,
-/area/indoors/town/church/chapel)
 "rJm" = (
 /obj/structure/plough,
 /turf/open/floor/dirt,
@@ -37093,6 +37172,12 @@
 /obj/structure/bookcase,
 /turf/open/floor/hexstone,
 /area/under/town/basement)
+"rVF" = (
+/obj/effect/landmark/start/blacksmith{
+	dir = 1
+	},
+/turf/open/floor/ruinedwood,
+/area/indoors/town/smithy)
 "rVS" = (
 /obj/machinery/light/fueledstreet/blue/wall,
 /turf/open/floor/cobblerock,
@@ -37516,27 +37601,6 @@
 "sgr" = (
 /turf/open/floor/carpet/red,
 /area/indoors/town/garrison)
-"sgt" = (
-/obj/structure/fluff/railing/border{
-	dir = 1
-	},
-/obj/structure/fluff/railing/border{
-	dir = 4
-	},
-/obj/structure/fluff/railing/border{
-	dir = 5
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 4;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/machinery/light/fueled/firebowl,
-/turf/open/floor/ruinedwood/turned,
-/area/indoors/town/tavern)
 "sgT" = (
 /obj/machinery/light/fueled/firebowl/stump,
 /turf/open/floor/dirt/road,
@@ -37577,25 +37641,6 @@
 "sin" = (
 /turf/closed/wall/mineral/stonebrick,
 /area/under/cave)
-"siv" = (
-/obj/effect/decal/cobbleedge{
-	icon_state = "jagged";
-	dir = 4
-	},
-/obj/structure/fluff/railing/border{
-	dir = 4
-	},
-/obj/structure/fluff/railing/border{
-	dir = 8
-	},
-/obj/machinery/light/fueled/torchholder{
-	pixel_y = -10
-	},
-/obj/structure/industrial_lift/tram{
-	icon_state = "vertw"
-	},
-/turf/open/openspace,
-/area/outdoors/mountains)
 "siz" = (
 /obj/structure/fluff/railing/border{
 	dir = 1
@@ -37838,17 +37883,6 @@
 	},
 /turf/open/floor/blocks/stonered,
 /area/indoors/town/keep)
-"sqo" = (
-/obj/structure/fluff/railing/border{
-	dir = 1
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/machinery/light/fueled/wallfire/candle/l,
-/turf/open/floor/ruinedwood/turned/darker,
-/area/indoors/town/tavern)
 "sqA" = (
 /obj/machinery/light/fueled/wallfire/candle/r,
 /turf/open/floor/ruinedwood/turned/darker,
@@ -38378,15 +38412,6 @@
 /obj/structure/hotspring/border/ten,
 /turf/open/floor/cobblerock/alt,
 /area/outdoors/town/roofs)
-"sEE" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/tile/masonic{
-	dir = 1
-	},
-/area/indoors/town/keep)
 "sFb" = (
 /obj/structure/fluff/railing/border,
 /obj/structure/fluff/railing/border{
@@ -38454,21 +38479,6 @@
 	},
 /turf/open/floor/tile/kitchen,
 /area/indoors/town/tavern)
-"sGF" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/stairs{
-	dir = 1
-	},
-/obj/structure/fluff/railing/border{
-	dir = 4
-	},
-/turf/open/floor/tile/masonic{
-	dir = 8
-	},
-/area/indoors/town/keep)
 "sGM" = (
 /turf/closed/wall/mineral/stone,
 /area/under/cave)
@@ -38915,6 +38925,14 @@
 	},
 /turf/open/floor/herringbone,
 /area/indoors/town/keep)
+"sQE" = (
+/obj/structure/closet/crate/drawer,
+/obj/item/natural/clod/dirt,
+/obj/machinery/light/fueled/wallfire/candle/l{
+	pixel_x = 32
+	},
+/turf/open/floor/ruinedwood/turned/darker,
+/area/indoors/town/orphanage)
 "sQM" = (
 /obj/item/natural/rock{
 	pixel_x = 13;
@@ -39309,17 +39327,6 @@
 	},
 /turf/open/floor/ruinedwood/darker,
 /area/indoors/soilsons)
-"tah" = (
-/obj/structure/fluff/railing/border{
-	dir = 1
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/machinery/light/fueled/wallfire/candle/r,
-/turf/open/floor/ruinedwood/turned/darker,
-/area/indoors/town/tavern)
 "taK" = (
 /turf/closed/wall/mineral/decorstone/moss/blue,
 /area/indoors/town/keep)
@@ -40042,6 +40049,17 @@
 "tqI" = (
 /turf/closed,
 /area)
+"tqM" = (
+/obj/structure/stairs{
+	dir = 1
+	},
+/obj/structure/fluff/railing/border{
+	dir = 4
+	},
+/turf/open/floor/tile/masonic{
+	dir = 1
+	},
+/area/indoors/town/keep)
 "tqP" = (
 /obj/structure/bed/wool,
 /obj/item/bedsheet/fabric,
@@ -40680,6 +40698,14 @@
 	},
 /turf/open/floor/wood,
 /area/indoors/town/tavern)
+"tGj" = (
+/obj/structure/fake_machine/musicbox/mannor,
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/tile,
+/area/indoors/town/keep)
 "tGr" = (
 /obj/structure/door/iron/bars,
 /obj/effect/mapping_helpers/access/locker,
@@ -41125,14 +41151,6 @@
 /obj/item/reagent_containers/glass/cup/glassware,
 /turf/open/floor/herringbone,
 /area/indoors/town)
-"tTv" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fermentation_keg/water,
-/turf/open/floor/wood,
-/area/indoors/town/keep)
 "tTJ" = (
 /obj/structure/closet/crate/chest/neu_iron/corpse,
 /obj/effect/mapping_helpers/access/locker,
@@ -41440,28 +41458,6 @@
 /obj/structure/stairs/stone/reddish,
 /turf/open/floor/tile,
 /area/indoors/town/shop)
-"ueg" = (
-/obj/structure/fluff/railing/border{
-	dir = 1
-	},
-/obj/structure/fluff/railing/border{
-	dir = 8
-	},
-/obj/structure/fluff/railing/border{
-	dir = 9
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 8;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/machinery/light/fueled/firebowl,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/ruinedwood/turned/darker,
-/area/indoors/town/tavern)
 "ueq" = (
 /obj/machinery/light/fueledstreet/blue/wall,
 /turf/open/floor/blocks,
@@ -41959,6 +41955,15 @@
 /obj/structure/table/wood/plain_alt,
 /turf/open/floor/ruinedwood,
 /area/indoors/town/keep)
+"uty" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/tile/masonic{
+	dir = 1
+	},
+/area/indoors/town/keep)
 "utQ" = (
 /obj/structure/chair/wood{
 	dir = 4
@@ -44372,20 +44377,6 @@
 	},
 /turf/open/floor/carpet/lord/right,
 /area/indoors/town/keep)
-"vBn" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/shadow_floor,
-/obj/effect/decal/shadow_floor{
-	pixel_y = -14
-	},
-/obj/machinery/light/fueled/wallfire/candle/lamp{
-	pixel_y = 6
-	},
-/turf/open/floor/ruinedwood/turned/darker,
-/area/indoors/town/theatre)
 "vBs" = (
 /obj/structure/fake_machine/scomm/r{
 	pixel_x = -32
@@ -44998,31 +44989,6 @@
 /obj/effect/mapping_helpers/access/locker,
 /turf/open/floor/wood/nosmooth/saiga,
 /area/indoors/villagegarrison)
-"vRO" = (
-/obj/effect/decal/cobbleedge{
-	dir = 8;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 8;
-	icon_state = "borderfall";
-	pixel_y = -14
-	},
-/obj/structure/fluff/railing/border{
-	dir = 9;
-	pixel_x = -11;
-	pixel_y = -24
-	},
-/obj/effect/decal/shadow_floor{
-	dir = 4
-	},
-/obj/effect/decal/shadow_floor{
-	dir = 4;
-	pixel_x = 14;
-	pixel_y = 18
-	},
-/turf/open/floor/ruinedwood/spiralfade,
-/area/indoors/town/theatre)
 "vRR" = (
 /obj/structure/door{
 	lockid = "house1";
@@ -46193,6 +46159,21 @@
 "wxz" = (
 /turf/open/floor/twig,
 /area/under/town/basement)
+"wxA" = (
+/obj/effect/decal/shadow_floor{
+	dir = 8
+	},
+/obj/effect/decal/shadow_floor{
+	dir = 8;
+	pixel_x = -14;
+	pixel_y = 15
+	},
+/obj/effect/decal/borderfall{
+	dir = 4;
+	pixel_y = 0
+	},
+/turf/open/floor/ruinedwood/spiralfade,
+/area/indoors/town/theatre)
 "wxJ" = (
 /obj/machinery/light/fueledstreet/blue/wall{
 	dir = 8
@@ -46609,16 +46590,6 @@
 /obj/effect/spawner/map_spawner/hauntz_random,
 /turf/open/floor/dirt/road,
 /area/outdoors/basin)
-"wJo" = (
-/obj/effect/decal/cobbleedge{
-	icon_state = "borderfall";
-	dir = 1
-	},
-/obj/structure/fluff/railing/border{
-	dir = 1
-	},
-/turf/open/floor/cobblerock,
-/area/outdoors/town)
 "wJt" = (
 /obj/structure/fermentation_keg/random/beer{
 	pixel_x = -5;
@@ -47602,12 +47573,6 @@
 	},
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town/merc_guild)
-"xgs" = (
-/obj/structure/fluff/railing/border{
-	dir = 5
-	},
-/turf/open/floor/ruinedwood/turned/darker,
-/area/indoors/town/tavern)
 "xgK" = (
 /obj/structure/chair/wood/alt/chair3{
 	dir = 8
@@ -47649,6 +47614,17 @@
 	},
 /turf/open/floor/church,
 /area/indoors/town/church)
+"xif" = (
+/obj/structure/stairs{
+	dir = 1
+	},
+/obj/structure/fluff/railing/border{
+	dir = 4
+	},
+/turf/open/floor/tile/masonic{
+	dir = 8
+	},
+/area/indoors/town/keep)
 "xil" = (
 /obj/structure/stairs/stone/reddish{
 	dir = 1
@@ -48052,6 +48028,10 @@
 /obj/machinery/light/fueled/torchholder,
 /turf/open/floor/ruinedwood/turned/darker,
 /area/indoors/town/garrison)
+"xtN" = (
+/obj/effect/landmark/start/blacksmith,
+/turf/open/floor/ruinedwood,
+/area/indoors/town/smithy)
 "xtU" = (
 /obj/structure/table/wood/plain,
 /obj/item/weapon/knife/villager{
@@ -49601,6 +49581,17 @@
 	},
 /turf/open/floor/ruinedwood/darker,
 /area/indoors/soilsons)
+"ylc" = (
+/obj/machinery/light/fueled/firebowl/church{
+	pixel_x = -3;
+	pixel_y = 1
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/church,
+/area/indoors/town/church/chapel)
 "ylj" = (
 /obj/structure/stairs/stone{
 	dir = 8
@@ -63026,7 +63017,7 @@ qJl
 qJl
 dkb
 stl
-bck
+lzS
 aNm
 dkb
 jyq
@@ -63299,9 +63290,9 @@ jvz
 jvz
 wYy
 ewT
-fYr
-fGJ
-hLs
+kTW
+wxA
+fFv
 sTL
 ntl
 lJy
@@ -63503,7 +63494,7 @@ raf
 xcO
 hkm
 moA
-boK
+npq
 vNi
 dlN
 lJy
@@ -63569,7 +63560,7 @@ xmk
 xmk
 xmk
 jnV
-qqR
+sQE
 jnV
 eFH
 jnV
@@ -63705,7 +63696,7 @@ uGG
 uGG
 uGG
 ewT
-boK
+npq
 sbQ
 lJy
 lJy
@@ -63907,7 +63898,7 @@ uGG
 raf
 raf
 ewT
-vBn
+dzm
 uYQ
 lJy
 lJy
@@ -64109,7 +64100,7 @@ uGG
 uGG
 uTG
 ewT
-lqH
+aPt
 jZD
 czg
 lJy
@@ -64311,7 +64302,7 @@ raf
 uGG
 tWU
 ewT
-lqH
+aPt
 jZD
 czg
 lJy
@@ -64513,7 +64504,7 @@ uGG
 raf
 uGG
 luB
-vBn
+dzm
 uYQ
 lJy
 lJy
@@ -64715,7 +64706,7 @@ uGG
 uGG
 uGG
 ewT
-boK
+npq
 sbQ
 lJy
 lJy
@@ -64917,7 +64908,7 @@ raf
 wZC
 ezU
 oOm
-hvk
+gix
 vNi
 fOt
 lJy
@@ -65117,8 +65108,8 @@ nDi
 jvz
 iMF
 ewT
-kHO
-vRO
+cco
+luY
 kqy
 mUo
 ntl
@@ -71782,11 +71773,11 @@ ojJ
 wDN
 qJl
 nYK
-jFd
+xtN
 dqr
 dqr
 dqr
-osa
+rVF
 nYK
 tuM
 qRF
@@ -103245,7 +103236,7 @@ wGD
 vDQ
 vDQ
 orV
-tTv
+piM
 ati
 ati
 hnq
@@ -103447,7 +103438,7 @@ wGD
 cDR
 had
 fxv
-lxc
+bDn
 vDQ
 ydd
 hnq
@@ -103649,7 +103640,7 @@ wGD
 vYc
 fLT
 gYs
-ood
+cno
 ciX
 vDQ
 mZy
@@ -103851,7 +103842,7 @@ wGD
 vYc
 xIB
 gYs
-ood
+cno
 vDQ
 vDQ
 mZy
@@ -104053,7 +104044,7 @@ wGD
 xIN
 nZh
 pVc
-kZD
+nXF
 vDQ
 ati
 hnq
@@ -104255,7 +104246,7 @@ eJI
 vDQ
 vDQ
 orV
-pBI
+kbg
 ati
 ati
 hnq
@@ -106750,7 +106741,7 @@ qjP
 wZA
 vwq
 pvj
-sqo
+lgM
 pfl
 pfl
 nyl
@@ -107318,7 +107309,7 @@ pmI
 pmI
 xjx
 rTo
-fzE
+jAC
 kNt
 omp
 omp
@@ -107356,8 +107347,8 @@ qjP
 fzD
 rDu
 eod
-sgt
-xgs
+aos
+dmN
 dHu
 fjG
 sHn
@@ -107521,7 +107512,7 @@ hkC
 sGg
 enk
 sda
-kqe
+aPE
 rVV
 omp
 crD
@@ -107559,7 +107550,7 @@ sAc
 sHn
 rDu
 rDu
-cMr
+dLo
 szV
 mtZ
 fpO
@@ -107723,7 +107714,7 @@ vIh
 sGg
 kVL
 dif
-wJo
+oDK
 ctm
 pmI
 hbl
@@ -107761,7 +107752,7 @@ vwq
 rDu
 rDu
 oLg
-cMr
+dLo
 eVX
 crx
 rDu
@@ -107925,7 +107916,7 @@ hkC
 sGg
 hlB
 amI
-kqe
+aPE
 pmI
 pmI
 omp
@@ -107963,7 +107954,7 @@ lHy
 rDu
 sHn
 sHn
-cMr
+dLo
 eVX
 hzB
 rCc
@@ -108126,7 +108117,7 @@ omp
 omp
 bQt
 rjg
-fzE
+jAC
 czX
 omp
 omp
@@ -108164,8 +108155,8 @@ qjP
 jer
 rDu
 dnv
-ueg
-rmj
+cQS
+phR
 uoe
 gsv
 lnG
@@ -108770,7 +108761,7 @@ qjP
 wZA
 cMi
 rDu
-tah
+etu
 pfl
 pfl
 pfl
@@ -110561,7 +110552,7 @@ qqA
 gzt
 mXJ
 aGo
-fTG
+cFy
 oHz
 iWf
 vEC
@@ -110574,10 +110565,10 @@ pmI
 omp
 omp
 nxh
-mrS
+iZG
 iWf
 ovx
-nXW
+mEG
 lLc
 oXn
 kFm
@@ -111167,7 +111158,7 @@ gzt
 its
 eIy
 uyn
-nXW
+mEG
 psW
 iWf
 mKL
@@ -114825,7 +114816,7 @@ iAq
 qHC
 hGo
 icJ
-dwb
+mqm
 pmI
 dUM
 pmI
@@ -115027,7 +115018,7 @@ nBh
 dif
 dif
 ctJ
-fPW
+jew
 xTB
 omp
 rhj
@@ -115229,7 +115220,7 @@ sGg
 dif
 kVL
 mLp
-fPW
+jew
 rhj
 prz
 xTB
@@ -115431,7 +115422,7 @@ nBh
 dif
 dif
 ctJ
-fPW
+jew
 soc
 omp
 soc
@@ -115633,7 +115624,7 @@ ilJ
 naY
 lhK
 gRR
-dwb
+mqm
 reG
 jnM
 jnM
@@ -127853,10 +127844,10 @@ vzu
 vzu
 vzu
 mgZ
-oOC
-oOC
-oOC
-siv
+iuL
+iuL
+iuL
+rts
 vxr
 vxr
 vxr
@@ -147061,7 +147052,7 @@ spC
 vjq
 xUW
 qGW
-dol
+jGN
 qsC
 mgQ
 vDQ
@@ -147263,7 +147254,7 @@ wGD
 szX
 dTZ
 hFX
-ffx
+mXh
 mau
 mVI
 fcs
@@ -147465,7 +147456,7 @@ wGD
 mMu
 rvm
 npn
-sGF
+xif
 jzB
 tfN
 dEl
@@ -147667,7 +147658,7 @@ qwx
 yft
 vjq
 qGW
-nlu
+fWP
 tfN
 mVI
 tfN
@@ -148475,7 +148466,7 @@ qwx
 nIz
 vjq
 qGW
-sEE
+uty
 wRQ
 fTh
 wRQ
@@ -148677,7 +148668,7 @@ wGD
 iOz
 vjq
 hFX
-hir
+mNx
 vCI
 wRQ
 hjC
@@ -148879,7 +148870,7 @@ wGD
 jci
 vjq
 npn
-lFT
+tqM
 meo
 fTh
 vyB
@@ -149027,7 +149018,7 @@ ruG
 fZS
 sQe
 bZk
-mbC
+ylc
 yjF
 wCJ
 onm
@@ -149081,7 +149072,7 @@ spC
 eIP
 vjq
 qGW
-cZh
+tGj
 vnb
 oHJ
 vDQ
@@ -149229,7 +149220,7 @@ iNS
 fZS
 xca
 jXi
-dYe
+flz
 yjF
 jjN
 llW
@@ -149431,7 +149422,7 @@ tgK
 fZS
 sQe
 iMP
-rJk
+lCT
 yjF
 cYQ
 nBN
diff --git a/_maps/map_files/rosewood/rosewood_marsh.dmm b/_maps/map_files/rosewood/rosewood_marsh.dmm
index e5fefc85091..edcd4da70a6 100644
--- a/_maps/map_files/rosewood/rosewood_marsh.dmm
+++ b/_maps/map_files/rosewood/rosewood_marsh.dmm
@@ -1387,7 +1387,7 @@
 /turf/open/floor/church/purple,
 /area/indoors/lich)
 "hS" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 8;
 	icon_state = "borderfall"
 	},
@@ -5743,7 +5743,7 @@
 /turf/open/floor/tile/kitchen,
 /area/indoors/lich)
 "GZ" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall"
 	},
@@ -7992,7 +7992,7 @@
 /turf/open/floor/ruinedwood,
 /area/indoors/mountains)
 "UQ" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 8;
 	icon_state = "borderfall"
 	},
diff --git a/_maps/map_files/shared/CentCom.dmm b/_maps/map_files/shared/CentCom.dmm
index a46fc70425b..57559cd3b6a 100644
--- a/_maps/map_files/shared/CentCom.dmm
+++ b/_maps/map_files/shared/CentCom.dmm
@@ -931,12 +931,6 @@
 	},
 /turf/open/floor/herringbone,
 /area/indoors/vampire_manor)
-"cY" = (
-/obj/effect/landmark/start/jarosite{
-	dir = 1
-	},
-/turf/open/floor/volcanic,
-/area/under/cavelava/acid)
 "cZ" = (
 /turf/open/floor/blocks,
 /area/indoors/vampire_manor)
@@ -1426,6 +1420,9 @@
 /obj/machinery/light/fueled/wallfire/candle/skull,
 /turf/open/floor/church,
 /area/indoors/lich)
+"fJ" = (
+/turf/open/floor/naturalstone,
+/area/under/cavelava/acid)
 "fL" = (
 /obj/machinery/light/fueled/torchholder/l,
 /turf/open/floor/ruinedwood/turned/darker,
@@ -1810,22 +1807,6 @@
 /obj/machinery/light/fueled/torchholder/r,
 /turf/open/floor/wood,
 /area/indoors)
-"iw" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fluff/railing/border{
-	pixel_y = 24
-	},
-/obj/structure/fluff/railing/border{
-	dir = 9;
-	pixel_x = 26;
-	pixel_y = 2
-	},
-/obj/machinery/light/fueled/wallfire/candle/skull/l,
-/turf/open/floor/naturalstone,
-/area/outdoors/bog/inhumen_camp)
 "ix" = (
 /obj/structure/bed/wool,
 /obj/machinery/light/fueled/wallfire/candle/skull/r,
@@ -1845,12 +1826,33 @@
 /obj/structure/hotspring/border/twelve,
 /turf/open/floor/grass/yel,
 /area/outdoors)
+"iG" = (
+/obj/structure/bed/shit,
+/obj/effect/landmark/start/jarosite,
+/turf/open/floor/naturalstone,
+/area/under/cavelava/acid)
 "iH" = (
 /obj/structure/bridge_stakes{
 	dir = 4
 	},
 /turf/open/floor/dirt/road,
 /area/outdoors)
+"iI" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/fluff/railing/border{
+	pixel_y = 24
+	},
+/obj/structure/fluff/railing/border{
+	dir = 9;
+	pixel_x = 26;
+	pixel_y = 2
+	},
+/obj/machinery/light/fueled/wallfire/candle/skull/l,
+/turf/open/floor/naturalstone,
+/area/outdoors/bog/inhumen_camp)
 "iK" = (
 /obj/structure/table/wood{
 	dir = 5;
@@ -1958,18 +1960,6 @@
 /obj/structure/fluff/wallclock,
 /turf/open/floor/ruinedwood/chevron,
 /area/indoors)
-"jx" = (
-/obj/structure/closet/crate/chest/wicker,
-/obj/item/reagent_containers/powder/salt,
-/obj/item/reagent_containers/powder/salt,
-/obj/item/reagent_containers/powder/salt,
-/obj/item/reagent_containers/powder/salt,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/weapon/knife/copper,
-/turf/open/floor/twig,
-/area/under/cavelava/acid)
 "jA" = (
 /obj/structure/bed/inn/double,
 /turf/open/floor/carpet/purple,
@@ -2298,29 +2288,6 @@
 	},
 /turf/open/floor/dirt,
 /area/outdoors/bog/inhumen_camp)
-"lO" = (
-/obj/structure/fluff/railing/border{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 8;
-	icon_state = "borderfall"
-	},
-/obj/effect/decal/cobbleedge/alt,
-/turf/open/floor/dirt,
-/area/outdoors/bog/inhumen_camp)
-"lS" = (
-/obj/structure/kneestingers,
-/obj/structure/fluff/railing/border{
-	pixel_y = 24
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/water/swamp/deep,
-/area/outdoors/bog/inhumen_camp)
 "lT" = (
 /obj/machinery/light/fueled/firebowl/church/unholyfire,
 /turf/open/floor/church,
@@ -2558,6 +2525,17 @@
 /obj/machinery/light/fueled/firebowl/standing/blue,
 /turf/open/floor/twig,
 /area/indoors/lich)
+"nE" = (
+/obj/structure/fluff/railing/border{
+	pixel_y = 24
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/machinery/light/fueled/wallfire/candle/skull/l,
+/turf/open/water/swamp/deep,
+/area/outdoors/bog/inhumen_camp)
 "nG" = (
 /obj/structure/fluff/statue/evil,
 /obj/machinery/light/fueled/firebowl/standing/blue,
@@ -2787,6 +2765,11 @@
 /obj/structure/mannequin/male,
 /turf/open/floor/wood,
 /area/indoors)
+"oS" = (
+/obj/machinery/light/fueled/hearth,
+/obj/item/reagent_containers/glass/bucket/pot/stone,
+/turf/open/floor/naturalstone,
+/area/under/cavelava/acid)
 "oV" = (
 /obj/structure/fluff/railing/wood,
 /turf/open/floor/cobble,
@@ -2834,9 +2817,6 @@
 	},
 /turf/open/floor/cobble,
 /area/indoors)
-"pl" = (
-/turf/closed/mineral/bedrock,
-/area/under/cavelava/acid)
 "pr" = (
 /turf/open/floor/dirt,
 /area/outdoors)
@@ -3041,17 +3021,6 @@
 	},
 /turf/open/floor/carpet/lord/right,
 /area/indoors/lich)
-"qM" = (
-/obj/structure/fluff/railing/border{
-	pixel_y = 24
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/machinery/light/fueled/wallfire/candle/skull/l,
-/turf/open/water/swamp/deep,
-/area/outdoors/bog/inhumen_camp)
 "qO" = (
 /turf/open/floor/cobble,
 /area/indoors)
@@ -3089,6 +3058,10 @@
 	},
 /turf/open/floor/grass/yel,
 /area/outdoors/bog/inhumen_camp)
+"qU" = (
+/obj/structure/fluff/clodpile/dirt,
+/turf/open/floor/dirt/road,
+/area/outdoors/woods_safe)
 "qV" = (
 /obj/structure/fluff/walldeco/bigpainting,
 /obj/structure/bookcase,
@@ -3096,16 +3069,6 @@
 /obj/item/book/tales1,
 /turf/open/floor/herringbone,
 /area/indoors/vampire_manor)
-"qY" = (
-/obj/structure/fluff/railing/border{
-	pixel_y = 24
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/water/swamp/deep,
-/area/outdoors/bog/inhumen_camp)
 "qZ" = (
 /obj/structure/table/wood{
 	icon_state = "largetable"
@@ -3604,12 +3567,6 @@
 /obj/item/plate,
 /turf/open/floor/carpet/lord/left,
 /area/indoors/lich)
-"uf" = (
-/obj/effect/landmark/start/jarosite{
-	dir = 1
-	},
-/turf/open/floor/twig,
-/area/under/cavelava/acid)
 "ug" = (
 /obj/item/bin/water,
 /turf/open/floor/blocks,
@@ -3675,11 +3632,6 @@
 	},
 /turf/open/floor/dirt/road,
 /area/outdoors/woods_safe)
-"uG" = (
-/obj/machinery/light/fueled/hearth,
-/obj/item/reagent_containers/glass/bucket/pot/stone,
-/turf/open/floor/naturalstone,
-/area/under/cavelava/acid)
 "uL" = (
 /obj/structure/well,
 /turf/open/floor/cobblerock,
@@ -3810,6 +3762,12 @@
 	},
 /turf/open/floor/tile/checker_green,
 /area/indoors/lich)
+"vs" = (
+/obj/effect/landmark/start/jarosite{
+	dir = 4
+	},
+/turf/open/floor/twig,
+/area/under/cavelava/acid)
 "vt" = (
 /obj/structure/table/wood{
 	dir = 8;
@@ -3841,6 +3799,18 @@
 /obj/structure/fluff/walldeco/maidendrape,
 /turf/open/floor/herringbone,
 /area/indoors/vampire_manor)
+"vG" = (
+/obj/structure/closet/crate/chest/wicker,
+/obj/item/reagent_containers/powder/salt,
+/obj/item/reagent_containers/powder/salt,
+/obj/item/reagent_containers/powder/salt,
+/obj/item/reagent_containers/powder/salt,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/weapon/knife/copper,
+/turf/open/floor/twig,
+/area/under/cavelava/acid)
 "vH" = (
 /obj/structure/window/openclose,
 /obj/structure/rotation_piece,
@@ -3849,6 +3819,9 @@
 "vI" = (
 /turf/closed/wall/mineral/wooddark,
 /area/indoors)
+"vK" = (
+/turf/open/floor/volcanic,
+/area/under/cavelava/acid)
 "vL" = (
 /obj/structure/closet/dirthole/grave,
 /obj/effect/decal/remains/saiga{
@@ -3876,6 +3849,12 @@
 /obj/item/clothing/pants/chainlegs,
 /turf/open/floor/carpet,
 /area/indoors)
+"vQ" = (
+/obj/effect/landmark/start/jarosite{
+	dir = 1
+	},
+/turf/open/floor/twig,
+/area/under/cavelava/acid)
 "vS" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/fake_world,
@@ -3972,18 +3951,6 @@
 /obj/machinery/light/fueled/torchholder/c,
 /turf/open/floor/wood,
 /area/indoors)
-"wl" = (
-/obj/effect/decal/cobbleedge{
-	dir = 4;
-	icon_state = "borderfall"
-	},
-/obj/structure/fluff/railing/border{
-	dir = 8;
-	pixel_x = 24
-	},
-/obj/effect/decal/cobbleedge/alt,
-/turf/open/floor/dirt,
-/area/outdoors/bog/inhumen_camp)
 "ws" = (
 /obj/structure/closet/dirthole/closed,
 /turf/open/floor/dirt,
@@ -4055,19 +4022,6 @@
 /obj/item/coin/gold/pile,
 /turf/open/floor/ruinedwood/chevron,
 /area/indoors)
-"xg" = (
-/obj/structure/table/stone_small,
-/obj/item/reagent_containers/glass/bottle/beer/stonebeardreserve,
-/obj/item/reagent_containers/glass/bottle/beer/stonebeardreserve{
-	pixel_y = 5;
-	pixel_x = -7
-	},
-/obj/item/reagent_containers/glass/bottle/beer/stonebeardreserve{
-	pixel_y = 7;
-	pixel_x = 7
-	},
-/turf/open/floor/volcanic,
-/area/under/cavelava/acid)
 "xh" = (
 /obj/structure/fluff/statue/zizo,
 /turf/open/floor/cobble,
@@ -4436,6 +4390,17 @@
 /obj/structure/fluff/statue/tdummy,
 /turf/open/floor/dirt,
 /area/outdoors/bog/inhumen_camp)
+"zQ" = (
+/obj/structure/kneestingers,
+/obj/structure/fluff/railing/border{
+	pixel_y = 24
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/open/water/swamp/deep,
+/area/outdoors/bog/inhumen_camp)
 "zS" = (
 /obj/structure/flora/tree/evil,
 /turf/open/floor/dirt,
@@ -4530,12 +4495,6 @@
 /obj/structure/fluff/statue/knight/interior/r,
 /turf/open/floor/concrete,
 /area/outdoors/woods_safe)
-"Aw" = (
-/obj/effect/landmark/start/jarosite{
-	dir = 8
-	},
-/turf/open/floor/twig,
-/area/under/cavelava/acid)
 "Ax" = (
 /obj/structure/table/wood/reinf_long,
 /turf/open/floor/tile/checker_green,
@@ -4659,6 +4618,19 @@
 "Bj" = (
 /turf/open/floor/dirt,
 /area/indoors/lich)
+"Bm" = (
+/obj/structure/table/stone_small,
+/obj/item/reagent_containers/glass/bottle/beer/stonebeardreserve,
+/obj/item/reagent_containers/glass/bottle/beer/stonebeardreserve{
+	pixel_y = 5;
+	pixel_x = -7
+	},
+/obj/item/reagent_containers/glass/bottle/beer/stonebeardreserve{
+	pixel_y = 7;
+	pixel_x = 7
+	},
+/turf/open/floor/volcanic,
+/area/under/cavelava/acid)
 "Bn" = (
 /obj/effect/decal/cobblerockedge{
 	dir = 1
@@ -4670,11 +4642,6 @@
 /mob/living/carbon/human/species/skeleton/npc,
 /turf/open/floor/dirt,
 /area/outdoors/bog/inhumen_camp)
-"Bs" = (
-/obj/structure/bed/shit,
-/obj/effect/landmark/start/jarosite,
-/turf/open/floor/naturalstone,
-/area/under/cavelava/acid)
 "Bv" = (
 /obj/item/natural/wood/plank,
 /turf/open/floor/twig,
@@ -4726,10 +4693,6 @@
 /obj/item/clothing/shirt/undershirt/colored/uncolored,
 /turf/open/floor/wood,
 /area)
-"BK" = (
-/obj/structure/bed/shit,
-/turf/open/floor/naturalstone,
-/area/under/cavelava/acid)
 "BL" = (
 /obj/structure/door/iron/bars{
 	lockid = "mansionvampire"
@@ -4741,6 +4704,12 @@
 /obj/effect/spawner/map_spawner/grass_low,
 /turf/open/floor/dirt/road,
 /area/outdoors/woods_safe)
+"BO" = (
+/obj/structure/fluff/nest{
+	name = "patch of straw"
+	},
+/turf/open/floor/naturalstone,
+/area/under/cavelava/acid)
 "BP" = (
 /obj/structure/mannequin/male,
 /obj/item/clothing/head/priesthat,
@@ -5194,6 +5163,10 @@
 /obj/structure/bars/cemetery,
 /turf/open/floor/grass/red,
 /area/outdoors/woods_safe)
+"Fj" = (
+/obj/machinery/light/fueled/campfire,
+/turf/open/floor/naturalstone,
+/area/under/cavelava/acid)
 "Fk" = (
 /turf/closed/wall/mineral/decostone/cand,
 /area/indoors/lich)
@@ -5462,6 +5435,12 @@
 /obj/item/clothing/armor/leather/splint,
 /turf/open/floor/carpet,
 /area/indoors)
+"Hw" = (
+/obj/effect/landmark/start/jarosite{
+	dir = 1
+	},
+/turf/open/floor/volcanic,
+/area/under/cavelava/acid)
 "Hy" = (
 /obj/structure/hotspring/border/ten,
 /turf/open/floor/grass/yel,
@@ -5598,10 +5577,6 @@
 /obj/structure/fermentation_keg/random/beer,
 /turf/open/floor/ruinedwood/turned/darker,
 /area/indoors/bandit_lair)
-"Ik" = (
-/obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/volcanic,
-/area/under/cavelava/acid)
 "Im" = (
 /obj/structure/table/wood/fancy/red,
 /obj/item/reagent_containers/glass/bottle/tiefling_wine,
@@ -5688,6 +5663,10 @@
 	},
 /turf/open/floor/grass/yel,
 /area/outdoors)
+"IC" = (
+/obj/structure/bed/shit,
+/turf/open/floor/naturalstone,
+/area/under/cavelava/acid)
 "ID" = (
 /obj/effect/decal/cobbleedge/alt{
 	dir = 8
@@ -5950,6 +5929,18 @@
 /obj/machinery/light/fueled/wallfire,
 /turf/closed/wall/mineral/decostone/long,
 /area/indoors/lich)
+"Kl" = (
+/obj/effect/decal/borderfall{
+	dir = 4;
+	icon_state = "borderfall"
+	},
+/obj/structure/fluff/railing/border{
+	dir = 8;
+	pixel_x = 24
+	},
+/obj/effect/decal/cobbleedge/alt,
+/turf/open/floor/dirt,
+/area/outdoors/bog/inhumen_camp)
 "Kn" = (
 /obj/structure/flora/grass,
 /turf/open/floor/grass,
@@ -6064,9 +6055,6 @@
 /obj/machinery/light/fueled/wallfire/candle/skull/r,
 /turf/open/floor/churchbrick,
 /area/overlord_lair)
-"Lm" = (
-/turf/open/floor/naturalstone,
-/area/under/cavelava/acid)
 "Lo" = (
 /obj/item/clothing/head/helmet/leather/inquisitor,
 /obj/structure/mannequin/male,
@@ -6110,6 +6098,13 @@
 /obj/structure/fermentation_keg/beer,
 /turf/open/floor/wood/nosmooth,
 /area/indoors/lich)
+"LA" = (
+/obj/structure/bed/shit,
+/obj/effect/landmark/start/jarosite{
+	dir = 1
+	},
+/turf/open/floor/naturalstone,
+/area/under/cavelava/acid)
 "LD" = (
 /obj/structure/fluff/big_chain{
 	pixel_y = 14
@@ -6192,6 +6187,10 @@
 /obj/item/clothing/head/helmet/leather/volfhelm,
 /turf/open/floor/ruinedwood/darker,
 /area/indoors/bandit_lair)
+"Mf" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/volcanic,
+/area/under/cavelava/acid)
 "Mg" = (
 /obj/effect/spawner/map_spawner/grass_low,
 /turf/open/floor/grass,
@@ -6288,9 +6287,6 @@
 /obj/item/rope,
 /turf/open/floor/church,
 /area/indoors/lich)
-"MO" = (
-/turf/open/lava/acid,
-/area/under/cavelava/acid)
 "MP" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/fueled/wallfire/candle/r,
@@ -6465,6 +6461,9 @@
 /obj/structure/fluff/railing/tall/palisade,
 /turf/open/floor/dirt,
 /area/outdoors/woods_safe)
+"NW" = (
+/turf/closed/mineral/bedrock,
+/area/under/cavelava/acid)
 "NX" = (
 /obj/machinery/light/fueled/wallfire/candle/skull/l,
 /turf/open/floor/carpet/lord/left,
@@ -6544,6 +6543,14 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/carpet/lord/center,
 /area/indoors/lich)
+"OB" = (
+/obj/structure/closet/crate/chest/wicker,
+/obj/item/reagent_containers/food/snacks/hardtack,
+/obj/item/reagent_containers/food/snacks/hardtack,
+/obj/item/reagent_containers/food/snacks/hardtack,
+/obj/item/reagent_containers/food/snacks/hardtack,
+/turf/open/floor/twig,
+/area/under/cavelava/acid)
 "OC" = (
 /obj/effect/decal/cobblerockedge,
 /turf/open/floor/grass/yel,
@@ -6576,12 +6583,6 @@
 /obj/machinery/light/fueled/forge,
 /turf/open/floor/hexstone,
 /area/indoors/vampire_manor)
-"OT" = (
-/obj/structure/fluff/nest{
-	name = "patch of straw"
-	},
-/turf/open/floor/naturalstone,
-/area/under/cavelava/acid)
 "OX" = (
 /obj/item/weapon/sword/long/exe,
 /obj/item/weapon/sword/long/exe,
@@ -6649,14 +6650,6 @@
 /obj/structure/chair/stool/crafted,
 /turf/open/floor/twig,
 /area/outdoors/bog/inhumen_camp)
-"Py" = (
-/obj/structure/closet/crate/chest/wicker,
-/obj/item/reagent_containers/food/snacks/hardtack,
-/obj/item/reagent_containers/food/snacks/hardtack,
-/obj/item/reagent_containers/food/snacks/hardtack,
-/obj/item/reagent_containers/food/snacks/hardtack,
-/turf/open/floor/twig,
-/area/under/cavelava/acid)
 "PD" = (
 /obj/effect/decal/cobblerockedge{
 	dir = 4
@@ -6701,10 +6694,6 @@
 /obj/structure/fermentation_keg,
 /turf/open/floor/tile,
 /area/indoors/vampire_manor)
-"PX" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/volcanic,
-/area/under/cavelava/acid)
 "Qb" = (
 /obj/structure/hotspring/border/twelve,
 /turf/open/floor/dirt/road,
@@ -6848,6 +6837,18 @@
 	},
 /turf/open/floor/church,
 /area/indoors/lich)
+"QM" = (
+/obj/structure/fluff/railing/border{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/effect/decal/borderfall{
+	dir = 8;
+	icon_state = "borderfall"
+	},
+/obj/effect/decal/cobbleedge/alt,
+/turf/open/floor/dirt,
+/area/outdoors/bog/inhumen_camp)
 "QN" = (
 /obj/structure/door/iron/bars{
 	lockid = "banditcamp"
@@ -6865,6 +6866,16 @@
 /obj/effect/decal/cobbleedge,
 /turf/open/water/blood,
 /area/outdoors/bog/inhumen_camp)
+"QU" = (
+/obj/structure/fluff/railing/border{
+	pixel_y = 24
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/open/water/swamp/deep,
+/area/outdoors/bog/inhumen_camp)
 "QV" = (
 /obj/structure/flora/grass/water,
 /turf/open/water/swamp,
@@ -7187,6 +7198,12 @@
 /obj/machinery/light/fueled/firebowl/standing,
 /turf/open/floor/cobble,
 /area/indoors)
+"SB" = (
+/obj/effect/landmark/start/jarosite{
+	dir = 8
+	},
+/turf/open/floor/twig,
+/area/under/cavelava/acid)
 "SC" = (
 /obj/structure/stairs/stone/church{
 	dir = 8
@@ -7198,13 +7215,6 @@
 /obj/structure/fluff/walldeco/vinez,
 /turf/open/floor/church,
 /area/indoors/lich)
-"SE" = (
-/obj/structure/bed/shit,
-/obj/effect/landmark/start/jarosite{
-	dir = 1
-	},
-/turf/open/floor/naturalstone,
-/area/under/cavelava/acid)
 "SG" = (
 /turf/open/floor/churchmarble,
 /area/indoors/lich)
@@ -7713,12 +7723,6 @@
 /obj/item/clothing/armor/amazon_chainkini,
 /turf/open/floor/carpet,
 /area/indoors)
-"VN" = (
-/obj/effect/landmark/start/jarosite{
-	dir = 4
-	},
-/turf/open/floor/twig,
-/area/under/cavelava/acid)
 "VO" = (
 /obj/structure/kneestingers,
 /obj/structure/fluff/railing/border{
@@ -7755,6 +7759,10 @@
 	},
 /turf/open/floor/grass/yel,
 /area/outdoors/bog/inhumen_camp)
+"VZ" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/floor/volcanic,
+/area/under/cavelava/acid)
 "Wd" = (
 /obj/item/clothing/shirt/dress/silkdress,
 /obj/item/clothing/shirt/dress/silkdress,
@@ -7970,6 +7978,9 @@
 /obj/item/clothing/pants/trou/leather,
 /turf/open/floor/carpet,
 /area/indoors)
+"XB" = (
+/turf/open/lava/acid,
+/area/under/cavelava/acid)
 "XC" = (
 /obj/structure/flora/grass/herb/urtica,
 /turf/open/floor/grass/yel,
@@ -7997,10 +8008,6 @@
 /obj/structure/mannequin/male/female,
 /turf/open/floor/wood,
 /area)
-"XM" = (
-/obj/structure/fluff/clodpile/dirt,
-/turf/open/floor/dirt/road,
-/area/outdoors/woods_safe)
 "XN" = (
 /obj/structure/bars/cemetery,
 /turf/open/floor/dirt/road,
@@ -8282,10 +8289,6 @@
 /obj/effect/falling_sakura,
 /turf/open/floor/dirt/road,
 /area/outdoors)
-"Ze" = (
-/obj/structure/fluff/traveltile/from_acid_caves,
-/turf/open/floor/naturalstone,
-/area/under/cavelava/acid)
 "Zh" = (
 /obj/structure/rack,
 /obj/item/weapon/sword/short,
@@ -8296,20 +8299,17 @@
 /obj/structure/flora/grass/bush/wall/tall/bog,
 /turf/open/floor/dirt,
 /area/outdoors/bog/inhumen_camp)
+"Zj" = (
+/obj/structure/fluff/traveltile/from_acid_caves,
+/turf/open/floor/naturalstone,
+/area/under/cavelava/acid)
 "Zl" = (
 /turf/open/floor/herringbone,
 /area/indoors/vampire_manor)
-"Zo" = (
-/turf/open/floor/volcanic,
-/area/under/cavelava/acid)
 "Zq" = (
 /obj/structure/roguetent/preopen,
 /turf/open/floor/dirt,
 /area/indoors/lich)
-"Zs" = (
-/obj/machinery/light/fueled/campfire,
-/turf/open/floor/naturalstone,
-/area/under/cavelava/acid)
 "Zt" = (
 /turf/open/floor/dirt/road,
 /area/outdoors/bog/inhumen_camp)
@@ -9649,7 +9649,7 @@ jW
 QZ
 jW
 Sq
-XM
+qU
 Ek
 UX
 xt
@@ -16783,13 +16783,13 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+NW
+NW
+NW
 Iw
 Iw
 Iw
@@ -16913,13 +16913,13 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+NW
+NW
+NW
 Iw
 Iw
 Iw
@@ -17041,15 +17041,15 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-pl
-Ze
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+NW
+Zj
+NW
+NW
+NW
 Iw
 Iw
 Iw
@@ -17171,15 +17171,15 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-pl
-Lm
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+NW
+fJ
+NW
+NW
+NW
 Iw
 Iw
 Iw
@@ -17301,15 +17301,15 @@ ag
 ag
 ag
 ag
-pl
-pl
-Ze
-Lm
-Lm
-Lm
-pl
-pl
-pl
+NW
+NW
+Zj
+fJ
+fJ
+fJ
+NW
+NW
+NW
 Iw
 Iw
 Iw
@@ -17431,15 +17431,15 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-Zo
-pl
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+vK
+NW
+NW
+NW
+NW
 Iw
 Iw
 Iw
@@ -17562,14 +17562,14 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-Zo
-Zo
-pl
-pl
-pl
+NW
+NW
+NW
+vK
+vK
+NW
+NW
+NW
 Iw
 Iw
 Iw
@@ -17691,15 +17691,15 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-pl
-Zo
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+NW
+vK
+NW
+NW
+NW
 Iw
 Iw
 Iw
@@ -17820,16 +17820,16 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-pl
-pl
-Zo
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+NW
+NW
+vK
+NW
+NW
+NW
 Iw
 Iw
 Iw
@@ -17949,23 +17949,23 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-Lm
-Lm
-pl
-Zo
-Zo
-Zo
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
+NW
+NW
+NW
+fJ
+fJ
+NW
+vK
+vK
+vK
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
 HZ
 HZ
 HZ
@@ -18079,23 +18079,23 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Lm
-Lm
-Lm
-Zo
-Zo
-Lm
-Lm
-pl
-jx
-Py
-pl
-xg
-pl
-pl
+NW
+NW
+fJ
+fJ
+fJ
+fJ
+vK
+vK
+fJ
+fJ
+NW
+vG
+OB
+NW
+Bm
+NW
+NW
 HZ
 Ae
 Ae
@@ -18209,23 +18209,23 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Lm
-Lm
-Lm
-MO
-MO
-Lm
-Lm
-Zo
-Zo
-Zo
-Zo
-cY
-pl
-pl
+NW
+NW
+fJ
+fJ
+fJ
+fJ
+XB
+XB
+fJ
+fJ
+vK
+vK
+vK
+vK
+Hw
+NW
+NW
 HZ
 Ae
 mX
@@ -18338,24 +18338,24 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Lm
-Lm
-Zo
-MO
-MO
-MO
-MO
-Zo
-Zo
-Zo
-Zo
-pl
-pl
-pl
-pl
+NW
+NW
+fJ
+fJ
+fJ
+vK
+XB
+XB
+XB
+XB
+vK
+vK
+vK
+vK
+NW
+NW
+NW
+NW
 HZ
 Ae
 VB
@@ -18467,25 +18467,25 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-Lm
-Lm
-Zo
-Zo
-MO
-MO
-MO
-MO
-MO
-Lm
-VN
-Lm
-Lm
-uG
-pl
-pl
+NW
+NW
+NW
+fJ
+fJ
+vK
+vK
+XB
+XB
+XB
+XB
+XB
+fJ
+vs
+fJ
+fJ
+oS
+NW
+NW
 HZ
 Ae
 mX
@@ -18597,25 +18597,25 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-Lm
-Lm
-Zo
-Ik
-Zo
-MO
-MO
-MO
-MO
-Lm
-Lm
-Lm
-Lm
-Lm
-pl
-pl
+NW
+NW
+NW
+fJ
+fJ
+vK
+VZ
+vK
+XB
+XB
+XB
+XB
+fJ
+fJ
+fJ
+fJ
+fJ
+NW
+NW
 HZ
 Ae
 mX
@@ -18727,25 +18727,25 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Lm
-Lm
-Zo
-Zo
-PX
-MO
-MO
-MO
-MO
-Lm
-Zs
-Lm
-uf
-Lm
-pl
-pl
+NW
+NW
+fJ
+fJ
+fJ
+vK
+vK
+Mf
+XB
+XB
+XB
+XB
+fJ
+Fj
+fJ
+vQ
+fJ
+NW
+NW
 HZ
 Ae
 mX
@@ -18857,25 +18857,25 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Lm
-Zo
-Ik
-Zo
-MO
-MO
-MO
-MO
-Lm
-Lm
-Lm
-Lm
-Lm
-Lm
-pl
-pl
+NW
+NW
+fJ
+fJ
+vK
+VZ
+vK
+XB
+XB
+XB
+XB
+fJ
+fJ
+fJ
+fJ
+fJ
+fJ
+NW
+NW
 HZ
 Ae
 mX
@@ -18987,25 +18987,25 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Lm
-Zo
-Zo
-MO
-MO
-MO
-MO
-MO
-Lm
-Lm
-Aw
-Lm
-Lm
-pl
-pl
-pl
+NW
+NW
+fJ
+fJ
+vK
+vK
+XB
+XB
+XB
+XB
+XB
+fJ
+fJ
+SB
+fJ
+fJ
+NW
+NW
+NW
 HZ
 Ae
 mX
@@ -19117,25 +19117,25 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Lm
-Zo
-Zo
-MO
-MO
-MO
-MO
-MO
-cY
-Lm
-Lm
-Lm
-Zo
-pl
-pl
-pl
+NW
+NW
+fJ
+fJ
+vK
+vK
+XB
+XB
+XB
+XB
+XB
+Hw
+fJ
+fJ
+fJ
+vK
+NW
+NW
+NW
 HZ
 Ae
 VB
@@ -19247,25 +19247,25 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Lm
-Zo
-PX
-MO
-MO
-MO
-MO
-Zo
-Zo
-Zo
-pl
-pl
-Zo
-pl
-pl
-pl
+NW
+NW
+fJ
+fJ
+vK
+Mf
+XB
+XB
+XB
+XB
+vK
+vK
+vK
+NW
+NW
+vK
+NW
+NW
+NW
 HZ
 QA
 WG
@@ -19377,25 +19377,25 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Lm
-Lm
-Zo
-Zo
-MO
-MO
-Zo
-Zo
-pl
-pl
-pl
-pl
-Zo
-Zo
-SE
-pl
+NW
+NW
+fJ
+fJ
+fJ
+vK
+vK
+XB
+XB
+vK
+vK
+NW
+NW
+NW
+NW
+vK
+vK
+LA
+NW
 HZ
 Up
 ZU
@@ -19507,25 +19507,25 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-Lm
-Lm
-Zo
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-Bs
-Lm
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+fJ
+fJ
+vK
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+iG
+fJ
+NW
+NW
+NW
 HZ
 Up
 yT
@@ -19558,7 +19558,7 @@ sA
 KH
 np
 SD
-wl
+Kl
 Zt
 mX
 mX
@@ -19638,24 +19638,24 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-Lm
-Lm
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-Lm
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+fJ
+fJ
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+fJ
+NW
+NW
+NW
 HZ
 Up
 Dq
@@ -19769,23 +19769,23 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-Lm
-Lm
-Lm
-pl
-pl
-pl
-pl
-pl
-OT
-Lm
-BK
-pl
-pl
+NW
+NW
+NW
+NW
+fJ
+fJ
+fJ
+NW
+NW
+NW
+NW
+NW
+BO
+fJ
+IC
+NW
+NW
 HZ
 Up
 Qp
@@ -19818,7 +19818,7 @@ np
 np
 AP
 mR
-lO
+QM
 mX
 Ri
 Aj
@@ -19901,21 +19901,21 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-Lm
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+fJ
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
 HZ
 Up
 ML
@@ -20031,17 +20031,17 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-Zo
-Zo
-Zo
-pl
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+vK
+vK
+vK
+NW
+NW
+NW
+NW
 ag
 ag
 ag
@@ -20161,17 +20161,17 @@ ag
 ag
 ag
 ag
-pl
-pl
-Lm
-Zo
-Zo
-pl
-Zo
-pl
-pl
-pl
-pl
+NW
+NW
+fJ
+vK
+vK
+NW
+vK
+NW
+NW
+NW
+NW
 ag
 ag
 ag
@@ -20291,17 +20291,17 @@ ag
 ag
 ag
 ag
-pl
-pl
-Ze
-pl
-pl
-pl
-Zo
-Lm
-Ze
-pl
-pl
+NW
+NW
+Zj
+NW
+NW
+NW
+vK
+fJ
+Zj
+NW
+NW
 ag
 ag
 ag
@@ -20421,17 +20421,17 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
 ag
 ag
 ag
@@ -20551,17 +20551,17 @@ ag
 ag
 ag
 ag
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
-pl
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+NW
 ag
 ag
 ag
@@ -20719,7 +20719,7 @@ lB
 WZ
 yn
 WZ
-qM
+nE
 ZP
 ZP
 gY
@@ -20849,7 +20849,7 @@ Sg
 WZ
 yn
 WZ
-qY
+QU
 Yo
 JY
 ZP
@@ -20979,7 +20979,7 @@ Aq
 WZ
 yn
 WZ
-qY
+QU
 rb
 ZP
 tg
@@ -21109,7 +21109,7 @@ Aq
 WZ
 yn
 WZ
-lS
+zQ
 ZP
 GY
 ZP
@@ -21499,7 +21499,7 @@ QK
 ZX
 Vy
 ZX
-iw
+iI
 VB
 VB
 VB
diff --git a/_maps/map_files/vanderlin/vanderlin.dmm b/_maps/map_files/vanderlin/vanderlin.dmm
index 659ed135f22..0d7850c6952 100644
--- a/_maps/map_files/vanderlin/vanderlin.dmm
+++ b/_maps/map_files/vanderlin/vanderlin.dmm
@@ -462,6 +462,14 @@
 	},
 /turf/open/floor/cobblerock,
 /area/outdoors/exposed/church)
+"alG" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/water_vent,
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "alR" = (
 /obj/structure/chair/wood/alt{
 	dir = 4
@@ -2098,25 +2106,6 @@
 /obj/structure/fluff/walldeco/church/line,
 /turf/open/floor/church/purple,
 /area/indoors/town/church/inquisition)
-"aYX" = (
-/obj/structure/stairs{
-	dir = 1
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fluff/railing/border{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/structure/fluff/railing/border{
-	dir = 5;
-	pixel_x = -24;
-	pixel_y = -24
-	},
-/turf/open/floor/concrete,
-/area/indoors/town)
 "aZa" = (
 /obj/structure/chair/wood/alt/chair_noble/purple{
 	dir = 8
@@ -4401,17 +4390,6 @@
 /obj/structure/fluff/steamvent,
 /turf/open/floor/metal/barograte,
 /area/indoors/town/bath)
-"cgt" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/machinery/light/fueled/lanternpost/fixed{
-	pixel_x = -2;
-	pixel_y = 5
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "cgC" = (
 /obj/structure/door/green,
 /turf/open/floor/wood,
@@ -6314,21 +6292,6 @@
 "cWu" = (
 /turf/open/floor/ruinedwood,
 /area/indoors/town/merc_guild)
-"cWD" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/water_vent,
-/obj/structure/fluff/railing/border{
-	dir = 4
-	},
-/obj/machinery/light/fueled/lanternpost/fixed{
-	dir = 1;
-	pixel_y = 10
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "cWN" = (
 /obj/structure/closet/crate/crafted_closet,
 /obj/item/reagent_containers/food/snacks/hardtack,
@@ -6881,6 +6844,17 @@
 /obj/structure/chair/stool,
 /turf/open/floor/churchrough,
 /area/indoors/town/clinic_large)
+"dlN" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/machinery/light/fueled/lanternpost/fixed{
+	pixel_x = -2;
+	pixel_y = 5
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "dlV" = (
 /obj/machinery/light/fueled/wallfire/candle,
 /obj/structure/fluff/railing/wood{
@@ -7431,17 +7405,6 @@
 "dzP" = (
 /turf/open/water/bath,
 /area/indoors/town/noble_manor/red)
-"dzW" = (
-/obj/machinery/light/fueled/lanternpost/fixed{
-	pixel_x = -5;
-	pixel_y = 6
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "dAl" = (
 /obj/structure/rack,
 /obj/item/clothing/shoes/boots,
@@ -8182,6 +8145,20 @@
 /obj/machinery/light/fueled/wallfire/candle,
 /turf/open/floor/tile,
 /area/indoors/town/keep/halls/e)
+"dTO" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/stairs{
+	dir = 4
+	},
+/obj/structure/fluff/railing/border,
+/obj/structure/fluff/railing/border{
+	dir = 10
+	},
+/turf/open/floor/ruinedwood/turned/darker,
+/area/indoors/town/theatre)
 "dTP" = (
 /obj/structure/pillory,
 /obj/effect/decal/borderfall{
@@ -9497,18 +9474,6 @@
 /obj/effect/decal/cobbleedge,
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town/steward)
-"eFK" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fluff/buysign{
-	name = "Vanderlin Train Station";
-	pixel_x = 1;
-	pixel_y = 3
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "eFN" = (
 /obj/structure/closet/crate/chest/crate,
 /turf/open/floor/metal/barograte,
@@ -10616,12 +10581,6 @@
 /obj/structure/table/wood/reinforced_alter,
 /turf/open/floor/wood/nosmooth,
 /area/indoors/town/vault)
-"ffE" = (
-/obj/structure/door,
-/obj/effect/mapping_helpers/access/locker,
-/obj/effect/mapping_helpers/access/keyset/town/bathhouse,
-/turf/open/floor/cobblerock,
-/area/outdoors/town)
 "ffR" = (
 /obj/item/key/vault,
 /obj/effect/mapping_helpers/access/locker,
@@ -10995,6 +10954,17 @@
 	},
 /turf/open/water/bath,
 /area/indoors/town/keep/lord_appt)
+"fqK" = (
+/obj/machinery/light/fueled/wallfire/candle/l{
+	pixel_x = -32;
+	pixel_y = 21
+	},
+/obj/structure/bed/wool,
+/obj/effect/landmark/start/blacksmith{
+	dir = 4
+	},
+/turf/open/floor/ruinedwood/alt,
+/area/indoors/town/smithy)
 "fro" = (
 /obj/structure/grindwheel,
 /turf/open/floor/dirt,
@@ -11424,21 +11394,6 @@
 "fBg" = (
 /turf/open/floor/cobble,
 /area/under/town/basement)
-"fBt" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fluff/railing/border{
-	dir = 4
-	},
-/obj/machinery/light/fueled/lanternpost/fixed{
-	dir = 1;
-	pixel_x = -6;
-	pixel_y = 8
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "fBC" = (
 /obj/structure/chair/hotspring_bench/right{
 	dir = 1
@@ -11748,20 +11703,6 @@
 	dir = 8
 	},
 /area/under/cavewet)
-"fJQ" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/stairs{
-	dir = 8
-	},
-/obj/structure/fluff/railing/border,
-/obj/structure/fluff/railing/border{
-	dir = 6
-	},
-/turf/open/floor/ruinedwood/turned/darker,
-/area/indoors/town/theatre)
 "fJW" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -16301,6 +16242,13 @@
 /obj/structure/stairs,
 /turf/open/floor/ruinedwood/turned,
 /area/indoors/town)
+"hYa" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "hYb" = (
 /obj/effect/decal/carpet{
 	pixel_x = 16;
@@ -18867,6 +18815,11 @@
 	},
 /turf/open/floor/churchmarble,
 /area/indoors/town/church/chapel)
+"jiF" = (
+/obj/structure/table/wood/plain,
+/obj/item/natural/clod/dirt,
+/turf/open/floor/cobble,
+/area/under/dungeon)
 "jiO" = (
 /obj/item/bin/water,
 /turf/open/floor/tile/bath,
@@ -20135,6 +20088,18 @@
 	},
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town/theatre)
+"jOc" = (
+/obj/machinery/light/fueled/lanternpost/fixed{
+	dir = 1;
+	pixel_x = -1;
+	pixel_y = 6
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "jOj" = (
 /obj/structure/handcart{
 	dir = 4
@@ -20339,13 +20304,6 @@
 	},
 /turf/open/floor/blocks,
 /area/indoors/town/keep)
-"jUk" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/closed/mineral,
-/area/under/cave)
 "jUl" = (
 /obj/structure/closet/crate/crafted_closet,
 /obj/item/clothing/shirt/undershirt/lowcut,
@@ -22774,6 +22732,17 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/herringbone,
 /area/indoors/town/garrison)
+"ldG" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/fluff/buysign{
+	name = "Vanderlin Train Station";
+	pixel_y = 5
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "ldI" = (
 /obj/item/natural/stone,
 /turf/open/floor/cobblerock,
@@ -23412,6 +23381,17 @@
 "luO" = (
 /turf/open/floor/carpet/royalblack,
 /area/indoors/town/church)
+"luR" = (
+/obj/machinery/light/fueled/wallfire/candle/r{
+	pixel_x = 32;
+	pixel_y = 24
+	},
+/obj/structure/bed/wool,
+/obj/effect/landmark/start/blacksmith{
+	dir = 8
+	},
+/turf/open/floor/ruinedwood/alt,
+/area/indoors/town/smithy)
 "luY" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood,
@@ -24990,6 +24970,10 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/herringbone,
 /area/indoors/town)
+"mhY" = (
+/obj/structure/pillory/church,
+/turf/open/floor/churchrough,
+/area/indoors/town/church/chapel)
 "mis" = (
 /obj/item/coin/silver/pile,
 /obj/structure/fluff/railing/border{
@@ -26012,21 +25996,6 @@
 /obj/effect/mapping_helpers/access/keyset/manor/atarms,
 /turf/open/floor/woodturned/nosmooth,
 /area/indoors/town/keep/knight)
-"mHH" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fluff/railing/border{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/machinery/light/fueled/lanternpost/fixed{
-	pixel_x = 7;
-	pixel_y = 9
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "mHR" = (
 /turf/closed/wall/mineral/wood,
 /area/indoors/town/keep/throne)
@@ -26188,6 +26157,10 @@
 	},
 /turf/open/floor/ruinedwood/spiral,
 /area/under/town/basement)
+"mLx" = (
+/obj/effect/landmark/start/blacksmith,
+/turf/open/floor/cobble,
+/area/indoors/town/smithy)
 "mLy" = (
 /obj/structure/roguerock,
 /turf/open/floor/dirt,
@@ -27472,6 +27445,12 @@
 	},
 /turf/open/floor/ruinedwood/two,
 /area/indoors/town/shop)
+"noF" = (
+/obj/effect/landmark/start/blacksmith{
+	dir = 4
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town/smithy)
 "noJ" = (
 /obj/structure/fermentation_keg,
 /obj/machinery/light/fueled/torchholder/r,
@@ -27863,17 +27842,6 @@
 	},
 /turf/open/floor/tile/bath,
 /area/under/town/basement)
-"nAC" = (
-/obj/machinery/light/fueled/wallfire/candle/r{
-	pixel_x = 32;
-	pixel_y = 24
-	},
-/obj/structure/bed/wool,
-/obj/effect/landmark/start/blacksmith{
-	dir = 8
-	},
-/turf/open/floor/ruinedwood/alt,
-/area/indoors/town/smithy)
 "nAO" = (
 /obj/structure/closet/crate/crafted_closet,
 /obj/item/clothing/shirt/undershirt/colored/random,
@@ -28359,12 +28327,6 @@
 /obj/item/weapon/hammer/iron,
 /turf/open/floor/blocks/newstone/alt,
 /area/indoors/town/smithy)
-"nPR" = (
-/obj/effect/landmark/start/blacksmith{
-	dir = 4
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town/smithy)
 "nPT" = (
 /obj/structure/stairs,
 /turf/open/floor/wood,
@@ -28777,17 +28739,6 @@
 	dir = 8
 	},
 /area/outdoors/river)
-"nZP" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/fluff/buysign{
-	name = "Vanderlin Train Station";
-	pixel_y = 5
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "oaa" = (
 /obj/structure/closet/crate/crafted_closet/dark,
 /obj/machinery/light/fueled/wallfire/candle/blue/l,
@@ -29116,6 +29067,20 @@
 /obj/effect/mapping_helpers/access/keyset/manor/lord,
 /turf/open/floor/blocks,
 /area/under/town/basement)
+"ojY" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/stairs{
+	dir = 8
+	},
+/obj/structure/fluff/railing/border,
+/obj/structure/fluff/railing/border{
+	dir = 6
+	},
+/turf/open/floor/ruinedwood/turned/darker,
+/area/indoors/town/theatre)
 "okh" = (
 /obj/structure/fluff/walldeco/church/line{
 	dir = 1
@@ -30282,6 +30247,21 @@
 	},
 /turf/open/floor/metal/barograte,
 /area/outdoors/town)
+"oHJ" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/fluff/railing/border{
+	dir = 4
+	},
+/obj/machinery/light/fueled/lanternpost/fixed{
+	dir = 1;
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "oHO" = (
 /obj/structure/bars,
 /turf/open/water/sewer,
@@ -30300,6 +30280,21 @@
 /obj/item/coin/copper/pile,
 /turf/open/floor/carpet/green,
 /area/indoors/town/merc_guild)
+"oIj" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/water_vent,
+/obj/structure/fluff/railing/border{
+	dir = 4
+	},
+/obj/machinery/light/fueled/lanternpost/fixed{
+	dir = 1;
+	pixel_y = 10
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "oIk" = (
 /obj/structure/table/wood/reinforced_alter,
 /obj/item/clothing/face/cigarette/pipe/westman,
@@ -30419,6 +30414,12 @@
 /obj/structure/water_pipe,
 /turf/open/floor/ruinedwood/turned,
 /area/outdoors/town/roofs)
+"oKO" = (
+/obj/structure/door,
+/obj/effect/mapping_helpers/access/locker,
+/obj/effect/mapping_helpers/access/keyset/town/bathhouse,
+/turf/open/floor/cobblerock,
+/area/outdoors/town)
 "oLb" = (
 /obj/structure/rack/shelf/biggest,
 /obj/structure/fluff/nest,
@@ -30674,10 +30675,6 @@
 "oSq" = (
 /turf/open/floor/tile/kitchen,
 /area/indoors/town/noble_manor/red)
-"oSv" = (
-/obj/structure/fluff/clodpile/dirt,
-/turf/open/floor/grass/yel,
-/area/outdoors/exposed/church)
 "oSH" = (
 /obj/structure/table/wood/counter/end{
 	dir = 4
@@ -31099,6 +31096,25 @@
 /obj/structure/fluff/wallclock,
 /turf/open/floor/metal/alt,
 /area/indoors/town/keep/gate)
+"pcO" = (
+/obj/structure/stairs{
+	dir = 1
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/fluff/railing/border{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/structure/fluff/railing/border{
+	dir = 5;
+	pixel_x = -24;
+	pixel_y = -24
+	},
+/turf/open/floor/concrete,
+/area/indoors/town)
 "pcP" = (
 /turf/open/water/ocean,
 /area/outdoors/town/noble_manor/yellow)
@@ -32030,20 +32046,6 @@
 /obj/item/clothing/face/cigarette/pipe/westman,
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town)
-"pAn" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/stairs{
-	dir = 4
-	},
-/obj/structure/fluff/railing/border,
-/obj/structure/fluff/railing/border{
-	dir = 10
-	},
-/turf/open/floor/ruinedwood/turned/darker,
-/area/indoors/town/theatre)
 "pAu" = (
 /obj/structure/closet/crate/crafted_closet/dark,
 /obj/item/clothing/shoes/boots/leather,
@@ -33104,13 +33106,6 @@
 /obj/structure/fluff/statue/tdummy,
 /turf/open/floor/dirt,
 /area/under/cave)
-"qav" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/metal/barograte,
-/area/indoors/town)
 "qaH" = (
 /obj/structure/barricade/wooden/crude,
 /turf/open/openspace,
@@ -33166,6 +33161,23 @@
 "qcM" = (
 /turf/closed/wall/mineral/stone,
 /area/indoors/town/keep/servant)
+"qcS" = (
+/obj/structure/table/wood/plain,
+/obj/item/kitchen/fork/iron{
+	pixel_x = -11;
+	pixel_y = 1
+	},
+/obj/item/natural/clod/dirt,
+/obj/item/plate{
+	pixel_x = 4;
+	pixel_y = 6
+	},
+/obj/item/reagent_containers/food/snacks/stale_bread/raisin/poison{
+	pixel_x = 5;
+	pixel_y = 13
+	},
+/turf/open/floor/cobble,
+/area/indoors/dungeon)
 "qdy" = (
 /obj/structure/fluff/railing/wood{
 	dir = 4
@@ -33543,6 +33555,13 @@
 /mob/living/simple_animal/hostile/retaliate/bigrat,
 /turf/open/floor/cobble,
 /area/indoors/dungeon)
+"qmH" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/closed/mineral,
+/area/under/cave)
 "qmT" = (
 /obj/structure/fluff/statue/knight/interior{
 	layer = 4.2
@@ -36683,6 +36702,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town/garrison)
+"rMt" = (
+/obj/structure/door,
+/obj/effect/mapping_helpers/access/locker,
+/obj/effect/mapping_helpers/access/keyset/town/bathhouse,
+/turf/open/floor/twig,
+/area/indoors/town/clinic_large/apothecary)
 "rMu" = (
 /obj/structure/chair/stool{
 	dir = 1
@@ -37803,10 +37828,6 @@
 	},
 /turf/open/floor/twig,
 /area/under/town/basement)
-"slV" = (
-/obj/effect/landmark/start/blacksmith,
-/turf/open/floor/cobble,
-/area/indoors/town/smithy)
 "smb" = (
 /obj/structure/fluff/walldeco/sparrowflag,
 /turf/closed/wall/mineral/stone,
@@ -38607,12 +38628,6 @@
 /obj/structure/fluff/walldeco/church/line,
 /turf/open/floor/churchmarble/violet,
 /area/indoors/town/church/inquisition)
-"sGi" = (
-/obj/structure/door,
-/obj/effect/mapping_helpers/access/locker,
-/obj/effect/mapping_helpers/access/keyset/town/bathhouse,
-/turf/open/floor/twig,
-/area/indoors/town/clinic_large/apothecary)
 "sGo" = (
 /obj/structure/fluff/railing/wood,
 /obj/structure/fluff/railing/border{
@@ -40822,6 +40837,21 @@
 	},
 /turf/open/floor/ruinedwood/turned/darker,
 /area/indoors/soilsons)
+"tJJ" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/fluff/railing/border{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/machinery/light/fueled/lanternpost/fixed{
+	pixel_x = 7;
+	pixel_y = 9
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "tKa" = (
 /obj/structure/rack/shelf{
 	pixel_x = 32;
@@ -41235,6 +41265,10 @@
 /obj/item/clothing/face/facemask,
 /turf/open/floor/churchbrick,
 /area/indoors/town/church/inquisition)
+"tRr" = (
+/obj/structure/fluff/clodpile/dirt,
+/turf/open/floor/grass/yel,
+/area/outdoors/exposed/church)
 "tRs" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/landmark/latejoin,
@@ -41380,6 +41414,17 @@
 /obj/structure/chair/stool/bar,
 /turf/open/floor/twig,
 /area/indoors/town/church/inquisition)
+"tWJ" = (
+/obj/machinery/light/fueled/lanternpost/fixed{
+	pixel_x = -5;
+	pixel_y = 6
+	},
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "tWQ" = (
 /obj/structure/bars,
 /obj/machinery/light/fueled/wallfire/candle{
@@ -42934,14 +42979,6 @@
 	},
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town/theatre)
-"uIW" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/obj/structure/water_vent,
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "uIZ" = (
 /obj/structure/curtain/bounty/dir{
 	dir = 1
@@ -42971,11 +43008,6 @@
 	},
 /turf/open/floor/ruinedwood/turned,
 /area/outdoors/town)
-"uKd" = (
-/obj/structure/table/wood/plain,
-/obj/item/natural/clod/dirt,
-/turf/open/floor/cobble,
-/area/under/dungeon)
 "uKe" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/crate/chest/neu,
@@ -43367,6 +43399,13 @@
 	},
 /turf/open/openspace,
 /area/outdoors/river)
+"uSe" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/turf/open/floor/metal/barograte,
+/area/indoors/town)
 "uSf" = (
 /obj/machinery/light/fueled/wallfire/candle,
 /turf/open/openspace,
@@ -46662,13 +46701,6 @@
 "wpf" = (
 /turf/closed/wall/mineral/decorstone,
 /area/under/town/basement)
-"wpC" = (
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "wpH" = (
 /obj/structure/fluff/railing/border{
 	dir = 8
@@ -46782,6 +46814,18 @@
 	},
 /turf/open/floor/naturalstone,
 /area/under/cave)
+"wtc" = (
+/obj/effect/decal/borderfall{
+	dir = 1;
+	icon_state = "borderfall"
+	},
+/obj/structure/fluff/buysign{
+	name = "Vanderlin Train Station";
+	pixel_x = 1;
+	pixel_y = 3
+	},
+/turf/open/floor/herringbone,
+/area/indoors/town)
 "wtd" = (
 /obj/structure/door/stone,
 /obj/effect/mapping_helpers/access/locker,
@@ -47150,17 +47194,6 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/indoors/town/keep/halls/e)
-"wzT" = (
-/obj/machinery/light/fueled/wallfire/candle/l{
-	pixel_x = -32;
-	pixel_y = 21
-	},
-/obj/structure/bed/wool,
-/obj/effect/landmark/start/blacksmith{
-	dir = 4
-	},
-/turf/open/floor/ruinedwood/alt,
-/area/indoors/town/smithy)
 "wzU" = (
 /obj/effect/mapping_helpers/access/keyset/town/clinic,
 /obj/structure/door/stone{
@@ -48600,10 +48633,6 @@
 /obj/machinery/light/fueled/wallfire/candle/l,
 /turf/open/floor/blocks,
 /area/under/town/basement)
-"xeA" = (
-/obj/structure/pillory/church,
-/turf/open/floor/churchrough,
-/area/indoors/town/church/chapel)
 "xeB" = (
 /obj/structure/fluff/walldeco/bath/wallpipes/innie{
 	dir = 8;
@@ -49283,18 +49312,6 @@
 	},
 /turf/open/floor/blocks,
 /area/indoors/town/cell)
-"xuL" = (
-/obj/machinery/light/fueled/lanternpost/fixed{
-	dir = 1;
-	pixel_x = -1;
-	pixel_y = 6
-	},
-/obj/effect/decal/cobbleedge{
-	dir = 1;
-	icon_state = "borderfall"
-	},
-/turf/open/floor/herringbone,
-/area/indoors/town)
 "xuM" = (
 /obj/machinery/light/fueled/torchholder{
 	pixel_y = 26
@@ -50412,23 +50429,6 @@
 	},
 /turf/open/floor/ruinedwood/chevron,
 /area/indoors/town/keep/knight)
-"xYs" = (
-/obj/structure/table/wood/plain,
-/obj/item/kitchen/fork/iron{
-	pixel_x = -11;
-	pixel_y = 1
-	},
-/obj/item/natural/clod/dirt,
-/obj/item/plate{
-	pixel_x = 4;
-	pixel_y = 6
-	},
-/obj/item/reagent_containers/food/snacks/stale_bread/raisin/poison{
-	pixel_x = 5;
-	pixel_y = 13
-	},
-/turf/open/floor/cobble,
-/area/indoors/dungeon)
 "xYC" = (
 /obj/structure/fluff/railing/wood{
 	dir = 1
@@ -73203,7 +73203,7 @@ kQk
 vHN
 iXi
 vHN
-cgt
+dlN
 hvD
 dZO
 dZO
@@ -73405,7 +73405,7 @@ kQk
 vHN
 iXi
 vHN
-wpC
+hYa
 pKj
 pKj
 pKj
@@ -73607,7 +73607,7 @@ kQk
 vHN
 iXi
 vHN
-qav
+uSe
 avE
 avE
 wwO
@@ -73809,7 +73809,7 @@ kQk
 vHN
 wlG
 vHN
-xuL
+jOc
 pKj
 pKj
 pKj
@@ -74011,7 +74011,7 @@ kQk
 vHN
 iXi
 vHN
-dzW
+tWJ
 pKj
 pKj
 ifB
@@ -74213,7 +74213,7 @@ qnc
 vHN
 boC
 vHN
-uIW
+alG
 pKj
 tBC
 pKj
@@ -74415,7 +74415,7 @@ kQk
 vHN
 iXi
 vHN
-aYX
+pcO
 pKj
 arn
 pKj
@@ -75021,7 +75021,7 @@ qnc
 vHN
 syd
 vHN
-uIW
+alG
 pKj
 bkC
 pKj
@@ -75223,7 +75223,7 @@ kQk
 vHN
 uQs
 vHN
-eFK
+wtc
 pKj
 arn
 pKj
@@ -75425,7 +75425,7 @@ kQk
 vHN
 cHg
 vHN
-fBt
+oHJ
 xby
 iss
 pKj
@@ -76435,7 +76435,7 @@ kQk
 vHN
 dkU
 vHN
-mHH
+tJJ
 jsW
 pKj
 ifB
@@ -76637,7 +76637,7 @@ kQk
 vHN
 iXi
 vHN
-nZP
+ldG
 pKj
 eFN
 eFN
@@ -76839,7 +76839,7 @@ qnc
 vHN
 iXi
 vHN
-uIW
+alG
 pKj
 pKj
 pKj
@@ -77647,7 +77647,7 @@ qnc
 vHN
 iXi
 vHN
-cWD
+oIj
 umU
 umU
 umU
@@ -100603,7 +100603,7 @@ kst
 oox
 aWh
 tOV
-jUk
+qmH
 qFx
 qFx
 qFx
@@ -100805,7 +100805,7 @@ hvk
 nRQ
 nRQ
 tOV
-jUk
+qmH
 qFx
 qFx
 qFx
@@ -103119,7 +103119,7 @@ dID
 hPy
 cTy
 uGo
-uKd
+jiF
 oRE
 qzA
 alT
@@ -106061,7 +106061,7 @@ mFi
 kYR
 kYR
 caG
-ffE
+oKO
 caG
 caG
 nsU
@@ -107881,7 +107881,7 @@ gRT
 cqF
 osm
 osm
-sGi
+rMt
 osm
 eII
 eII
@@ -112536,7 +112536,7 @@ hZn
 czz
 tni
 gjf
-slV
+mLx
 mNY
 mWB
 mWB
@@ -112745,7 +112745,7 @@ mWB
 hCp
 qCW
 hCp
-nPR
+noF
 mWB
 gjf
 gjf
@@ -117211,7 +117211,7 @@ lfz
 jOb
 siH
 pjQ
-pAn
+dTO
 sLd
 bQr
 bQr
@@ -118221,7 +118221,7 @@ lfz
 jOb
 siH
 ete
-fJQ
+ojY
 sLd
 uyo
 uyo
@@ -123860,7 +123860,7 @@ oSl
 oSl
 iKJ
 qVo
-oSv
+tRr
 oUP
 oUP
 oUP
@@ -143928,7 +143928,7 @@ iNw
 lKh
 bAc
 gHa
-xYs
+qcS
 fWu
 fdD
 bAc
@@ -152336,7 +152336,7 @@ mVa
 gxj
 pAu
 sIT
-wzT
+fqK
 jfx
 iyb
 jyt
@@ -152740,7 +152740,7 @@ bYD
 gxj
 wfv
 sIT
-nAC
+luR
 wqE
 nce
 cyv
@@ -166045,7 +166045,7 @@ lgf
 bLT
 jqG
 mkW
-xeA
+mhY
 vCF
 jCo
 cwj
diff --git a/_maps/map_files/vanderlin/vanderlin_bog.dmm b/_maps/map_files/vanderlin/vanderlin_bog.dmm
index 1dc22ae9059..10c9c395d16 100644
--- a/_maps/map_files/vanderlin/vanderlin_bog.dmm
+++ b/_maps/map_files/vanderlin/vanderlin_bog.dmm
@@ -2779,7 +2779,7 @@
 /turf/open/water/swamp/deep,
 /area/outdoors/bog)
 "bNO" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -3638,7 +3638,7 @@
 	},
 /area/indoors/wilderness/magic)
 "dez" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -6904,7 +6904,7 @@
 /turf/closed/mineral/bedrock/cold,
 /area/under/cavewet)
 "hrY" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -7824,7 +7824,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 4
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -8174,7 +8174,7 @@
 	},
 /area/under/cavewet)
 "jcE" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -14308,7 +14308,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 8
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
diff --git a/_maps/map_files/vanderlin/vanderlin_forest.dmm b/_maps/map_files/vanderlin/vanderlin_forest.dmm
index 9a2ec849428..c9a48a74891 100644
--- a/_maps/map_files/vanderlin/vanderlin_forest.dmm
+++ b/_maps/map_files/vanderlin/vanderlin_forest.dmm
@@ -573,7 +573,7 @@
 /turf/closed/wall/mineral/wooddark/vertical,
 /area/outdoors/wilderness)
 "hn" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall";
 	pixel_y = 3
@@ -657,7 +657,7 @@
 /area/outdoors/wilderness)
 "ih" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall";
 	pixel_y = 3
@@ -948,7 +948,7 @@
 /turf/open/floor/herringbone,
 /area/indoors/dungeon)
 "kJ" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall";
 	pixel_y = 3
@@ -2350,7 +2350,7 @@
 /turf/open/floor/ruinedwood/darker,
 /area/indoors/wilderness/shop)
 "BU" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall";
 	pixel_y = 3
@@ -2557,7 +2557,7 @@
 	},
 /area/outdoors/wilderness)
 "DK" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall";
 	pixel_y = 3
@@ -2594,7 +2594,7 @@
 "DW" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall";
 	pixel_y = 3
@@ -3152,7 +3152,7 @@
 /turf/open/floor/sandstone_tile/four,
 /area/indoors/dungeon)
 "Kl" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall";
 	pixel_y = 3
diff --git a/_maps/map_files/voyager/island_boat.dmm b/_maps/map_files/voyager/island_boat.dmm
index 78c88fddb40..55876090728 100644
--- a/_maps/map_files/voyager/island_boat.dmm
+++ b/_maps/map_files/voyager/island_boat.dmm
@@ -67,7 +67,7 @@
 /turf/template_noop,
 /area/template_noop)
 "v" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/wood,
@@ -81,7 +81,7 @@
 /turf/template_noop,
 /area/template_noop)
 "z" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -102,7 +102,7 @@
 /turf/template_noop,
 /area/template_noop)
 "G" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -113,7 +113,7 @@
 /turf/open/floor/twig,
 /area/template_noop)
 "L" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/wood,
@@ -121,7 +121,7 @@
 /turf/open/floor/hay,
 /area/template_noop)
 "N" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
diff --git a/_maps/map_files/voyager/old_ship.dmm b/_maps/map_files/voyager/old_ship.dmm
index 509928a657e..a3d441229f4 100644
--- a/_maps/map_files/voyager/old_ship.dmm
+++ b/_maps/map_files/voyager/old_ship.dmm
@@ -12,7 +12,7 @@
 	icon_state = "border"
 	},
 /obj/structure/fluff/railing/border,
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -344,7 +344,7 @@
 	icon_state = "border"
 	},
 /obj/structure/fluff/railing/border,
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
diff --git a/_maps/map_files/voyager/voyager.dmm b/_maps/map_files/voyager/voyager.dmm
index a83509a9aaa..9bbe424c374 100644
--- a/_maps/map_files/voyager/voyager.dmm
+++ b/_maps/map_files/voyager/voyager.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "ab" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /turf/open/floor/hay,
@@ -162,7 +162,7 @@
 /turf/open/floor/cobble,
 /area/ship/middeck)
 "bj" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -431,7 +431,7 @@
 /obj/item/reagent_containers/powder/blastpowder,
 /obj/item/reagent_containers/powder/blastpowder,
 /obj/item/reagent_containers/powder/blastpowder,
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -775,7 +775,7 @@
 /turf/open/floor/church,
 /area/indoors/town/church/chapel)
 "eT" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/machinery/light/fueled/wallfire/candle/l,
@@ -797,7 +797,7 @@
 /turf/open/floor/churchrough,
 /area/indoors/town/church/chapel)
 "eW" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -806,7 +806,7 @@
 	},
 /area/ship/middeck)
 "fd" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -868,7 +868,7 @@
 /turf/open/floor/metal/barograte,
 /area/ship/middeck)
 "fr" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -918,7 +918,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 4
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 4
 	},
@@ -977,7 +977,7 @@
 /turf/open/floor/wood,
 /area/ship/middeck)
 "ge" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /turf/open/floor/hay,
@@ -1339,7 +1339,7 @@
 /turf/open/floor/herringbone,
 /area/ship/middeck)
 "ik" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/border,
@@ -1578,7 +1578,7 @@
 /turf/open/floor/ruinedwood/spiral,
 /area/ship/topdeck)
 "kh" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -1658,7 +1658,7 @@
 /turf/open/floor/wood,
 /area/ship/middeck)
 "kF" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/machinery/light/fueled/wallfire/candle/r,
@@ -1905,7 +1905,7 @@
 /obj/item/natural/fur,
 /obj/item/natural/fur,
 /obj/item/natural/fur,
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/border,
@@ -2833,7 +2833,7 @@
 /turf/open/floor/blocks/newstone/alt,
 /area/ship/middeck)
 "sJ" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/ladder,
@@ -2963,7 +2963,7 @@
 /turf/open/floor/ruinedwood/chevron,
 /area/indoors/town/vault)
 "tw" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -3056,7 +3056,7 @@
 	},
 /area/ship/nobledeck)
 "tZ" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -3422,7 +3422,7 @@
 /turf/open/floor/tile/diamond/purple,
 /area/ship/middeck)
 "wc" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 4
 	},
@@ -3553,7 +3553,7 @@
 /turf/open/floor/hay,
 /area/ship/topdeck)
 "wX" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -3599,7 +3599,7 @@
 /turf/closed/wall/mineral/wooddark/vertical,
 /area/indoors/town/vault)
 "xu" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -4632,7 +4632,7 @@
 /turf/open/floor/church/purple,
 /area/indoors/town/church/inquisition)
 "ED" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/wood,
@@ -4748,7 +4748,7 @@
 /turf/open/floor/churchmarble,
 /area/indoors/town/church/chapel)
 "Ft" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -4761,7 +4761,7 @@
 /obj/structure/cannon{
 	dir = 1
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -4904,7 +4904,7 @@
 /turf/closed/wall/mineral/wooddark/horizontal,
 /area/ship/nobledeck)
 "Gy" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -5743,7 +5743,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 4
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 4
 	},
@@ -5753,7 +5753,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 4
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 4
 	},
@@ -5897,7 +5897,7 @@
 /turf/open/floor/tile,
 /area/indoors/town/vault)
 "NA" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /turf/open/floor/rooftop/green{
@@ -6036,7 +6036,7 @@
 /turf/open/floor/herringbone,
 /area/ship/middeck)
 "Ot" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -6051,7 +6051,7 @@
 /turf/open/floor/ruinedwood/spiral,
 /area/ship/topdeck)
 "Ov" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -6120,7 +6120,7 @@
 /turf/open/floor/wood,
 /area/ship/middeck)
 "OO" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -6190,7 +6190,7 @@
 /turf/open/floor/churchmarble,
 /area/indoors/town/church/chapel)
 "Px" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/border,
@@ -6214,7 +6214,7 @@
 /turf/open/floor/ruinedwood/spiral,
 /area/ship/nobledeck)
 "PI" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/wood{
@@ -6423,7 +6423,7 @@
 /turf/open/floor/ruinedwood/darker,
 /area/ship/middeck)
 "QS" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -6518,7 +6518,7 @@
 /turf/open/floor/blocks,
 /area/indoors/town/church)
 "Rw" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -6730,7 +6730,7 @@
 /turf/open/floor/wood,
 /area/ship/middeck)
 "Sz" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/border,
@@ -7329,7 +7329,7 @@
 /turf/open/floor/carpet/lord/right,
 /area/ship/nobledeck)
 "VR" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/wood,
@@ -7805,14 +7805,14 @@
 /obj/structure/fluff/railing/border{
 	dir = 4
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 4
 	},
 /obj/effect/decal/cobbleedge{
 	dir = 9
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 4
 	},
@@ -7848,7 +7848,7 @@
 /turf/open/floor/ruinedwood/spiral,
 /area/ship/topdeck)
 "Zw" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall"
 	},
 /obj/structure/fluff/railing/border,
@@ -7875,7 +7875,7 @@
 /turf/open/water/bath,
 /area/ship/middeck)
 "Zz" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
diff --git a/_maps/map_files/whitepalacepass/WhitePalacePass.dmm b/_maps/map_files/whitepalacepass/WhitePalacePass.dmm
index de1ab91b747..ba1b86e676a 100644
--- a/_maps/map_files/whitepalacepass/WhitePalacePass.dmm
+++ b/_maps/map_files/whitepalacepass/WhitePalacePass.dmm
@@ -1635,7 +1635,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 4
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall"
 	},
@@ -3494,7 +3494,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 1
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -4695,7 +4695,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 1
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -5496,7 +5496,7 @@
 /turf/open/water/swamp,
 /area/under/cave)
 "fpu" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall";
 	pixel_x = 7
@@ -6283,7 +6283,7 @@
 /turf/open/floor/tile/kitchen,
 /area/indoors/town/church)
 "fZf" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall";
 	pixel_x = 7
@@ -7326,7 +7326,7 @@
 /turf/open/floor/carpet/purple,
 /area/indoors/town/keep/library)
 "gQp" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -8937,7 +8937,7 @@
 /turf/closed/wall/mineral/decorstone,
 /area/under/cave)
 "ifv" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1;
 	pixel_y = 4
@@ -9675,7 +9675,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 5
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -11312,11 +11312,11 @@
 /turf/open/floor/cobble,
 /area/indoors/town/keep/phys)
 "kyD" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall"
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -12088,7 +12088,7 @@
 /turf/open/floor/dirt/road,
 /area/indoors/town/smithy)
 "laL" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -12142,7 +12142,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 9
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -13544,7 +13544,7 @@
 /turf/open/floor/ruinedwood/spiral,
 /area/indoors/town/garrison)
 "mCU" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1;
 	pixel_y = 4
@@ -14293,7 +14293,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 4
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall"
 	},
@@ -17087,7 +17087,7 @@
 /turf/closed/wall/mineral/decorstone,
 /area/indoors/town/keep/magician)
 "pFS" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall"
 	},
@@ -21588,7 +21588,7 @@
 /turf/open/floor/tile/masonic/spiral,
 /area/indoors/town)
 "tRr" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -21833,7 +21833,7 @@
 /turf/open/floor/cobble,
 /area/under/tomb/indoors/church)
 "uba" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall";
 	pixel_x = 8
@@ -21899,7 +21899,7 @@
 /turf/open/floor/carpet/royalblack,
 /area/indoors/town/steward)
 "ueC" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall"
 	},
@@ -25428,7 +25428,7 @@
 /turf/open/floor/cobble,
 /area/indoors/town/keep/magician)
 "xrG" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1;
 	pixel_x = -1;
@@ -25514,7 +25514,7 @@
 /turf/open/floor/churchbrick,
 /area/indoors/town/church/chapel)
 "xxl" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall"
 	},
@@ -26366,7 +26366,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 4
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 4;
 	icon_state = "borderfall"
 	},
diff --git a/_maps/matthios_tomb/room/SteamCastle.dmm b/_maps/matthios_tomb/room/SteamCastle.dmm
index ccedc45add3..b86f33770cd 100644
--- a/_maps/matthios_tomb/room/SteamCastle.dmm
+++ b/_maps/matthios_tomb/room/SteamCastle.dmm
@@ -1050,7 +1050,7 @@
 /turf/open/floor/hexstone,
 /area/under/tomb/indoors)
 "lQ" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1
 	},
@@ -1761,7 +1761,7 @@
 /turf/open/openspace,
 /area/under/tomb)
 "um" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1
 	},
@@ -1886,7 +1886,7 @@
 /turf/open/floor/cobble,
 /area/under/tomb/indoors)
 "vR" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1
 	},
@@ -2681,7 +2681,7 @@
 /turf/open/floor/ruinedwood/spiral,
 /area/under/tomb)
 "Dc" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1
 	},
@@ -3738,7 +3738,7 @@
 /turf/open/floor/cobble,
 /area/under/tomb/wilds)
 "OR" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1
 	},
diff --git a/_maps/matthios_tomb/room/hctomb4.dmm b/_maps/matthios_tomb/room/hctomb4.dmm
index a708838c287..91f06c162b9 100644
--- a/_maps/matthios_tomb/room/hctomb4.dmm
+++ b/_maps/matthios_tomb/room/hctomb4.dmm
@@ -420,7 +420,7 @@
 /turf/open/floor/ruinedwood/spiral,
 /area/under/tomb/indoors)
 "pv" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1;
 	pixel_y = -8
@@ -510,7 +510,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 1
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1;
 	pixel_y = -8
@@ -545,7 +545,7 @@
 /turf/open/floor/twig,
 /area/under/tomb/indoors)
 "tR" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1
 	},
@@ -923,7 +923,7 @@
 /obj/structure/fluff/railing/border{
 	dir = 1
 	},
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1;
 	pixel_y = -8
@@ -1067,7 +1067,7 @@
 /turf/open/floor/carpet,
 /area/under/tomb/indoors)
 "QQ" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	icon_state = "borderfall";
 	dir = 1
 	},
diff --git a/_maps/templates/malums_anvil_dungeons/embercradle.dmm b/_maps/templates/malums_anvil_dungeons/embercradle.dmm
index 4d0faf2a78c..392594bf080 100644
--- a/_maps/templates/malums_anvil_dungeons/embercradle.dmm
+++ b/_maps/templates/malums_anvil_dungeons/embercradle.dmm
@@ -782,7 +782,7 @@
 /turf/open/floor/cobblerock,
 /area/under/mountains/anvil/dungeon)
 "lv" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -1050,7 +1050,7 @@
 /turf/open/floor/naturalstone,
 /area/under/mountains/anvil/dungeon/lower)
 "oH" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -1885,7 +1885,7 @@
 /turf/open/floor/cobblerock,
 /area/under/mountains/anvil/dungeon)
 "zQ" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -3456,7 +3456,7 @@
 /turf/open/floor/cobble,
 /area/under/mountains/anvil/dungeon/lower)
 "Ui" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
@@ -3883,7 +3883,7 @@
 /turf/closed/wall/mineral/stonebrick,
 /area/under/mountains/anvil/dungeon)
 "Zk" = (
-/obj/effect/decal/cobbleedge{
+/obj/effect/decal/borderfall{
 	dir = 1;
 	icon_state = "borderfall"
 	},
diff --git a/tools/UpdatePaths/Scripts/5222_cobbleedge_repath.txt b/tools/UpdatePaths/Scripts/5222_cobbleedge_repath.txt
new file mode 100644
index 00000000000..279cf0c1760
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/5222_cobbleedge_repath.txt
@@ -0,0 +1 @@
+/obj/effect/decal/cobbleedge{icon_state = "borderfall"} : /obj/effect/decal/borderfall{@OLD}
\ No newline at end of file