From 78e17aba316e1d88299576f090f7d2a9084b775d Mon Sep 17 00:00:00 2001
From: Zenith <109559450+Zenith00000@users.noreply.github.com>
Date: Tue, 7 Jul 2026 06:14:24 +0100
Subject: [PATCH 1/2] CLF insert, minor map fixes

---
 code/game/objects/structures/bookcase.dm      |    8 +-
 icons/obj/structures/bookshelf.dmi            |  Bin 1279 -> 1278 bytes
 .../maps/Sekhmet_Swamp/scenario.json          |   10 +-
 .../map_files/Sekhmet_Swamp/Sekhmet_Swamp.dmm |  276 +--
 .../Sekhmet_Swamp/standalone/clfswamp.dmm     | 2098 +++++++++++++++++
 maps/sekhmet_swamp.json                       |    5 +-
 6 files changed, 2236 insertions(+), 161 deletions(-)
 create mode 100644 maps/map_files/Sekhmet_Swamp/standalone/clfswamp.dmm

diff --git a/code/game/objects/structures/bookcase.dm b/code/game/objects/structures/bookcase.dm
index bb5f2b4c28de..cd82a4c7d760 100644
--- a/code/game/objects/structures/bookcase.dm
+++ b/code/game/objects/structures/bookcase.dm
@@ -131,11 +131,11 @@
 	new /obj/item/book/manual/research_and_development(src)
 	update_icon()
 
-/obj/structure/bookcase
-	icon_state = "woodbook-0"
+/obj/structure/bookcase/wood
+	icon_state = "wood-0"
 
 /obj/structure/bookcase/wood/update_icon()
 	if(length(contents) < 6)
-		icon_state = "woodbook-[length(contents)]"
+		icon_state = "wood-[length(contents)]"
 	else
-		icon_state = "woodbook-6"
+		icon_state = "wood-6"
diff --git a/icons/obj/structures/bookshelf.dmi b/icons/obj/structures/bookshelf.dmi
index f127906f93aa7bbe96825aa60e497802916e571d..31f57425c9e517f41e2ba0b4ca956a35a9e58db0 100644
GIT binary patch
delta 169
zcmey*`HyqL0>(uX7Yf(+Ub5ypWWdw#(9*K?>bV8`5|SO)uHyT`=gO(#l%U!9;;Zyd
zVdhQdw|^~**L!HybD8IF?xlF?MaTJL7FdTxt-Yr*efqYGry~ECWX2~&O*)%g=w2hc
z%1QgN^O^Rj)$S4Z%I4Qc>L&O0Y&E)e@`mTJb2`z2y$T$Lc2Fb%VQt*+=q2%NUR)OQ
S)}W=lI~ewV+3dr(nHc~9#Y&O@

delta 170
zcmV;b09F6~3I7R@paG+ip%Z^oR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#
za*U0*I5Sc+(=$pSoZ^zil2jm5DJefcTh~B|i!&v&s2C_<$i<mfl$e_eVWTQDBu<$T
zamtK|Q)WV(GE?G|nGsZ0o}ZsWWT3#65)K%+Qo?})S4ud5;7SPx5?mQ6;ediG#Ti)2
Y3a)-G;N%7X_`tBbE$vVKvr7T910l6c5dZ)H

diff --git a/maps/Nightmare/maps/Sekhmet_Swamp/scenario.json b/maps/Nightmare/maps/Sekhmet_Swamp/scenario.json
index fe51488c7066..7ed2ec874270 100644
--- a/maps/Nightmare/maps/Sekhmet_Swamp/scenario.json
+++ b/maps/Nightmare/maps/Sekhmet_Swamp/scenario.json
@@ -1 +1,9 @@
-[]
+[
+    {
+        "type": "pick", "name": "event",
+        "choices": [
+            { "weight": 1, "type": "def", "values": { "lvevent": "none" } },
+            { "weight": 9, "type": "def", "values": { "lvevent": "clfswamp", "hostile_survivors": true } }
+        ]
+    }
+]
diff --git a/maps/map_files/Sekhmet_Swamp/Sekhmet_Swamp.dmm b/maps/map_files/Sekhmet_Swamp/Sekhmet_Swamp.dmm
index 3cc7c997cfa1..9c5980db3894 100644
--- a/maps/map_files/Sekhmet_Swamp/Sekhmet_Swamp.dmm
+++ b/maps/map_files/Sekhmet_Swamp/Sekhmet_Swamp.dmm
@@ -567,9 +567,6 @@
 /area/sekhmet/int_reg/engineering)
 "abW" = (
 /obj/structure/bed/chair/comfy/blue,
-/obj/structure/window/reinforced/tinted{
-	dir = 1
-	},
 /turf/open/floor/prison/bright_clean2,
 /area/sekhmet/int_glass/complex_generic)
 "abX" = (
@@ -3512,21 +3509,13 @@
 /turf/open/floor/kutjevo/grey,
 /area/sekhmet/int_heavy/research)
 "asV" = (
-/obj/structure/bed,
-/obj/structure/bed{
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown,
-/obj/item/bedsheet/brown{
-	pixel_y = 13
-	},
-/obj/structure/window/reinforced/tinted{
-	layer = 4.01
-	},
 /obj/structure/sign/poster/pinup{
 	pixel_x = 1;
 	pixel_y = 34
 	},
+/obj/structure/bed/hybrisa/prisonbed{
+	dir = 8
+	},
 /turf/open/floor/strata/fake_wood,
 /area/sekhmet/int_glass/complex_generic)
 "ate" = (
@@ -4163,9 +4152,7 @@
 /turf/closed/wall/shiva/prefabricated,
 /area/sekhmet/caves/south_cave)
 "aGG" = (
-/obj/structure/machinery/power/monitor{
-	name = "Main Power Grid Monitoring"
-	},
+/obj/structure/machinery/cryopod/joe/seegson/alt,
 /turf/open/floor/corsat/squares,
 /area/sekhmet/int_reg/engineering)
 "aHj" = (
@@ -5071,6 +5058,10 @@
 	},
 /turf/open/gm/river/swamp,
 /area/sekhmet/outside/swamp)
+"biQ" = (
+/obj/effect/landmark/monkey_spawn,
+/turf/open/auto_turf/swampalt_dirt/layer1,
+/area/sekhmet/caves/south_cave)
 "bjc" = (
 /obj/structure/prop/colorable_rock/colorable/alt{
 	color = "#a39e99";
@@ -5290,18 +5281,9 @@
 /turf/open/auto_turf/swamp_grass/layer1,
 /area/sekhmet/outside/swamp)
 "bnS" = (
-/obj/structure/flora/bush/ausbushes/var3/sunnybush{
-	color = "#fceab2"
-	},
-/obj/structure/flora/jungle/vines/light_1{
-	color = "#fceab2"
-	},
-/obj/item/lifesaver{
-	icon_state = "lifesaver_2";
-	item_state = "lifesaver"
-	},
-/turf/open/auto_turf/swamp_grass/layer1,
-/area/sekhmet/outside/swamp)
+/obj/effect/landmark/monkey_spawn,
+/turf/open/auto_turf/swampalt_dirt/layer1,
+/area/sekhmet/caves/west_cave)
 "bnX" = (
 /obj/structure/prop/colorable_rock/colorable{
 	color = "#a39e99";
@@ -7704,10 +7686,10 @@
 /turf/open/auto_turf/swamp_grass/layer0_mud,
 /area/sekhmet/outside/swamp)
 "cIL" = (
-/obj/structure/window/reinforced/tinted{
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/effect/decal/hybrisa/dirt,
 /turf/open/floor/strata/fake_wood,
 /area/sekhmet/int_glass/complex_generic)
 "cIM" = (
@@ -7724,7 +7706,10 @@
 /turf/open/auto_turf/sand_white/layer0,
 /area/sekhmet/caves/west_cave)
 "cJb" = (
-/obj/structure/bed/roller/hospital_empty/bigrollerempty,
+/obj/structure/bed/roller/hospital_empty/bigrollerempty{
+	dir = 8;
+	icon_state = "bigrollerempty_up"
+	},
 /turf/open/floor/prison/sterile_white,
 /area/sekhmet/int_glass/hosptial)
 "cJf" = (
@@ -7841,6 +7826,8 @@
 	light_power = 0.5;
 	dir = 8
 	},
+/obj/effect/landmark/start/working_joe/colony,
+/obj/effect/landmark/late_join/working_joe/colony,
 /turf/open/floor/corsat/squares,
 /area/sekhmet/int_reg/engineering)
 "cLk" = (
@@ -7884,6 +7871,12 @@
 	},
 /turf/open/floor/strata/multi_tiles/southwest,
 /area/sekhmet/int_reg/complex_operation)
+"cLV" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/landmark/start/working_joe/colony,
+/obj/effect/landmark/late_join/working_joe/colony,
+/turf/open/floor/corsat/squares,
+/area/sekhmet/int_reg/engineering)
 "cMb" = (
 /turf/open/floor/plating/kutjevo,
 /area/sekhmet/int_reg/warehouse)
@@ -10407,9 +10400,6 @@
 	dir = 1;
 	layer = 2.4
 	},
-/obj/structure/window/reinforced/tinted{
-	layer = 3.4
-	},
 /turf/open/floor/prison/bright_clean2,
 /area/sekhmet/int_glass/complex_generic)
 "ehb" = (
@@ -12043,20 +12033,6 @@
 /turf/open/floor/strata/floor2,
 /area/sekhmet/int_reg/complex_operation)
 "fgq" = (
-/obj/structure/bed,
-/obj/structure/bed{
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown,
-/obj/item/bedsheet/brown{
-	pixel_y = 13
-	},
-/obj/structure/window/reinforced/tinted{
-	layer = 4.01
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4
-	},
 /obj/structure/sign/poster/music{
 	pixel_x = -4;
 	pixel_y = 30
@@ -12065,6 +12041,12 @@
 	pixel_x = -12;
 	pixel_y = 34
 	},
+/obj/item/bedsheet/brown{
+	pixel_y = 11
+	},
+/obj/structure/bed/hybrisa/prisonbed{
+	dir = 4
+	},
 /turf/open/floor/strata/fake_wood,
 /area/sekhmet/int_glass/complex_generic)
 "fgt" = (
@@ -14428,7 +14410,8 @@
 /obj/item/book/manual/medical_diagnostics_manual,
 /obj/item/book/manual/medical_diagnostics_manual,
 /obj/structure/bookcase/wood{
-	icon_state = "woodbook-5"
+	icon_state = "wood-5";
+	opacity = 0
 	},
 /turf/open/floor/strata/fake_wood,
 /area/sekhmet/int_glass/hosptial)
@@ -14719,7 +14702,9 @@
 /area/sekhmet/outside/swamp)
 "gvb" = (
 /obj/structure/bookcase/wood{
-	icon_state = "woodbook-5"
+	icon_state = "wood-5";
+	density = 0;
+	opacity = 0
 	},
 /obj/item/book/manual/paperwork,
 /obj/item/book/manual/paperwork,
@@ -15526,9 +15511,6 @@
 	dir = 1;
 	layer = 2.4
 	},
-/obj/structure/window/reinforced/tinted{
-	layer = 3.4
-	},
 /turf/open/floor/prison/bright_clean2,
 /area/sekhmet/int_glass/complex_generic)
 "gRy" = (
@@ -16421,16 +16403,8 @@
 /turf/open/floor/strata/fake_wood,
 /area/sekhmet/int_glass/offices)
 "hqU" = (
-/obj/structure/bed,
-/obj/structure/bed{
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown,
-/obj/item/bedsheet/brown{
-	pixel_y = 13
-	},
-/obj/structure/window/reinforced/tinted{
-	layer = 4.01
+/obj/structure/bed/hybrisa/prisonbed{
+	dir = 5
 	},
 /turf/open/floor/strata/fake_wood,
 /area/sekhmet/int_glass/complex_generic)
@@ -18544,9 +18518,6 @@
 /obj/structure/surface/table/almayer{
 	color = "#8B9490"
 	},
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
 /obj/effect/landmark/objective_landmark/close,
 /turf/open/floor/prison/bright_clean2,
 /area/sekhmet/int_glass/complex_generic)
@@ -18624,10 +18595,11 @@
 	pixel_y = 9
 	},
 /obj/structure/bookcase/wood{
-	icon_state = "woodbook-5";
+	icon_state = "wood-5";
 	pixel_y = 44;
 	layer = 3.01;
-	density = 0
+	density = 0;
+	opacity = 0
 	},
 /obj/item/book/manual/upphistory,
 /obj/item/book/manual/upphistory,
@@ -18803,6 +18775,13 @@
 /obj/structure/bed/chair,
 /turf/open/floor/strata/multi_tiles/southwest,
 /area/sekhmet/int_reg/garage)
+"iGP" = (
+/obj/structure/surface/rack{
+	color = "#6b675e";
+	layer = 2.79
+	},
+/turf/open/floor/corsat/squares,
+/area/sekhmet/int_reg/engineering)
 "iGR" = (
 /obj/structure/prop/swamp_plants/algae/corner/north_east,
 /obj/structure/prop/swamp_plants/lily_pads/lily_pads_4,
@@ -19423,18 +19402,11 @@
 /turf/open/gm/coast/dirt/swampdir/south,
 /area/sekhmet/outside/east_jungle)
 "iZP" = (
-/obj/structure/bed,
-/obj/structure/bed{
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown,
-/obj/item/bedsheet/brown{
+/obj/structure/bed/hybrisa/prisonbed,
+/obj/item/roller/bedroll/comfy/yellow{
+	pixel_x = -2;
 	pixel_y = 13
 	},
-/obj/structure/window/reinforced/tinted{
-	dir = 1;
-	layer = 2.9
-	},
 /turf/open/floor/strata/fake_wood,
 /area/sekhmet/int_glass/complex_generic)
 "iZT" = (
@@ -21132,7 +21104,8 @@
 /area/sekhmet/int_reg/yard)
 "jYe" = (
 /obj/structure/bookcase/wood{
-	icon_state = "woodbook-5"
+	icon_state = "wood-5";
+	opacity = 0
 	},
 /obj/structure/machinery/light{
 	light_power = 0.5;
@@ -22696,9 +22669,6 @@
 /obj/structure/surface/table/almayer{
 	color = "#8B9490"
 	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4
-	},
 /obj/item/reagent_container/food/snacks/cubancarp{
 	pixel_x = -8;
 	pixel_y = 11
@@ -23854,25 +23824,9 @@
 /turf/open/floor/plating/kutjevo,
 /area/sekhmet/outside/southroad)
 "lFM" = (
-/obj/structure/bed,
-/obj/structure/bed{
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown,
-/obj/item/bedsheet/brown{
-	pixel_y = 13
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4
-	},
-/obj/structure/window/reinforced/tinted{
-	layer = 4.01
+/obj/structure/bed/hybrisa/prisonbed{
+	dir = 9
 	},
-/obj/item/attachable/bayonet/upp,
 /turf/open/floor/strata/fake_wood,
 /area/sekhmet/int_glass/complex_generic)
 "lGf" = (
@@ -23924,9 +23878,6 @@
 /area/sekhmet/int_reg/military_hangar)
 "lHR" = (
 /obj/structure/bed/chair/comfy/blue,
-/obj/structure/window/reinforced/tinted{
-	dir = 1
-	},
 /obj/effect/decal/hybrisa/dirt,
 /turf/open/floor/prison/bright_clean2,
 /area/sekhmet/int_glass/complex_generic)
@@ -25873,7 +25824,7 @@
 /obj/structure/bookcase/wood{
 	pixel_y = 13;
 	can_block_movement = 0;
-	icon_state = "woodbook-5"
+	icon_state = "wood-5"
 	},
 /obj/item/book/manual/paperwork,
 /obj/item/book/manual/upphistory,
@@ -27105,6 +27056,10 @@
 /obj/effect/decal/hybrisa/dirt,
 /turf/open/floor/strata/multi_tiles/southeast,
 /area/sekhmet/int_reg/garage)
+"npm" = (
+/obj/item/bedsheet/brown,
+/turf/open/floor/carpet,
+/area/sekhmet/int_glass/complex_generic)
 "npB" = (
 /obj/structure/machinery/camera{
 	c_tag = "South Complex - General Hall";
@@ -28675,7 +28630,8 @@
 /area/sekhmet/int_reg/military_hangar)
 "ofY" = (
 /obj/structure/bookcase/wood{
-	icon_state = "woodbook-5"
+	icon_state = "wood-5";
+	opacity = 0
 	},
 /obj/item/book/manual/upphistory,
 /obj/item/book/manual/upphistory,
@@ -31305,10 +31261,11 @@
 /area/sekhmet/outside/temple_outer)
 "pBx" = (
 /obj/structure/bookcase/wood{
-	icon_state = "woodbook-5";
+	icon_state = "wood-5";
 	pixel_y = 44;
 	layer = 3.01;
-	density = 0
+	density = 0;
+	opacity = 0
 	},
 /obj/item/book/manual/paperwork,
 /obj/item/book/manual/paperwork,
@@ -36544,6 +36501,12 @@
 	},
 /turf/open/gm/river/swamp,
 /area/sekhmet/outside/swamp)
+"szw" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/item/attachable/bayonet/upp,
+/obj/item/bedsheet/brown,
+/turf/open/floor/strata/fake_wood,
+/area/sekhmet/int_glass/complex_generic)
 "szK" = (
 /obj/structure/platform_decoration/metal/strata/east,
 /obj/structure/prop/swamp_plants/algae/corner2/south_west,
@@ -36679,10 +36642,11 @@
 "sFN" = (
 /obj/effect/decal/hybrisa/dirt,
 /obj/structure/bookcase/wood{
-	icon_state = "woodbook-5";
+	icon_state = "wood-5";
 	pixel_y = 44;
 	layer = 3.01;
-	density = 0
+	density = 0;
+	opacity = 0
 	},
 /obj/item/book/manual/paperwork,
 /obj/item/book/manual/paperwork,
@@ -38324,10 +38288,11 @@
 "tyX" = (
 /obj/effect/decal/hybrisa/dirt,
 /obj/structure/bookcase/wood{
-	icon_state = "woodbook-5";
+	icon_state = "wood-5";
 	pixel_y = 43;
 	layer = 3.01;
-	density = 0
+	density = 0;
+	opacity = 0
 	},
 /obj/item/book/manual/chemistry,
 /obj/item/book/manual/chemistry,
@@ -38786,7 +38751,7 @@
 /turf/open/floor/strata/multi_tiles/west,
 /area/sekhmet/int_reg/water_filters)
 "tJp" = (
-/obj/structure/window/reinforced/tinted{
+/obj/structure/window/reinforced{
 	dir = 4
 	},
 /turf/open/floor/strata/fake_wood,
@@ -40142,10 +40107,11 @@
 	pixel_y = 6
 	},
 /obj/structure/bookcase/wood{
-	icon_state = "woodbook-5";
+	icon_state = "wood-5";
 	pixel_y = 44;
 	layer = 3.01;
-	density = 0
+	density = 0;
+	opacity = 0
 	},
 /obj/item/book/manual/upphistory,
 /obj/item/book/manual/upphistory,
@@ -40408,6 +40374,14 @@
 /obj/structure/inflatable/door,
 /turf/open/floor/interior/plastic/alt,
 /area/sekhmet/caves/temple)
+"uzg" = (
+/obj/effect/landmark/nightmare{
+	insert_tag = "clfswamp"
+	},
+/turf/closed/wall/rock{
+	color = "#797571"
+	},
+/area/sekhmet/caves/south_cave)
 "uzk" = (
 /obj/structure/flora/jungle/vines/light_1{
 	color = "#fceab2"
@@ -42451,6 +42425,12 @@
 	},
 /turf/open/floor/kutjevo/multi_tiles/west,
 /area/sekhmet/outside/swamp)
+"vJL" = (
+/obj/structure/bed/hybrisa/prisonbed{
+	dir = 6
+	},
+/turf/open/floor/strata/fake_wood,
+/area/sekhmet/int_glass/complex_generic)
 "vJY" = (
 /obj/structure/prop/structure_lattice{
 	dir = 4
@@ -42468,20 +42448,8 @@
 /turf/open/floor/strata/floor3,
 /area/sekhmet/int_heavy/research)
 "vKa" = (
-/obj/structure/bed,
-/obj/structure/bed{
-	pixel_y = 13
-	},
-/obj/item/bedsheet/brown,
-/obj/item/bedsheet/brown{
-	pixel_y = 13
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 1;
-	layer = 2.9
-	},
-/obj/structure/window/reinforced/tinted{
-	layer = 4.01
+/obj/structure/bed/hybrisa/prisonbed{
+	dir = 10
 	},
 /turf/open/floor/strata/fake_wood,
 /area/sekhmet/int_glass/complex_generic)
@@ -42645,6 +42613,10 @@
 /obj/structure/cargo_container/upp/left,
 /turf/open/floor/strata/floor3,
 /area/sekhmet/int_reg/military_hangar)
+"vNI" = (
+/obj/structure/machinery/cryopod/joe/seegson,
+/turf/open/floor/strata/fake_wood,
+/area/sekhmet/outside/southroad)
 "vNK" = (
 /obj/structure/platform/metal/strata,
 /obj/structure/prop/swamp_plants/algae/full/algae_full_1,
@@ -43374,9 +43346,6 @@
 /obj/structure/surface/table/almayer{
 	color = "#8B9490"
 	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4
-	},
 /obj/item/clothing/glasses/sunglasses/aviator{
 	pixel_y = 4;
 	pixel_x = 3
@@ -44293,9 +44262,6 @@
 /obj/structure/surface/table/almayer{
 	color = "#8B9490"
 	},
-/obj/structure/window/reinforced/tinted{
-	dir = 4
-	},
 /obj/item/clothing/suit/armor/vest/UPP/alt,
 /turf/open/floor/prison/bright_clean2,
 /area/sekhmet/int_glass/complex_generic)
@@ -84887,7 +84853,7 @@ vas
 mgR
 sDO
 sDO
-sDO
+bnS
 adA
 sDO
 xYu
@@ -86240,7 +86206,7 @@ cnx
 sDO
 sDO
 sDO
-sDO
+bnS
 sDO
 sDO
 cnx
@@ -88070,7 +88036,7 @@ xYu
 xYu
 cnx
 sDO
-sDO
+bnS
 sDO
 sDO
 sDO
@@ -90942,7 +90908,7 @@ uzk
 efR
 oNJ
 kjP
-kjP
+biQ
 efH
 eto
 kjP
@@ -94082,7 +94048,7 @@ jfF
 kjP
 kjP
 kjP
-kjP
+biQ
 kjP
 kjP
 efR
@@ -94680,7 +94646,7 @@ pBz
 uhn
 pBz
 pBz
-bnS
+qkY
 cyh
 cyh
 aOp
@@ -97017,7 +96983,7 @@ oxw
 oxw
 oxw
 hva
-oxw
+vNI
 oxw
 oxw
 yks
@@ -97216,7 +97182,7 @@ oRx
 efR
 efR
 kjP
-kjP
+biQ
 kjP
 kjP
 efR
@@ -99596,7 +99562,7 @@ bJt
 uCw
 vKa
 nlq
-iZP
+vKa
 xsl
 gYc
 fvZ
@@ -99926,7 +99892,7 @@ uCw
 qyt
 jdV
 uCw
-iZP
+vJL
 xsl
 bvk
 gph
@@ -100087,7 +100053,7 @@ wsv
 xsl
 xsl
 wDM
-uCw
+npm
 hVA
 vEF
 lzP
@@ -100192,7 +100158,7 @@ oRx
 oRx
 oRx
 oRx
-oRx
+uzg
 hCs
 "}
 (100,1,2) = {"
@@ -100256,7 +100222,7 @@ uCw
 bJt
 lSs
 uCw
-iZP
+vKa
 xsl
 rzz
 vvv
@@ -100585,7 +100551,7 @@ uGQ
 ljy
 uCw
 lFM
-eCp
+szw
 iZP
 xsl
 gYc
@@ -103801,7 +103767,7 @@ vQw
 cHW
 cHW
 fxj
-chE
+mxU
 bKG
 tWS
 tWS
@@ -112330,7 +112296,7 @@ acT
 acT
 acT
 acT
-acT
+opw
 iyl
 eeE
 grS
@@ -112495,7 +112461,7 @@ jYC
 sMl
 dTW
 acT
-acT
+rSu
 iyl
 eeE
 grS
@@ -112818,10 +112784,10 @@ dHu
 dHu
 dHu
 uAR
-rSu
+aGG
 cLj
 jYC
-opw
+iGP
 uAR
 abA
 grS
@@ -112984,7 +112950,7 @@ dHu
 dHu
 uAR
 aGG
-jYC
+cLV
 yex
 ljn
 iyl
diff --git a/maps/map_files/Sekhmet_Swamp/standalone/clfswamp.dmm b/maps/map_files/Sekhmet_Swamp/standalone/clfswamp.dmm
new file mode 100644
index 000000000000..11c1e90b8bcd
--- /dev/null
+++ b/maps/map_files/Sekhmet_Swamp/standalone/clfswamp.dmm
@@ -0,0 +1,2098 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ak" = (
+/obj/structure/closet,
+/obj/item/clothing/under/colonist/clf,
+/obj/effect/landmark/objective_landmark/far,
+/obj/item/ammo_magazine/smg/fp9000,
+/obj/item/ammo_magazine/smg/fp9000,
+/obj/item/ammo_magazine/smg/fp9000,
+/obj/item/weapon/gun/smg/fp9000,
+/obj/structure/sign/poster/clf{
+	pixel_y = 36;
+	pixel_x = 9
+	},
+/obj/structure/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"aD" = (
+/turf/open/gm/coast/dirt/swampdir/south,
+/area/sekhmet/outside/swamp)
+"aQ" = (
+/obj/effect/vehicle_spawner/clf_van/fixed{
+	dir = 4
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"aU" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/item/stack/sheet/wood{
+	pixel_y = 2
+	},
+/obj/item/stack/sheet/wood{
+	pixel_y = -9;
+	pixel_x = -2
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"bs" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "cargo"
+	},
+/obj/structure/flag/plantable/clf{
+	pixel_y = 13
+	},
+/turf/open/floor/strata/floor3/east,
+/area/sekhmet/int_reg/yard)
+"bu" = (
+/obj/structure/barricade/sandbags/wired{
+	color = "#a98c7c";
+	dir = 1
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"bz" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/structure/largecrate/supply,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"bL" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"ch" = (
+/obj/structure/fence/slim/upp,
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"ct" = (
+/obj/structure/flora/bush/ausbushes/palebush{
+	color = "#fceab2"
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"cR" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/largecrate/random/barrel/green,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"dl" = (
+/obj/structure/machinery/power/apc/power/west,
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"dr" = (
+/turf/closed/wall/rock{
+	color = "#797571"
+	},
+/area/sekhmet/caves/south_cave)
+"dy" = (
+/obj/structure/flora/bush/ausbushes/grassybush{
+	color = "#fceab2"
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"ej" = (
+/obj/item/storage/large_holster/katana/full,
+/obj/structure/surface/rack{
+	color = "#6b675e";
+	layer = 2.79
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"eo" = (
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"eH" = (
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"eZ" = (
+/obj/structure/barricade/sandbags/wired{
+	color = "#a98c7c";
+	dir = 1
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/int_reg/yard)
+"gt" = (
+/obj/structure/fence/slim/upp,
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/int_reg/yard)
+"gM" = (
+/obj/structure/flora/grass/tallgrass/swamp/corner{
+	dir = 9
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/outside/southroad)
+"gY" = (
+/obj/structure/barricade/sandbags/wired{
+	color = "#a98c7c";
+	dir = 1
+	},
+/obj/structure/barricade/sandbags/wired{
+	color = "#a98c7c";
+	dir = 4
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"hX" = (
+/obj/structure/flora/jungle/vines/light_1{
+	color = "#fceab2"
+	},
+/turf/closed/wall/strata_ice/swamp,
+/area/sekhmet/outside/southroad)
+"ia" = (
+/obj/structure/closet/crate/ammo/alt,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/weapon/gun/rifle/mar40/carbine,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"iO" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/item/stack/sheet/metal{
+	pixel_x = -2;
+	pixel_y = -4
+	},
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"jf" = (
+/obj/item/hardpoint/locomotion/van_wheels,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"jw" = (
+/obj/structure/largecrate/empty/case,
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"jy" = (
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/sekhmet/outside/southroad)
+"jL" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/landmark/survivor_spawner/clf/soro,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"jM" = (
+/obj/structure/flora/bush/ausbushes/reedbush{
+	pixel_x = 12;
+	pixel_y = 23
+	},
+/turf/open/gm/coast/dirt/swampbeachcorner/south_west,
+/area/sekhmet/outside/swamp)
+"jN" = (
+/obj/structure/prop/colorable_rock/colorable/alt{
+	color = "#a39e99";
+	dir = 1;
+	pixel_x = 3;
+	pixel_y = -2
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"jS" = (
+/turf/open/gm/dirt/swamp_dirt/variant_2,
+/area/sekhmet/outside/swamp)
+"kc" = (
+/turf/closed/wall/shiva/prefabricated/reinforced,
+/area/sekhmet/int_reg/yard)
+"ke" = (
+/obj/effect/landmark/survivor_spawner/clf/soro,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"ko" = (
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/outside/southroad)
+"lf" = (
+/obj/structure/machinery/light/small,
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/int_reg/yard)
+"ln" = (
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"lq" = (
+/obj/structure/flora/jungle/vines/light_1{
+	color = "#fceab2"
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/outside/southroad)
+"lD" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/surface/table/almayer{
+	color = "#8B9490"
+	},
+/obj/item/reagent_container/food/snacks/chips{
+	pixel_x = 7;
+	pixel_y = -7
+	},
+/obj/item/weapon/gun/rifle/mar40{
+	pixel_y = 6
+	},
+/obj/item/weapon/gun/rifle/mar40{
+	pixel_y = 6
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/sekhmet/int_reg/yard)
+"lZ" = (
+/obj/structure/prop/colorable_rock/colorable{
+	color = "#a39e99";
+	pixel_x = 3;
+	pixel_y = -34
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"ml" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"mx" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "cargo"
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/closet/crate/secure/explosives,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16,
+/obj/item/ammo_magazine/rifle/m16/ap,
+/obj/item/ammo_magazine/rifle/m16/ap,
+/obj/item/ammo_magazine/rifle/m16/ap,
+/obj/item/ammo_magazine/rifle/m16/ap,
+/obj/item/ammo_magazine/rifle/m16/ap,
+/obj/item/weapon/gun/rifle/m16,
+/obj/item/weapon/gun/rifle/m16{
+	pixel_x = 5;
+	pixel_y = 6
+	},
+/turf/open/floor/strata/floor3/east,
+/area/sekhmet/int_reg/yard)
+"nq" = (
+/obj/structure/prop/colorable_rock/colorable{
+	color = "#a39e99";
+	pixel_x = 3;
+	pixel_y = -7
+	},
+/obj/structure/barricade/sandbags/wired{
+	color = "#a98c7c";
+	dir = 4
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"nD" = (
+/turf/closed/wall/rock{
+	color = "#797571"
+	},
+/area/sekhmet/outside/southroad)
+"nS" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/item/stack/sheet/wood{
+	pixel_x = 1;
+	pixel_y = 4
+	},
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"nT" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"on" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/structure/closet/crate/freezer,
+/obj/item/storage/belt/medical/full{
+	pixel_x = 2;
+	pixel_y = 4
+	},
+/obj/item/storage/firstaid/adv,
+/obj/item/roller,
+/obj/item/storage/surgical_tray,
+/obj/item/roller/surgical,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"ov" = (
+/obj/structure/bed/hybrisa/bunkbed3{
+	dir = 1
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"oN" = (
+/obj/structure/sign/banners/clf_flag{
+	pixel_y = 32
+	},
+/obj/structure/machinery/vending/cigarette/koorlander,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"pD" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/largecrate/supply/floodlights,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"pT" = (
+/obj/item/trash/cigbutt,
+/turf/open/auto_turf/swamp_grass/layer0_mud_alt,
+/area/sekhmet/int_reg/yard)
+"qq" = (
+/obj/structure/prop/colorable_rock/colorable{
+	color = "#a39e99";
+	dir = 9;
+	pixel_x = 12;
+	pixel_y = -17
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"qL" = (
+/obj/structure/flora/jungle/vines/light_1{
+	color = "#fceab2"
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/outside/southeast_road)
+"qR" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/sekhmet/int_reg/yard)
+"rh" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/structure/closet/crate/secure/ammo,
+/obj/item/ammo_magazine/rifle/mar40/lmg{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/item/ammo_magazine/rifle/mar40/lmg{
+	pixel_x = 6;
+	pixel_y = -4
+	},
+/obj/item/ammo_magazine/rifle/mar40/lmg{
+	pixel_y = 8
+	},
+/obj/item/weapon/gun/rifle/mar40/lmg{
+	pixel_x = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"ry" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/bed/hybrisa/bunkbed3{
+	dir = 4
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"rM" = (
+/obj/structure/prop/colorable_rock/colorable{
+	color = "#a39e99";
+	dir = 1;
+	pixel_x = 1;
+	pixel_y = -5
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southeast_road)
+"rN" = (
+/obj/structure/machinery/colony_floodlight,
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"sn" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"sz" = (
+/obj/structure/extinguisher_cabinet/alt{
+	pixel_y = 30
+	},
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"sA" = (
+/obj/structure/prop/colorable_rock/colorable{
+	color = "#a39e99";
+	dir = 4;
+	pixel_x = -6;
+	pixel_y = -21
+	},
+/turf/open/gm/dirt/swamp_dirt,
+/area/sekhmet/outside/swamp)
+"sI" = (
+/obj/item/storage/fancy/cigarettes/arcturian_ace{
+	pixel_x = 8;
+	pixel_y = 12
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"sR" = (
+/obj/effect/spawner/random/toolbox,
+/obj/structure/surface/rack{
+	color = "#6b675e";
+	layer = 2.79
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"sV" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/item/trash/cigbutt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"tA" = (
+/obj/structure/machinery/door/airlock/multi_tile/hybrisa/generic_solid/autoname,
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/sekhmet/int_reg/yard)
+"tD" = (
+/obj/structure/fence/slim/upp,
+/obj/structure/flora/jungle/vines/light_1{
+	color = "#fceab2"
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"tP" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"tS" = (
+/obj/structure/pipes/vents/pump,
+/obj/structure/sign/poster/clf{
+	pixel_y = 36;
+	pixel_x = -8
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"tX" = (
+/obj/structure/flora/bush/ausbushes/ausbush,
+/turf/open/gm/dirt/swamp_dirt,
+/area/sekhmet/outside/swamp)
+"uD" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/strata/floor3/east,
+/area/sekhmet/int_reg/yard)
+"uN" = (
+/obj/structure/barricade/sandbags/wired{
+	color = "#a98c7c";
+	dir = 4
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"vv" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/turf/open/floor/strata/multi_tiles/southwest,
+/area/sekhmet/int_reg/yard)
+"vI" = (
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/sekhmet/int_reg/yard)
+"vU" = (
+/obj/structure/flora/jungle/vines/light_1{
+	color = "#fceab2"
+	},
+/turf/closed/wall/rock{
+	color = "#797571"
+	},
+/area/sekhmet/outside/southeast_road)
+"xd" = (
+/obj/structure/barricade/plasteel/wired{
+	dir = 1;
+	closed = 0;
+	density = 1
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"xm" = (
+/obj/structure/flora/bush/ausbushes/var3/fullgrass,
+/turf/open/gm/dirt/swamp_dirt,
+/area/sekhmet/outside/swamp)
+"xt" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/structure/surface/table/almayer{
+	color = "#8B9490"
+	},
+/obj/item/ammo_magazine/pistol/heavy,
+/obj/item/ammo_magazine/pistol/heavy,
+/obj/item/ammo_magazine/pistol/heavy,
+/obj/item/ammo_magazine/pistol/heavy,
+/obj/item/weapon/gun/pistol/heavy,
+/turf/open/floor/strata/multi_tiles/southwest,
+/area/sekhmet/int_reg/yard)
+"xK" = (
+/obj/structure/flora/jungle/thickbush/large_jungle_bush{
+	color = "#72963e";
+	icon_state = "bush3";
+	pixel_x = -15;
+	pixel_y = -6;
+	layer = 4.11
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"yh" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/item/stack/sheet/wood{
+	pixel_y = -4
+	},
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"yG" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"yX" = (
+/obj/item/ammo_magazine/rifle/l42a/abr40,
+/obj/item/ammo_magazine/rifle/l42a/abr40,
+/obj/item/ammo_magazine/rifle/l42a/abr40,
+/obj/item/ammo_magazine/rifle/l42a/abr40,
+/obj/item/ammo_magazine/rifle/l42a/abr40,
+/obj/item/ammo_magazine/rifle/l42a/abr40,
+/obj/item/weapon/gun/rifle/l42a/abr40,
+/obj/structure/surface/rack{
+	color = "#6b675e";
+	layer = 2.79
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"zw" = (
+/obj/item/stack/sheet/plasteel/med_large_stack,
+/obj/item/stack/sheet/metal/med_large_stack,
+/obj/structure/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/surface/rack{
+	color = "#6b675e";
+	layer = 2.79
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"zL" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"zQ" = (
+/obj/effect/landmark/survivor_spawner/clf/soro,
+/turf/open/auto_turf/swamp_dirt/layer0,
+/area/sekhmet/outside/southroad)
+"Ag" = (
+/obj/structure/bed/hybrisa/bunkbed3{
+	dir = 8
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"Av" = (
+/turf/closed/wall/shiva/prefabricated/reinforced,
+/area/sekhmet/outside/southroad)
+"AF" = (
+/obj/effect/landmark/survivor_spawner/clf_medic/soro,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"AJ" = (
+/obj/structure/flora/jungle/vines/light_1{
+	color = "#fceab2"
+	},
+/turf/closed/wall/rock{
+	color = "#797571"
+	},
+/area/sekhmet/outside/southroad)
+"Bj" = (
+/obj/structure/flora/jungle/thickbush/large_jungle_bush{
+	color = "#72963e";
+	icon_state = "bush2";
+	pixel_x = -20;
+	pixel_y = -6
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southeast_road)
+"Bk" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/landmark/objective_landmark/close,
+/obj/structure/closet,
+/obj/item/defenses/handheld/planted_flag/clf,
+/turf/open/floor/strata/floor3/east,
+/area/sekhmet/int_reg/yard)
+"Cp" = (
+/obj/structure/surface/rack{
+	color = "#6b675e";
+	layer = 2.79
+	},
+/obj/effect/spawner/random/toolbox,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"Cv" = (
+/turf/open/gm/dirt/swamp_dirt,
+/area/sekhmet/outside/swamp)
+"CJ" = (
+/obj/effect/landmark/survivor_spawner/clf/soro,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"CY" = (
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/int_reg/yard)
+"Dr" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/largecrate/supply/ammo/shotgun,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Dz" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/structure/bed/chair{
+	buckling_y = 18;
+	dir = 8;
+	pixel_x = -2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/machinery/light/small,
+/turf/open/floor/strata/multi_tiles/southwest,
+/area/sekhmet/int_reg/yard)
+"DC" = (
+/obj/structure/largecrate/random/barrel/true_random,
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"DI" = (
+/turf/closed/wall/strata_ice/swamp,
+/area/sekhmet/outside/southroad)
+"DL" = (
+/obj/structure/flora/bush/ausbushes/grassybush{
+	color = "#fceab2"
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southeast_road)
+"DO" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "cargo"
+	},
+/obj/structure/reagent_dispensers/tank/fuel,
+/turf/open/floor/strata/floor3/east,
+/area/sekhmet/int_reg/yard)
+"DT" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Er" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/landmark/survivor_spawner/clf_lead/soro,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"EA" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/gm/dirt/swamp_dirt,
+/area/sekhmet/outside/swamp)
+"EJ" = (
+/obj/item/trash/cigbutt,
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/sekhmet/int_reg/yard)
+"ET" = (
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southeast_road)
+"Fk" = (
+/turf/closed/wall/rock{
+	color = "#797571"
+	},
+/area/sekhmet/outside/southeast_road)
+"Fp" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/auto_turf/swamp_dirt/layer0,
+/area/sekhmet/outside/southroad)
+"Fv" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/sign/poster/pinup{
+	pixel_x = 1;
+	pixel_y = 36
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"FD" = (
+/obj/structure/surface/rack{
+	color = "#6b675e";
+	layer = 2.79
+	},
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"FO" = (
+/obj/item/attachable/heavy_barrel,
+/obj/item/attachable/verticalgrip,
+/obj/item/attachable/verticalgrip,
+/obj/item/attachable/attached_gun/flamer,
+/obj/item/attachable/bayonet,
+/obj/item/attachable/bayonet,
+/obj/structure/closet/crate,
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Ge" = (
+/obj/item/tool/crowbar/red{
+	pixel_x = -8;
+	pixel_y = 10
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"Gj" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/closet/crate/secure/gear,
+/obj/item/ammo_magazine/shotgun/buckshot,
+/obj/item/ammo_magazine/shotgun/buckshot{
+	pixel_x = 6;
+	pixel_y = -4
+	},
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+	pixel_y = 9
+	},
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+	pixel_y = 3
+	},
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+	pixel_y = -3
+	},
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Gx" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/structure/closet/crate/construction,
+/obj/item/device/m56d_gun/mounted,
+/obj/item/device/m56d_gun/mounted{
+	pixel_y = -5
+	},
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"GL" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/bed/chair,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"GQ" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/structure/largecrate/supply/ammo/m56d,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Hm" = (
+/obj/structure/sign/poster/clf{
+	pixel_y = 36;
+	pixel_x = -8
+	},
+/obj/structure/sign/poster/clf{
+	pixel_y = 33;
+	pixel_x = 2
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"HO" = (
+/obj/structure/prop/colorable_rock/colorable{
+	color = "#a39e99";
+	pixel_x = 5;
+	pixel_y = 19
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/outside/southroad)
+"HS" = (
+/obj/structure/machinery/light/double{
+	dir = 8
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"If" = (
+/obj/structure/machinery/light/small,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"IA" = (
+/obj/item/trash/candy{
+	pixel_x = -7
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"IV" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"Jl" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/structure/bed/chair{
+	buckling_y = 18;
+	dir = 8;
+	pixel_x = -2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/strata/multi_tiles/southwest,
+/area/sekhmet/int_reg/yard)
+"JQ" = (
+/obj/structure/prop/colorable_rock/colorable{
+	color = "#a39e99";
+	pixel_x = 3;
+	pixel_y = -7
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"JX" = (
+/obj/structure/surface/table/almayer{
+	color = "#8B9490"
+	},
+/obj/item/reagent_container/food/drinks/cans/beer{
+	pixel_x = -10;
+	pixel_y = 1
+	},
+/obj/item/ammo_magazine/shotgun/incendiary{
+	pixel_x = 10;
+	pixel_y = -1
+	},
+/obj/item/ammo_magazine/shotgun/incendiary{
+	pixel_x = 5;
+	pixel_y = 6
+	},
+/turf/open/floor/strata/multi_tiles/southwest,
+/area/sekhmet/int_reg/yard)
+"JZ" = (
+/obj/structure/surface/table/almayer{
+	color = "#8B9490"
+	},
+/obj/structure/machinery/faxmachine{
+	department = "CLF - Cell 42"
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"Kb" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/gm/dirt/swamp_dirt/variant_2,
+/area/sekhmet/outside/swamp)
+"Ks" = (
+/obj/structure/surface/table/almayer{
+	color = "#8B9490"
+	},
+/obj/structure/machinery/computer/emails{
+	dir = 1;
+	pixel_x = -1
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"KC" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/structure/surface/table/almayer{
+	color = "#8B9490"
+	},
+/obj/item/mre_food_packet/clf,
+/obj/item/mre_food_packet/clf,
+/obj/item/mre_food_packet/clf,
+/obj/item/mre_food_packet/clf,
+/obj/item/mre_food_packet/clf,
+/turf/open/floor/strata/multi_tiles/southwest,
+/area/sekhmet/int_reg/yard)
+"Mb" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"Md" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/auto_turf/swamp_grass/layer0_mud_alt,
+/area/sekhmet/int_reg/yard)
+"Mv" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/cleanable/blood/oil,
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/largecrate/supply/supplies/flares,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"MF" = (
+/obj/structure/largecrate/random/secure,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"Nj" = (
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/turf/open/floor/strata/multi_tiles/southwest,
+/area/sekhmet/int_reg/yard)
+"Nl" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"NH" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/obj/structure/machinery/light/small,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"NT" = (
+/obj/structure/cargo_container/upp_small/container_20/left{
+	layer = 4.11
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"Oa" = (
+/obj/structure/machinery/light/small,
+/obj/structure/largecrate/random/barrel/true_random,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"Ol" = (
+/obj/effect/landmark/objective_landmark/close,
+/obj/structure/closet,
+/obj/item/clothing/accessory/storage/webbing,
+/obj/item/clothing/accessory/storage/webbing,
+/obj/item/clothing/accessory/storage/webbing,
+/turf/open/floor/strata/floor3/east,
+/area/sekhmet/int_reg/yard)
+"Ov" = (
+/obj/structure/flora/grass/tallgrass/swamp/corner{
+	dir = 10
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/outside/southroad)
+"Oz" = (
+/turf/open/auto_turf/swamp_dirt/layer0,
+/area/sekhmet/outside/southroad)
+"Ph" = (
+/obj/structure/bed/hybrisa/bunkbed3,
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"PE" = (
+/obj/structure/fence/slim/upp/door,
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/int_reg/yard)
+"PH" = (
+/obj/structure/window/framed/shiva/reinforced/grey,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Qe" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/outside/southeast_road)
+"QV" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/structure/largecrate/supply/supplies/mre/upp,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Rc" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/structure/largecrate/random/mini/ammo{
+	pixel_x = 5;
+	pixel_y = 7
+	},
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Rd" = (
+/obj/structure/machinery/light/small{
+	pixel_x = 16
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud_alt,
+/area/sekhmet/int_reg/yard)
+"Rh" = (
+/obj/item/storage/bag/trash{
+	pixel_x = -4;
+	pixel_y = -9
+	},
+/obj/item/storage/bag/trash{
+	pixel_x = 5;
+	pixel_y = -15
+	},
+/turf/closed/wall/shiva/prefabricated/reinforced,
+/area/sekhmet/int_reg/yard)
+"Ri" = (
+/obj/structure/flora/bush/ausbushes/var3/sunnybush{
+	color = "#fceab2"
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"RB" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/item/stack/sheet/wood,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"RS" = (
+/turf/closed/wall/shiva/prefabricated/reinforced/hull,
+/area/sekhmet/int_reg/yard)
+"SB" = (
+/obj/structure/machinery/defenses/sentry/premade/lowammo/random/dumb{
+	dir = 1
+	},
+/turf/open/auto_turf/swamp_grass/layer0_mud_alt,
+/area/sekhmet/int_reg/yard)
+"SH" = (
+/obj/structure/closet,
+/obj/item/clothing/under/colonist/clf,
+/obj/effect/landmark/objective_landmark/medium,
+/obj/item/ammo_magazine/smg/fp9000,
+/obj/item/ammo_magazine/smg/fp9000,
+/obj/item/ammo_magazine/smg/fp9000,
+/obj/item/weapon/gun/smg/fp9000,
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"TQ" = (
+/obj/item/attachable/verticalgrip,
+/obj/item/attachable/verticalgrip,
+/obj/item/attachable/compensator,
+/obj/item/attachable/compensator,
+/obj/item/attachable/compensator,
+/obj/item/attachable/extended_barrel,
+/obj/item/attachable/extended_barrel,
+/obj/item/attachable/flashlight/grip,
+/obj/item/attachable/flashlight/grip,
+/obj/item/attachable/flashlight/grip,
+/obj/item/attachable/bayonet,
+/obj/item/attachable/bayonet,
+/obj/item/attachable/bayonet,
+/obj/item/attachable/attached_gun/flamer,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/structure/closet/crate,
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Uu" = (
+/turf/open/auto_turf/swamp_grass/layer0_mud_alt,
+/area/sekhmet/int_reg/yard)
+"Uy" = (
+/mob/living/simple_animal/small/frog/random,
+/turf/open/gm/coast/dirt/swampdir/south,
+/area/sekhmet/outside/swamp)
+"VH" = (
+/obj/structure/prop/colorable_rock/colorable/alt{
+	color = "#a39e99";
+	dir = 4;
+	pixel_x = -1
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"VJ" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/swamp_dirt/layer0,
+/area/sekhmet/outside/southroad)
+"VM" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/item/trash/cigbutt,
+/obj/effect/landmark/survivor_spawner/clf_engi/soro,
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"VU" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/obj/structure/cargo_container/upp_small/container_20/right,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/int_reg/yard)
+"WD" = (
+/obj/structure/prop/colorable_rock/colorable{
+	color = "#a39e99";
+	pixel_x = 2;
+	pixel_y = -7;
+	dir = 10
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"WE" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/landmark/survivor_spawner/clf/soro,
+/turf/open/floor/strata/multi_tiles/west,
+/area/sekhmet/int_reg/yard)
+"WP" = (
+/turf/open/gm/coast/dirt/swampbeachcorner/south_east,
+/area/sekhmet/outside/swamp)
+"WV" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/largecrate/random/barrel/yellow,
+/turf/open/floor/plating/kutjevo,
+/area/sekhmet/int_reg/yard)
+"Xi" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/outside/southroad)
+"Xm" = (
+/obj/structure/flora/bush/ausbushes/palebush{
+	color = "#fceab2";
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"XF" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/surface/table/almayer{
+	color = "#8B9490"
+	},
+/obj/item/paper_bin{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/tool/pen/clicky{
+	pixel_x = 4;
+	pixel_y = 3
+	},
+/obj/item/device/flashlight/lamp/green{
+	pixel_x = -7;
+	pixel_y = 7
+	},
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+"Yu" = (
+/obj/structure/surface/table/almayer{
+	color = "#8B9490"
+	},
+/obj/structure/machinery/light{
+	light_power = 0.5
+	},
+/obj/effect/landmark/objective_landmark/medium,
+/obj/item/ashtray/bronze{
+	icon_state = "ashtray_half_br";
+	pixel_x = -10;
+	pixel_y = 10
+	},
+/turf/open/floor/strata/multi_tiles/southwest,
+/area/sekhmet/int_reg/yard)
+"Zn" = (
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
+"ZY" = (
+/obj/structure/machinery/light/small,
+/turf/open/floor/kutjevo/grey,
+/area/sekhmet/int_reg/yard)
+
+(1,1,1) = {"
+Zn
+Oz
+Oz
+Zn
+Ov
+gM
+Zn
+Zn
+Zn
+Zn
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(2,1,1) = {"
+Zn
+jy
+Oz
+Zn
+Zn
+Zn
+Zn
+Zn
+Xi
+ko
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(3,1,1) = {"
+Zn
+jy
+Oz
+Fp
+Zn
+Zn
+dy
+Xi
+DI
+DI
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(4,1,1) = {"
+Oz
+Zn
+Oz
+Oz
+Zn
+Zn
+dy
+dy
+ko
+Xi
+dr
+RS
+dr
+dr
+RS
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(5,1,1) = {"
+Fp
+Oz
+Zn
+Oz
+Zn
+jN
+xK
+dy
+Xi
+RS
+RS
+RS
+RS
+RS
+RS
+RS
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(6,1,1) = {"
+Zn
+Oz
+Zn
+Zn
+Oz
+Zn
+Ri
+Zn
+ko
+RS
+Fv
+ln
+HS
+MF
+jf
+RS
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(7,1,1) = {"
+Zn
+Oz
+Oz
+jy
+Oz
+Zn
+Zn
+ct
+NH
+RS
+Hm
+aQ
+VM
+aU
+Cp
+RS
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(8,1,1) = {"
+Ri
+Zn
+Oz
+Zn
+Oz
+Fp
+dy
+Zn
+Zn
+RS
+sz
+ln
+Ge
+ln
+FD
+RS
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(9,1,1) = {"
+Zn
+Zn
+Zn
+Oz
+jy
+Oz
+Fp
+Oz
+Zn
+RS
+Nl
+ml
+tP
+sV
+cR
+RS
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(10,1,1) = {"
+Zn
+Zn
+Zn
+Oz
+Zn
+Zn
+Oz
+Zn
+Zn
+Rh
+Uu
+Uu
+eo
+eo
+Mb
+RS
+RS
+dr
+dr
+RS
+dr
+dr
+"}
+(11,1,1) = {"
+Kb
+Zn
+Zn
+Zn
+Oz
+Zn
+Oz
+Zn
+Oz
+PE
+xd
+iO
+DT
+yh
+eo
+RS
+RS
+RS
+RS
+RS
+RS
+dr
+"}
+(12,1,1) = {"
+jM
+Cv
+ct
+Zn
+Oz
+Oz
+Zn
+Oz
+Oz
+PE
+xd
+nT
+bs
+yG
+If
+kc
+zL
+dl
+Ol
+RS
+RS
+dr
+"}
+(13,1,1) = {"
+aD
+Cv
+Zn
+Zn
+Fp
+Oz
+Oz
+Zn
+Zn
+PE
+bu
+nS
+Er
+sn
+eo
+kc
+zw
+WE
+Bk
+RS
+RS
+dr
+"}
+(14,1,1) = {"
+aD
+jS
+EA
+Zn
+Zn
+Oz
+jy
+Oz
+lf
+kc
+Mb
+eo
+Uu
+Uu
+eo
+kc
+tS
+IV
+vv
+Nj
+RS
+dr
+"}
+(15,1,1) = {"
+aD
+EA
+jS
+lZ
+Zn
+Oz
+Oz
+Oz
+jw
+gt
+eZ
+Uu
+Md
+pT
+Uu
+tA
+ln
+EJ
+xt
+JX
+RS
+dr
+"}
+(16,1,1) = {"
+aD
+Cv
+xm
+nD
+VH
+Zn
+jy
+Oz
+DC
+gt
+eZ
+SB
+CY
+CY
+Uu
+vI
+bL
+vI
+KC
+Yu
+RS
+dr
+"}
+(17,1,1) = {"
+Uy
+Cv
+Cv
+nD
+nD
+Zn
+Oz
+Oz
+Zn
+gt
+bu
+Uu
+Uu
+AF
+CY
+PH
+uD
+vI
+Jl
+Dz
+RS
+dr
+"}
+(18,1,1) = {"
+aD
+jS
+Cv
+jN
+nD
+DC
+Zn
+zQ
+Zn
+kc
+eo
+QV
+TQ
+on
+CY
+PH
+IA
+ln
+CJ
+ln
+RS
+dr
+"}
+(19,1,1) = {"
+aD
+EA
+sA
+WD
+nD
+rN
+Fp
+Oz
+Oz
+PE
+xd
+FO
+DO
+Mv
+Rd
+kc
+oN
+qR
+bL
+ej
+RS
+dr
+"}
+(20,1,1) = {"
+WP
+tX
+dy
+Zn
+nD
+Zn
+Oz
+Zn
+Oz
+kc
+eo
+RB
+pD
+Gx
+Uu
+kc
+sR
+vI
+lD
+XF
+RS
+dr
+"}
+(21,1,1) = {"
+Cv
+Kb
+Zn
+DI
+nD
+Zn
+Oz
+Zn
+Fp
+gt
+bu
+Uu
+Uu
+Uu
+Uu
+PH
+yX
+bL
+GL
+Ks
+RS
+dr
+"}
+(22,1,1) = {"
+Zn
+Zn
+Zn
+DI
+DI
+Zn
+Oz
+Oz
+Zn
+gt
+bu
+SB
+Uu
+Uu
+CY
+PH
+ln
+jL
+ln
+JZ
+RS
+dr
+"}
+(23,1,1) = {"
+Zn
+xK
+hX
+hX
+DI
+Zn
+Zn
+jy
+Zn
+gt
+bu
+eo
+pT
+ke
+CY
+tA
+ln
+ln
+ln
+ZY
+RS
+dr
+"}
+(24,1,1) = {"
+Zn
+ct
+Zn
+hX
+DI
+Zn
+Zn
+Oz
+lf
+kc
+eo
+rh
+bz
+Rc
+nq
+vI
+ln
+vI
+qR
+bL
+RS
+dr
+"}
+(25,1,1) = {"
+dy
+dy
+Xi
+lq
+AJ
+Zn
+Oz
+jy
+Oz
+PE
+bu
+GQ
+mx
+ia
+NT
+kc
+ry
+eH
+eH
+Ph
+RS
+dr
+"}
+(26,1,1) = {"
+dy
+dy
+Zn
+ko
+tD
+Zn
+zQ
+Zn
+Oz
+PE
+bu
+WV
+Gj
+Dr
+VU
+kc
+ak
+WE
+eH
+SH
+RS
+dr
+"}
+(27,1,1) = {"
+ko
+Zn
+Xi
+ko
+tD
+Zn
+Oz
+Oz
+Oz
+PE
+gY
+uN
+JQ
+eo
+Oa
+kc
+Ag
+sI
+eH
+ov
+RS
+dr
+"}
+(28,1,1) = {"
+Xi
+ko
+ko
+Xi
+ch
+dy
+Oz
+Zn
+Fp
+kc
+gt
+gt
+kc
+RS
+RS
+RS
+RS
+RS
+RS
+RS
+RS
+dr
+"}
+(29,1,1) = {"
+nD
+dy
+dy
+dy
+ch
+dy
+Oz
+jy
+Zn
+Zn
+Zn
+Xi
+dr
+dr
+RS
+dr
+dr
+dr
+dr
+RS
+dr
+dr
+"}
+(30,1,1) = {"
+nD
+AJ
+tD
+ch
+Av
+Zn
+Oz
+jy
+Zn
+qq
+Xm
+HO
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+"}
+(31,1,1) = {"
+vU
+vU
+Zn
+Zn
+Zn
+Zn
+Oz
+Oz
+Zn
+dy
+jN
+Xi
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+"}
+(32,1,1) = {"
+qL
+ET
+ET
+Zn
+Ri
+Zn
+Zn
+Oz
+VJ
+dy
+dy
+Xi
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+"}
+(33,1,1) = {"
+Qe
+Qe
+rM
+Bj
+ET
+ET
+Oz
+Zn
+Oz
+ET
+DL
+ET
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+Fk
+"}
diff --git a/maps/sekhmet_swamp.json b/maps/sekhmet_swamp.json
index d2ad4879d187..9a81f918864c 100644
--- a/maps/sekhmet_swamp.json
+++ b/maps/sekhmet_swamp.json
@@ -26,8 +26,11 @@
     "CO_insert_survivor_types": [
         "/datum/equipment_preset/survivor/clf/coordinator"
     ],
+    "colony_joe_types": [
+        "/datum/job/antag/upp/dzho_automaton/colony"
+    ],
     "map_item_type": "/obj/item/map/sekhmet_swamp_map",
-    "announce_text": "An automated distress signal has been recieved from a Union of Progressive People's experimental medical research colony on border world SI-391, \"Sekhmet Swamp\". Authorization has been granted for a response team from the ###SHIPNAME### to conduct a reconnaissance in force.",
+    "announce_text": "An automated distress signal has been recieved from a Union of Progressive People's experimental medical research colony on the border world SI-391, \"Sekhmet Swamp\". Authorization has been granted for a response team from the ###SHIPNAME### to conduct a reconnaissance in force.",
     "monkey_types": [
         "stok"
     ],

From ff166295a1e0aaeb764f2247cde17106f8d3f2c2 Mon Sep 17 00:00:00 2001
From: Zenith <109559450+Zenith00000@users.noreply.github.com>
Date: Tue, 7 Jul 2026 18:05:33 +0100
Subject: [PATCH 2/2] clf insert fixes

---
 .../maps/Sekhmet_Swamp/nightmare.json         |   9 +-
 .../maps/Sekhmet_Swamp/scenario.json          |   4 +-
 .../Sekhmet_Swamp/standalone/clfswamp.dmm     | 457 +++++++++---------
 3 files changed, 234 insertions(+), 236 deletions(-)

diff --git a/maps/Nightmare/maps/Sekhmet_Swamp/nightmare.json b/maps/Nightmare/maps/Sekhmet_Swamp/nightmare.json
index f3a4d42dd32e..a322c3f34320 100644
--- a/maps/Nightmare/maps/Sekhmet_Swamp/nightmare.json
+++ b/maps/Nightmare/maps/Sekhmet_Swamp/nightmare.json
@@ -2,5 +2,12 @@
     {
         "type": "map_sprinkle",
         "path": "sprinkles/"
-    }
+    },
+	{
+	"type": "map_insert",
+	"landmark": "clfswamp",
+	"chance": 1.0,
+	"path": "standalone/clfswamp.dmm",
+	"when": { "lvevent": "clfswamp" }
+	}
 ]
diff --git a/maps/Nightmare/maps/Sekhmet_Swamp/scenario.json b/maps/Nightmare/maps/Sekhmet_Swamp/scenario.json
index 7ed2ec874270..21e073aa8810 100644
--- a/maps/Nightmare/maps/Sekhmet_Swamp/scenario.json
+++ b/maps/Nightmare/maps/Sekhmet_Swamp/scenario.json
@@ -2,8 +2,8 @@
     {
         "type": "pick", "name": "event",
         "choices": [
-            { "weight": 1, "type": "def", "values": { "lvevent": "none" } },
-            { "weight": 9, "type": "def", "values": { "lvevent": "clfswamp", "hostile_survivors": true } }
+            { "weight": 9, "type": "def", "values": { "lvevent": "none" } },
+            { "weight": 1, "type": "def", "values": { "lvevent": "clfswamp", "hostile_survivors": true } }
         ]
     }
 ]
diff --git a/maps/map_files/Sekhmet_Swamp/standalone/clfswamp.dmm b/maps/map_files/Sekhmet_Swamp/standalone/clfswamp.dmm
index 11c1e90b8bcd..0dd45ea33abc 100644
--- a/maps/map_files/Sekhmet_Swamp/standalone/clfswamp.dmm
+++ b/maps/map_files/Sekhmet_Swamp/standalone/clfswamp.dmm
@@ -8,8 +8,8 @@
 /obj/item/ammo_magazine/smg/fp9000,
 /obj/item/weapon/gun/smg/fp9000,
 /obj/structure/sign/poster/clf{
-	pixel_y = 36;
-	pixel_x = 9
+	pixel_y = 37;
+	pixel_x = 10
 	},
 /obj/structure/machinery/light/small{
 	dir = 1
@@ -20,12 +20,13 @@
 /turf/open/gm/coast/dirt/swampdir/south,
 /area/sekhmet/outside/swamp)
 "aQ" = (
-/obj/effect/vehicle_spawner/clf_van/fixed{
-	dir = 4
-	},
 /obj/effect/decal/hybrisa/dirt,
 /obj/effect/decal/hybrisa/dirt,
-/turf/open/floor/kutjevo/grey,
+/obj/item/frame/rack{
+	layer = 2.9;
+	color = "#6b675e"
+	},
+/turf/open/floor/strata/multi_tiles/southeast,
 /area/sekhmet/int_reg/yard)
 "aU" = (
 /obj/effect/decal/hybrisa/dirt,
@@ -36,7 +37,7 @@
 	pixel_y = -9;
 	pixel_x = -2
 	},
-/turf/open/floor/kutjevo/grey,
+/turf/open/floor/strata/multi_tiles/southeast,
 /area/sekhmet/int_reg/yard)
 "bs" = (
 /obj/effect/decal/warning_stripes{
@@ -46,21 +47,22 @@
 	pixel_y = 13
 	},
 /turf/open/floor/strata/floor3/east,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "bu" = (
 /obj/structure/barricade/sandbags/wired{
 	color = "#a98c7c";
-	dir = 1
+	dir = 1;
+	pixel_y = -4
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "bz" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
 	},
 /obj/structure/largecrate/supply,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "bL" = (
 /obj/effect/decal/hybrisa/dirt,
 /turf/open/floor/kutjevo/grey,
@@ -76,14 +78,11 @@
 /turf/open/auto_turf/swamp_grass/layer1,
 /area/sekhmet/outside/southroad)
 "cR" = (
-/obj/effect/decal/hybrisa/dirt,
-/obj/structure/largecrate/random/barrel/green,
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 2
+/obj/structure/fence/slim/upp{
+	layer = 1.9
 	},
-/turf/open/floor/kutjevo/grey,
-/area/sekhmet/int_reg/yard)
+/turf/open/auto_turf/swamp_grass/layer1,
+/area/sekhmet/outside/southroad)
 "dl" = (
 /obj/structure/machinery/power/apc/power/west,
 /turf/open/floor/strata/multi_tiles/west,
@@ -107,22 +106,22 @@
 	},
 /turf/open/floor/kutjevo/grey,
 /area/sekhmet/int_reg/yard)
-"eo" = (
-/turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
 "eH" = (
 /turf/open/floor/strata/multi_tiles/west,
 /area/sekhmet/int_reg/yard)
 "eZ" = (
 /obj/structure/barricade/sandbags/wired{
 	color = "#a98c7c";
-	dir = 1
+	dir = 1;
+	pixel_y = -4
 	},
 /turf/open/auto_turf/swamp_grass/layer1,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "gt" = (
-/obj/structure/fence/slim/upp,
-/turf/open/auto_turf/swamp_grass/layer1,
+/obj/effect/vehicle_spawner/clf_van/fixed{
+	dir = 1
+	},
+/turf/open/floor/kutjevo/grey,
 /area/sekhmet/int_reg/yard)
 "gM" = (
 /obj/structure/flora/grass/tallgrass/swamp/corner{
@@ -133,14 +132,15 @@
 "gY" = (
 /obj/structure/barricade/sandbags/wired{
 	color = "#a98c7c";
-	dir = 1
+	dir = 1;
+	pixel_y = -4
 	},
 /obj/structure/barricade/sandbags/wired{
 	color = "#a98c7c";
 	dir = 4
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "hX" = (
 /obj/structure/flora/jungle/vines/light_1{
 	color = "#fceab2"
@@ -164,7 +164,7 @@
 /obj/item/ammo_magazine/rifle/mar40,
 /obj/item/weapon/gun/rifle/mar40/carbine,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "iO" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -178,7 +178,7 @@
 	pixel_y = -4
 	},
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "jf" = (
 /obj/item/hardpoint/locomotion/van_wheels,
 /turf/open/floor/kutjevo/grey,
@@ -220,7 +220,7 @@
 "ke" = (
 /obj/effect/landmark/survivor_spawner/clf/soro,
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "ko" = (
 /turf/open/auto_turf/swamp_grass/layer0_mud,
 /area/sekhmet/outside/southroad)
@@ -269,6 +269,13 @@
 	icon_state = "E";
 	pixel_x = 2
 	},
+/obj/item/stack/sheet/wood{
+	pixel_y = 2
+	},
+/obj/item/stack/sheet/metal{
+	pixel_x = -2;
+	pixel_y = -4
+	},
 /turf/open/floor/kutjevo/grey,
 /area/sekhmet/int_reg/yard)
 "mx" = (
@@ -296,7 +303,7 @@
 	pixel_y = 6
 	},
 /turf/open/floor/strata/floor3/east,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "nq" = (
 /obj/structure/prop/colorable_rock/colorable{
 	color = "#a39e99";
@@ -308,7 +315,7 @@
 	dir = 4
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "nD" = (
 /turf/closed/wall/rock{
 	color = "#797571"
@@ -329,7 +336,7 @@
 	pixel_y = 4
 	},
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "nT" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -337,7 +344,7 @@
 	},
 /obj/effect/decal/hybrisa/dirt,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "on" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -355,7 +362,7 @@
 /obj/item/storage/surgical_tray,
 /obj/item/roller/surgical,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "ov" = (
 /obj/structure/bed/hybrisa/bunkbed3{
 	dir = 1
@@ -377,11 +384,11 @@
 /obj/effect/decal/hybrisa/dirt,
 /obj/structure/largecrate/supply/floodlights,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "pT" = (
 /obj/item/trash/cigbutt,
 /turf/open/auto_turf/swamp_grass/layer0_mud_alt,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "qq" = (
 /obj/structure/prop/colorable_rock/colorable{
 	color = "#a39e99";
@@ -426,7 +433,7 @@
 	pixel_y = 2
 	},
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "ry" = (
 /obj/effect/decal/hybrisa/dirt,
 /obj/structure/bed/hybrisa/bunkbed3{
@@ -457,14 +464,11 @@
 	},
 /obj/effect/decal/hybrisa/dirt,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "sz" = (
-/obj/structure/extinguisher_cabinet/alt{
-	pixel_y = 30
-	},
-/obj/effect/decal/hybrisa/dirt,
-/turf/open/floor/kutjevo/grey,
-/area/sekhmet/int_reg/yard)
+/obj/structure/machinery/light/small,
+/turf/open/auto_turf/swamp_grass/layer0_mud,
+/area/sekhmet/outside/southroad)
 "sA" = (
 /obj/structure/prop/colorable_rock/colorable{
 	color = "#a39e99";
@@ -491,11 +495,11 @@
 /area/sekhmet/int_reg/yard)
 "sV" = (
 /obj/effect/decal/hybrisa/dirt,
-/obj/item/trash/cigbutt,
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
 	pixel_x = 2
 	},
+/obj/structure/largecrate/random/barrel/true_random,
 /turf/open/floor/kutjevo/grey,
 /area/sekhmet/int_reg/yard)
 "tA" = (
@@ -510,12 +514,8 @@
 /turf/open/auto_turf/swamp_grass/layer1,
 /area/sekhmet/outside/southroad)
 "tP" = (
-/obj/effect/decal/hybrisa/dirt,
-/obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = 2
-	},
-/turf/open/floor/strata/multi_tiles/west,
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/closed/wall/shiva/prefabricated/reinforced/hull,
 /area/sekhmet/int_reg/yard)
 "tS" = (
 /obj/structure/pipes/vents/pump,
@@ -539,7 +539,7 @@
 	dir = 4
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "vv" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -572,7 +572,7 @@
 	density = 1
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "xm" = (
 /obj/structure/flora/bush/ausbushes/var3/fullgrass,
 /turf/open/gm/dirt/swamp_dirt,
@@ -613,14 +613,14 @@
 	pixel_y = -4
 	},
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "yG" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
 	},
 /obj/effect/decal/hybrisa/dirt,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "yX" = (
 /obj/item/ammo_magazine/rifle/l42a/abr40,
 /obj/item/ammo_magazine/rifle/l42a/abr40,
@@ -660,15 +660,15 @@
 /obj/structure/bed/hybrisa/bunkbed3{
 	dir = 8
 	},
+/obj/structure/sign/poster/pinup{
+	pixel_x = -7;
+	pixel_y = 33
+	},
 /turf/open/floor/strata/multi_tiles/west,
 /area/sekhmet/int_reg/yard)
 "Av" = (
 /turf/closed/wall/shiva/prefabricated/reinforced,
 /area/sekhmet/outside/southroad)
-"AF" = (
-/obj/effect/landmark/survivor_spawner/clf_medic/soro,
-/turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
 "AJ" = (
 /obj/structure/flora/jungle/vines/light_1{
 	color = "#fceab2"
@@ -699,18 +699,17 @@
 	layer = 2.79
 	},
 /obj/effect/spawner/random/toolbox,
-/turf/open/floor/kutjevo/grey,
+/obj/structure/machinery/light/double,
+/turf/open/floor/strata/multi_tiles/southeast,
 /area/sekhmet/int_reg/yard)
 "Cv" = (
 /turf/open/gm/dirt/swamp_dirt,
 /area/sekhmet/outside/swamp)
 "CJ" = (
-/obj/effect/landmark/survivor_spawner/clf/soro,
-/turf/open/floor/kutjevo/grey,
-/area/sekhmet/int_reg/yard)
-"CY" = (
-/turf/open/auto_turf/swamp_grass/layer1,
-/area/sekhmet/int_reg/yard)
+/obj/item/trash/cigbutt,
+/obj/effect/landmark/survivor_spawner/clf_medic/soro,
+/turf/open/auto_turf/swamp_grass/layer0_mud_alt,
+/area/sekhmet/outside/southroad)
 "Dr" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -722,7 +721,7 @@
 /obj/effect/decal/hybrisa/dirt,
 /obj/structure/largecrate/supply/ammo/shotgun,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Dz" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -756,13 +755,13 @@
 	},
 /obj/structure/reagent_dispensers/tank/fuel,
 /turf/open/floor/strata/floor3/east,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "DT" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
 	},
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Er" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -771,7 +770,7 @@
 /obj/effect/decal/hybrisa/dirt,
 /obj/effect/landmark/survivor_spawner/clf_lead/soro,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "EA" = (
 /obj/structure/flora/bush/ausbushes/var3/sparsegrass,
 /turf/open/gm/dirt/swamp_dirt,
@@ -795,18 +794,10 @@
 "Fv" = (
 /obj/effect/decal/hybrisa/dirt,
 /obj/effect/decal/hybrisa/dirt,
-/obj/structure/sign/poster/pinup{
-	pixel_x = 1;
-	pixel_y = 36
-	},
 /turf/open/floor/kutjevo/grey,
 /area/sekhmet/int_reg/yard)
 "FD" = (
-/obj/structure/surface/rack{
-	color = "#6b675e";
-	layer = 2.79
-	},
-/obj/effect/decal/hybrisa/dirt,
+/obj/item/trash/cigbutt,
 /turf/open/floor/kutjevo/grey,
 /area/sekhmet/int_reg/yard)
 "FO" = (
@@ -822,13 +813,14 @@
 	pixel_y = 2
 	},
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Ge" = (
 /obj/item/tool/crowbar/red{
 	pixel_x = -8;
 	pixel_y = 10
 	},
-/turf/open/floor/strata/multi_tiles/west,
+/obj/effect/landmark/survivor_spawner/clf_engi/soro,
+/turf/open/floor/kutjevo/grey,
 /area/sekhmet/int_reg/yard)
 "Gj" = (
 /obj/effect/decal/warning_stripes{
@@ -852,7 +844,7 @@
 	pixel_y = -3
 	},
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Gx" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -867,7 +859,7 @@
 	pixel_y = -5
 	},
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "GL" = (
 /obj/effect/decal/hybrisa/dirt,
 /obj/structure/bed/chair,
@@ -880,17 +872,15 @@
 	},
 /obj/structure/largecrate/supply/ammo/m56d,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Hm" = (
-/obj/structure/sign/poster/clf{
-	pixel_y = 36;
-	pixel_x = -8
-	},
-/obj/structure/sign/poster/clf{
-	pixel_y = 33;
-	pixel_x = 2
+/obj/structure/machinery/door_control{
+	pixel_x = 1;
+	pixel_y = 31;
+	id = "clf_garage"
 	},
-/turf/open/floor/kutjevo/grey,
+/obj/item/trash/cigbutt,
+/turf/open/floor/strata/multi_tiles/southeast,
 /area/sekhmet/int_reg/yard)
 "HO" = (
 /obj/structure/prop/colorable_rock/colorable{
@@ -900,12 +890,6 @@
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud,
 /area/sekhmet/outside/southroad)
-"HS" = (
-/obj/structure/machinery/light/double{
-	dir = 8
-	},
-/turf/open/floor/strata/multi_tiles/west,
-/area/sekhmet/int_reg/yard)
 "If" = (
 /obj/structure/machinery/light/small,
 /turf/open/auto_turf/swamp_grass/layer0_mud,
@@ -944,7 +928,7 @@
 	pixel_y = -7
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "JX" = (
 /obj/structure/surface/table/almayer{
 	color = "#8B9490"
@@ -1002,13 +986,23 @@
 /turf/open/floor/strata/multi_tiles/southwest,
 /area/sekhmet/int_reg/yard)
 "Mb" = (
-/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
-/turf/open/auto_turf/swamp_grass/layer0_mud,
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	id = "clf_garage";
+	name = "Garage Shutters";
+	color = "#8B9490";
+	dir = 2;
+	pixel_y = -2
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 2
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/sekhmet/int_reg/yard)
 "Md" = (
 /obj/structure/flora/bush/ausbushes/var3/sparsegrass,
 /turf/open/auto_turf/swamp_grass/layer0_mud_alt,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Mv" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -1017,7 +1011,7 @@
 /obj/effect/decal/hybrisa/dirt,
 /obj/structure/largecrate/supply/supplies/flares,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "MF" = (
 /obj/structure/largecrate/random/secure,
 /turf/open/floor/kutjevo/grey,
@@ -1040,22 +1034,17 @@
 	},
 /turf/open/floor/kutjevo/grey,
 /area/sekhmet/int_reg/yard)
-"NH" = (
-/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
-/obj/structure/machinery/light/small,
-/turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
 "NT" = (
 /obj/structure/cargo_container/upp_small/container_20/left{
 	layer = 4.11
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Oa" = (
 /obj/structure/machinery/light/small,
 /obj/structure/largecrate/random/barrel/true_random,
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Ol" = (
 /obj/effect/landmark/objective_landmark/close,
 /obj/structure/closet,
@@ -1080,7 +1069,7 @@
 "PE" = (
 /obj/structure/fence/slim/upp/door,
 /turf/open/auto_turf/swamp_grass/layer1,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "PH" = (
 /obj/structure/window/framed/shiva/reinforced/grey,
 /turf/open/floor/plating/kutjevo,
@@ -1099,7 +1088,7 @@
 	},
 /obj/structure/largecrate/supply/supplies/mre/upp,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Rc" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -1112,13 +1101,13 @@
 	pixel_y = 7
 	},
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Rd" = (
 /obj/structure/machinery/light/small{
 	pixel_x = 16
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud_alt,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Rh" = (
 /obj/item/storage/bag/trash{
 	pixel_x = -4;
@@ -1148,7 +1137,7 @@
 /obj/effect/decal/hybrisa/dirt,
 /obj/item/stack/sheet/wood,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "RS" = (
 /turf/closed/wall/shiva/prefabricated/reinforced/hull,
 /area/sekhmet/int_reg/yard)
@@ -1157,7 +1146,7 @@
 	dir = 1
 	},
 /turf/open/auto_turf/swamp_grass/layer0_mud_alt,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "SH" = (
 /obj/structure/closet,
 /obj/item/clothing/under/colonist/clf,
@@ -1189,10 +1178,10 @@
 /obj/structure/closet/crate,
 /obj/effect/decal/hybrisa/dirt,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Uu" = (
 /turf/open/auto_turf/swamp_grass/layer0_mud_alt,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Uy" = (
 /mob/living/simple_animal/small/frog/random,
 /turf/open/gm/coast/dirt/swampdir/south,
@@ -1212,14 +1201,16 @@
 "VM" = (
 /obj/effect/decal/hybrisa/dirt,
 /obj/item/trash/cigbutt,
-/obj/effect/landmark/survivor_spawner/clf_engi/soro,
-/turf/open/floor/strata/multi_tiles/west,
+/obj/item/prop/colony/canister{
+	pixel_y = 23
+	},
+/turf/open/floor/strata/multi_tiles/southeast,
 /area/sekhmet/int_reg/yard)
 "VU" = (
 /obj/structure/flora/bush/ausbushes/var3/sparsegrass,
 /obj/structure/cargo_container/upp_small/container_20/right,
 /turf/open/auto_turf/swamp_grass/layer0_mud,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "WD" = (
 /obj/structure/prop/colorable_rock/colorable{
 	color = "#a39e99";
@@ -1249,7 +1240,7 @@
 /obj/effect/decal/hybrisa/dirt,
 /obj/structure/largecrate/random/barrel/yellow,
 /turf/open/floor/plating/kutjevo,
-/area/sekhmet/int_reg/yard)
+/area/sekhmet/outside/southroad)
 "Xi" = (
 /obj/structure/flora/bush/ausbushes/var3/sparsegrass,
 /turf/open/auto_turf/swamp_grass/layer0_mud,
@@ -1312,7 +1303,7 @@ Zn
 Ov
 gM
 Zn
-Zn
+Ri
 Zn
 Zn
 dr
@@ -1335,8 +1326,8 @@ Oz
 Zn
 Zn
 Zn
-Zn
-Zn
+xK
+dy
 Xi
 ko
 dr
@@ -1365,7 +1356,7 @@ DI
 DI
 dr
 dr
-dr
+RS
 dr
 dr
 dr
@@ -1383,16 +1374,16 @@ Oz
 Oz
 Zn
 Zn
-dy
-dy
-ko
+Zn
+Zn
 Xi
-dr
+tP
+RS
+RS
+RS
+RS
 RS
-dr
-dr
 RS
-dr
 dr
 dr
 dr
@@ -1406,16 +1397,16 @@ Oz
 Zn
 Oz
 Zn
-jN
-xK
-dy
-Xi
-RS
-RS
-RS
-RS
-RS
-RS
+Zn
+Oz
+Oz
+Oz
+Mb
+ln
+ln
+gt
+ln
+jf
 RS
 dr
 dr
@@ -1430,16 +1421,16 @@ Oz
 Zn
 Zn
 Oz
-Zn
-Ri
-Zn
-ko
-RS
+Oz
+Oz
+jy
+Oz
+Mb
 Fv
 ln
-HS
+ln
+ln
 MF
-jf
 RS
 dr
 dr
@@ -1455,9 +1446,9 @@ Oz
 jy
 Oz
 Zn
+Oz
 Zn
-ct
-NH
+If
 RS
 Hm
 aQ
@@ -1465,7 +1456,7 @@ VM
 aU
 Cp
 RS
-dr
+RS
 dr
 dr
 dr
@@ -1479,15 +1470,15 @@ Oz
 Zn
 Oz
 Fp
-dy
-Zn
-Zn
-RS
-sz
+jy
+Oz
+Oz
+Mb
+bL
 ln
 Ge
-ln
 FD
+bL
 RS
 dr
 dr
@@ -1503,15 +1494,15 @@ Zn
 Oz
 jy
 Oz
+zQ
 Fp
 Oz
-Zn
-RS
+Mb
 Nl
 ml
-tP
+Nl
 sV
-cR
+Nl
 RS
 dr
 dr
@@ -1533,13 +1524,13 @@ Zn
 Rh
 Uu
 Uu
-eo
-eo
-Mb
-RS
+ko
+ko
+Xi
 RS
 dr
 dr
+dr
 RS
 dr
 dr
@@ -1552,14 +1543,14 @@ Zn
 Oz
 Zn
 Oz
-Zn
 Oz
-PE
-xd
-iO
-DT
-yh
-eo
+Zn
+cR
+bu
+QV
+TQ
+on
+ko
 RS
 RS
 RS
@@ -1576,19 +1567,19 @@ Zn
 Oz
 Oz
 Zn
+Zn
 Oz
-Oz
-PE
-xd
-nT
-bs
-yG
-If
+cR
+bu
+FO
+DO
+Mv
+sz
 kc
 zL
 dl
 Ol
-RS
+kc
 RS
 dr
 "}
@@ -1602,17 +1593,17 @@ Oz
 Oz
 Zn
 Zn
-PE
+cR
 bu
-nS
-Er
-sn
-eo
+RB
+pD
+Gx
+ko
 kc
 zw
 WE
 Bk
-RS
+kc
 RS
 dr
 "}
@@ -1627,11 +1618,11 @@ jy
 Oz
 lf
 kc
-Mb
-eo
+Xi
+ko
 Uu
 Uu
-eo
+ko
 kc
 tS
 IV
@@ -1650,11 +1641,11 @@ Oz
 Oz
 Oz
 jw
-gt
+cR
 eZ
 Uu
 Md
-pT
+CJ
 Uu
 tA
 ln
@@ -1674,11 +1665,11 @@ Zn
 jy
 Oz
 DC
-gt
+cR
 eZ
 SB
-CY
-CY
+Zn
+Zn
 Uu
 vI
 bL
@@ -1698,12 +1689,12 @@ Zn
 Oz
 Oz
 Zn
-gt
+cR
 bu
 Uu
 Uu
-AF
-CY
+ko
+Zn
 PH
 uD
 vI
@@ -1723,15 +1714,15 @@ Zn
 zQ
 Zn
 kc
-eo
-QV
-TQ
-on
-CY
+ko
+iO
+DT
+yh
+Zn
 PH
 IA
 ln
-CJ
+ln
 ln
 RS
 dr
@@ -1748,14 +1739,14 @@ Oz
 Oz
 PE
 xd
-FO
-DO
-Mv
+nT
+bs
+yG
 Rd
 kc
 oN
 qR
-bL
+jL
 ej
 RS
 dr
@@ -1771,10 +1762,10 @@ Oz
 Zn
 Oz
 kc
-eo
-RB
-pD
-Gx
+ko
+nS
+Er
+sn
 Uu
 kc
 sR
@@ -1794,7 +1785,7 @@ Zn
 Oz
 Zn
 Fp
-gt
+cR
 bu
 Uu
 Uu
@@ -1818,15 +1809,15 @@ Zn
 Oz
 Oz
 Zn
-gt
+cR
 bu
 SB
 Uu
 Uu
-CY
+Zn
 PH
 ln
-jL
+bL
 ln
 JZ
 RS
@@ -1842,16 +1833,16 @@ Zn
 Zn
 jy
 Zn
-gt
+cR
 bu
-eo
+ko
 pT
 ke
-CY
+Zn
 tA
 ln
 ln
-ln
+FD
 ZY
 RS
 dr
@@ -1867,7 +1858,7 @@ Zn
 Oz
 lf
 kc
-eo
+ko
 rh
 bz
 Rc
@@ -1890,7 +1881,7 @@ Zn
 Oz
 jy
 Oz
-PE
+cR
 bu
 GQ
 mx
@@ -1914,7 +1905,7 @@ Zn
 zQ
 Zn
 Oz
-PE
+cR
 bu
 WV
 Gj
@@ -1937,12 +1928,12 @@ tD
 Zn
 Oz
 Oz
-Oz
-PE
+Zn
+cR
 gY
 uN
 JQ
-eo
+ko
 Oa
 kc
 Ag
@@ -1963,11 +1954,11 @@ Oz
 Zn
 Fp
 kc
-gt
-gt
+ch
+ch
+kc
+kc
 kc
-RS
-RS
 RS
 RS
 RS
@@ -1991,9 +1982,9 @@ Zn
 Xi
 dr
 dr
-RS
 dr
 dr
+RS
 dr
 dr
 RS