diff --git a/html/changelogs/hazelmouse-xanufrigatefixes.yml b/html/changelogs/hazelmouse-xanufrigatefixes.yml
new file mode 100644
index 00000000000..93b322bedb4
--- /dev/null
+++ b/html/changelogs/hazelmouse-xanufrigatefixes.yml
@@ -0,0 +1,59 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: hazelmouse
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Resolved awkward starlight interactions in a number of offsites and offships, including the Xanu Frigate and Ranger Corvette."
+  - rscadd: "Added missing fore gunnery entry points to the Xanu Frigate offship, and appropriately renamed starboard and portside gunnery entry points to make it clear that they do impact the gunnery nacelles."
diff --git a/maps/away/away_site/cult_base/cult_base.dmm b/maps/away/away_site/cult_base/cult_base.dmm
index 27fd1febee9..0ff789beca9 100644
--- a/maps/away/away_site/cult_base/cult_base.dmm
+++ b/maps/away/away_site/cult_base/cult_base.dmm
@@ -616,7 +616,7 @@
 	pixel_x = -3
 	},
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "abJ" = (
 /obj/random/dirt_75,
 /turf/simulated/floor/exoplanet/asteroid/ash/rocky,
@@ -957,7 +957,7 @@
 	pixel_y = 2
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "acC" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/random/dirt_75,
@@ -1894,7 +1894,7 @@
 /obj/random/dirt_75,
 /obj/random/medical,
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "agh" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2060,7 +2060,7 @@
 /obj/random/dirt_75,
 /obj/random/dirt_75,
 /turf/simulated/floor/airless,
-/area/space)
+/area/shuttle/cult_base/crew)
 "ahd" = (
 /obj/structure/machinery/atmospherics/portables_connector{
 	dir = 8
@@ -2154,7 +2154,7 @@
 	single_use = 1
 	},
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "ahG" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -3446,7 +3446,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "apX" = (
 /turf/simulated/wall/r_wall,
 /area/cult_base/atmos_waste)
@@ -3550,7 +3550,7 @@
 /obj/random/dirt_75,
 /obj/random/dirt_75,
 /turf/simulated/floor/airless,
-/area/space)
+/area/shuttle/cult_base/crew)
 "aqB" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 5
@@ -3941,7 +3941,7 @@
 /obj/random/dirt_75,
 /obj/random/tool,
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "asU" = (
 /obj/structure/machinery/light/small/emergency{
 	dir = 4
@@ -4088,7 +4088,7 @@
 /obj/random/dirt_75,
 /obj/random/plushie,
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "atv" = (
 /obj/effect/floor_decal/industrial/outline/grey,
 /obj/structure/reagent_dispensers/watertank,
@@ -4240,9 +4240,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/cult_base/docks_west)
 "auo" = (
-/obj/structure/lattice,
-/turf/template_noop,
-/area/space)
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/cult_base/asteroid)
 "aur" = (
 /obj/structure/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/random/dirt_75,
@@ -4944,10 +4944,10 @@
 /turf/simulated/floor/plating,
 /area/cult_base/atmos_supply)
 "ayG" = (
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
 /obj/effect/map_effect/map_helper/ruler_tiles_3,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/cult_base/asteroid)
 "ayI" = (
 /obj/effect/floor_decal/industrial/outline/grey,
 /obj/structure/machinery/portable_atmospherics/canister/oxygen,
@@ -5531,13 +5531,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/cult_base/hallways_south)
 "aCv" = (
-/obj/structure/structural_support{
-	pixel_y = 8
+/obj/random/dirt_75,
+/obj/effect/floor_decal/industrial/arrow/yellow{
+	dir = 4
 	},
-/obj/random/dirt_75,
-/obj/random/dirt_75,
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aCx" = (
 /obj/effect/floor_decal/corner/mauve/diagonal{
 	dir = 4
@@ -6170,7 +6169,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/airless,
-/area/cult_base/bridge)
+/area/cult_base/asteroid)
 "aGZ" = (
 /obj/random/junk,
 /turf/simulated/floor/tiled/dark,
@@ -6710,7 +6709,7 @@
 /obj/random/dirt_75,
 /obj/random/contraband,
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aKp" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/blue,
@@ -6779,7 +6778,7 @@
 /obj/random/dirt_75,
 /obj/random/medical,
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aKH" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 5
@@ -6820,7 +6819,7 @@
 /obj/random/dirt_75,
 /obj/random/loot,
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aKM" = (
 /obj/structure/table/steel,
 /obj/item/towel/random{
@@ -6912,7 +6911,7 @@
 /obj/random/dirt_75,
 /obj/random/toolbox,
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aLk" = (
 /obj/effect/floor_decal/corner/grey/full,
 /turf/simulated/floor/tiled/dark,
@@ -7279,7 +7278,7 @@
 	pixel_x = 10
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aNf" = (
 /obj/structure/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
@@ -7348,7 +7347,7 @@
 	pixel_y = -6
 	},
 /turf/simulated/floor/cult,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aNw" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -7410,12 +7409,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/cult_base/crew_quarters)
 "aNT" = (
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
 /obj/effect/map_effect/map_helper/ruler_tiles_3{
 	dir = 4
 	},
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/cult_base/asteroid)
 "aNU" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 1
@@ -7560,7 +7559,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aOM" = (
 /obj/effect/floor_decal/industrial/outline/grey,
 /obj/structure/machinery/portable_atmospherics/canister/empty/hydrogen,
@@ -7635,7 +7634,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/cult_base/maint_north)
 "aPl" = (
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
 /obj/structure/machinery/atmospherics/pipe/simple/visible/red{
 	dir = 4
 	},
@@ -7989,7 +7988,7 @@
 	},
 /obj/item/stack/barbed_wire/half_full,
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aRL" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -8006,10 +8005,11 @@
 /turf/simulated/floor/plating,
 /area/cult_base/maint_south)
 "aRN" = (
-/turf/simulated/wall/r_wall{
-	can_open = 1;
-	color = "#CCDDFF"
+/obj/effect/map_effect/map_helper/ruler_tiles_3{
+	dir = 4
 	},
+/obj/structure/lattice,
+/turf/space,
 /area/cult_base/asteroid)
 "aRP" = (
 /obj/effect/floor_decal/corner/grey{
@@ -8254,7 +8254,7 @@
 /obj/random/dirt_75,
 /obj/random/dirt_75,
 /turf/simulated/floor/airless,
-/area/space)
+/area/shuttle/cult_base/crew)
 "aSH" = (
 /obj/structure/trash_pile,
 /turf/simulated/floor/plating,
@@ -8331,7 +8331,7 @@
 /obj/random/dirt_75,
 /obj/random/dirt_75,
 /turf/simulated/floor/airless,
-/area/space)
+/area/shuttle/cult_base/crew)
 "aTd" = (
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
 /obj/structure/closet/emcloset,
@@ -8482,9 +8482,6 @@
 	},
 /turf/simulated/floor/exoplanet/barren,
 /area/cult_base/asteroid_inside)
-"aUe" = (
-/turf/simulated/wall/r_wall,
-/area/cult_base/asteroid)
 "aUg" = (
 /obj/random/dirt_75,
 /obj/effect/floor_decal/industrial/arrow/yellow{
@@ -9492,7 +9489,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "aZQ" = (
 /obj/structure/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark/full,
@@ -10042,7 +10039,7 @@
 	pixel_y = 17
 	},
 /turf/simulated/floor/cult,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "fpV" = (
 /obj/structure/machinery/door/airlock/external,
 /obj/effect/map_effect/marker/airlock/docking/cult_base/dock/west_3,
@@ -10194,7 +10191,7 @@
 	pixel_y = 6
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "ghF" = (
 /obj/effect/map_effect/window_spawner/full/shuttle/mercenary{
 	spawn_firedoor = 1;
@@ -10307,7 +10304,7 @@
 	pixel_y = 23
 	},
 /turf/simulated/floor/cult,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "gFJ" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -10385,7 +10382,7 @@
 	pixel_x = -5
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "heE" = (
 /obj/effect/landmark/entry_point/starboard{
 	name = "starboard, center";
@@ -10559,7 +10556,7 @@
 	single_use = 1
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "hYV" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -10632,7 +10629,7 @@
 	pixel_x = -8
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "ivn" = (
 /obj/structure/machinery/shipsensors/weak,
 /obj/effect/floor_decal/industrial/warning{
@@ -10641,7 +10638,7 @@
 /obj/random/dirt_75,
 /obj/random/dirt_75,
 /turf/simulated/floor/airless,
-/area/cult_base/bridge)
+/area/cult_base/asteroid)
 "iBG" = (
 /obj/random/dirt_75,
 /obj/random/dirt_75,
@@ -10837,7 +10834,7 @@
 "jBg" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/simulated/floor/cult,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "jGU" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
@@ -11013,11 +11010,9 @@
 /turf/simulated/floor/plating,
 /area/cult_base/atmos_supply)
 "lfM" = (
-/obj/random/dirt_75,
-/obj/effect/floor_decal/industrial/arrow/yellow{
-	dir = 8
-	},
-/turf/simulated/floor/plating/asteroid,
+/obj/effect/map_effect/map_helper/ruler_tiles_3,
+/obj/structure/lattice,
+/turf/space,
 /area/cult_base/asteroid)
 "lhE" = (
 /obj/random/dirt_75,
@@ -11084,7 +11079,7 @@
 	pixel_x = -3
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "llS" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 4
@@ -11410,7 +11405,7 @@
 	pixel_y = 8
 	},
 /turf/simulated/floor/cult,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "nDG" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 8
@@ -11817,7 +11812,7 @@
 /area/cult_base/crew_quarters)
 "qjx" = (
 /turf/simulated/floor/cult,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "qkC" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -11862,7 +11857,7 @@
 /obj/random/loot,
 /obj/random/dirt_75,
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "qCP" = (
 /obj/random/dirt_75,
 /obj/effect/floor_decal/industrial/arrow/yellow{
@@ -11877,7 +11872,7 @@
 	pixel_x = 5
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "qEw" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 5
@@ -11902,7 +11897,7 @@
 	pixel_x = 5
 	},
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "qLi" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -12098,7 +12093,7 @@
 	pixel_y = -5
 	},
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "shH" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/dark,
@@ -12137,7 +12132,7 @@
 "sqe" = (
 /obj/effect/rune/convert/no_equip,
 /turf/simulated/floor/cult,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "srR" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /obj/structure/cable/yellow{
@@ -12170,16 +12165,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/cult_base/docks_west)
 "svP" = (
-/obj/random/dirt_75,
-/obj/item/binoculars{
-	pixel_y = -7;
-	pixel_x = -5
-	},
-/obj/item/clothing/glasses/thermal{
-	pixel_y = 6;
-	pixel_x = 5
-	},
-/turf/simulated/floor/exoplanet/barren,
+/obj/structure/lattice,
+/turf/space,
 /area/cult_base/asteroid)
 "sxu" = (
 /obj/effect/floor_decal/corner/grey{
@@ -12322,7 +12309,7 @@
 	pixel_x = 3
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "thD" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 6
@@ -12376,7 +12363,7 @@
 "tvK" = (
 /obj/effect/rune/sacrifice,
 /turf/simulated/floor/cult,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "txe" = (
 /obj/effect/floor_decal/industrial/outline_door/red{
 	dir = 8
@@ -12596,7 +12583,7 @@
 	pixel_x = -3
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "uTw" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 9
@@ -12639,7 +12626,7 @@
 /obj/random/dirt_75,
 /obj/random/contraband,
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "vgi" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 6
@@ -12689,7 +12676,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating/asteroid,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "vxY" = (
 /obj/random/dirt_75,
 /obj/random/dirt_75,
@@ -12721,7 +12708,7 @@
 	dir = 4
 	},
 /turf/simulated/mineral/surface,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "vEl" = (
 /obj/effect/floor_decal/industrial/outline/firefighting_closet,
 /obj/structure/closet/firecloset/full,
@@ -12814,7 +12801,7 @@
 	pixel_x = 5
 	},
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "wEh" = (
 /obj/random/dirt_75,
 /obj/structure/machinery/alarm/west{
@@ -12842,7 +12829,7 @@
 /obj/random/dirt_75,
 /obj/effect/floor_decal/industrial/arrow/yellow,
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "wVn" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/curtain/medical,
@@ -12886,7 +12873,7 @@
 /obj/effect/landmark/corpse/cult_base_cultist,
 /obj/effect/decal/cleanable/blood,
 /turf/simulated/floor/exoplanet/barren,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "xon" = (
 /obj/structure/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/floor_decal/industrial/outline/grey,
@@ -13017,7 +13004,7 @@
 	pixel_y = 2
 	},
 /turf/simulated/floor/cult,
-/area/cult_base/asteroid)
+/area/cult_base/asteroid_inside)
 "yhi" = (
 /obj/effect/map_effect/window_spawner/full/shuttle/mercenary{
 	spawn_firedoor = 1;
@@ -44985,11 +44972,11 @@ abJ
 ajO
 abJ
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aWD
 aWD
 aZi
@@ -45241,15 +45228,15 @@ abJ
 abJ
 abJ
 aWD
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -45284,7 +45271,7 @@ aak
 aab
 auo
 aZi
-aCb
+aGQ
 aZi
 aZi
 aZi
@@ -45496,18 +45483,18 @@ aWD
 aWD
 abJ
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -45540,9 +45527,9 @@ azT
 gkU
 aab
 aab
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -45752,20 +45739,20 @@ aZi
 aWD
 abJ
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -45788,7 +45775,7 @@ aWD
 aWD
 abJ
 abJ
-aCb
+aGQ
 abJ
 abJ
 aWD
@@ -45797,10 +45784,10 @@ jXL
 aaw
 aTn
 aab
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 aWD
 aWD
 aZi
@@ -46008,22 +45995,22 @@ aZi
 aZi
 aZi
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -46044,9 +46031,9 @@ abJ
 abJ
 abJ
 abJ
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 abJ
 aWD
 aOD
@@ -46054,9 +46041,9 @@ lye
 gvs
 aQS
 aab
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 abJ
 abJ
 abJ
@@ -46264,25 +46251,25 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -46300,21 +46287,21 @@ abJ
 aWD
 abJ
 ajO
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 abJ
 aOD
 agr
 aax
 aoR
 aab
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 abJ
 abJ
 aWD
@@ -46521,26 +46508,26 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -46555,24 +46542,24 @@ aWD
 aWD
 aWD
 ajO
-aCb
-aCb
-aCb
-aCb
-svP
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+qpW
+aGQ
+aGQ
 abJ
 aab
 aLP
 kty
 aab
 aab
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 abJ
 abJ
 abJ
@@ -46778,27 +46765,27 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aVo
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 abJ
 abJ
 abJ
@@ -46812,26 +46799,26 @@ aWD
 abJ
 ajO
 ajO
-aCb
-aCb
-aCb
-aLb
+aGQ
+aGQ
+aGQ
+vxY
 aRK
-aUg
-aCb
-aCb
+aCv
+aGQ
+aGQ
 akP
 alu
 hxy
 akP
 uQf
-aLb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+vxY
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 abJ
 abJ
 aWD
@@ -47035,44 +47022,44 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aXu
 aKx
 ajX
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 ajO
 atm
 ajO
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 aWD
 abJ
 abJ
-aCb
-aCb
-aCb
-azZ
-aCT
+aGQ
+aGQ
+aGQ
+cKD
+aIZ
 aQa
 aLf
 aQa
@@ -47083,13 +47070,13 @@ iJx
 akP
 att
 aKL
-aUg
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aCv
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 abJ
 abJ
 abJ
@@ -47293,42 +47280,42 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 ahk
 axk
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 jUe
 aVe
 ajX
-aCb
-aCb
+aGQ
+aGQ
 ggN
-aCb
+aGQ
 apX
 apX
 afr
 apX
 apX
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aQa
 aQa
 axj
@@ -47346,8 +47333,8 @@ aUw
 aUw
 aUw
 aUw
-aCb
-aCb
+aGQ
+aGQ
 abJ
 abJ
 abJ
@@ -47550,25 +47537,25 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aCT
 aji
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aNz
 aMS
 aYJ
 azt
 aNz
-aUg
+aCv
 ahD
 wtJ
 apX
@@ -47576,16 +47563,16 @@ aiE
 ahg
 aMZ
 apX
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aOn
 aOn
 aOn
 aOn
 aOn
 aOn
-aCb
+aGQ
 aQa
 atz
 vHz
@@ -47602,14 +47589,14 @@ aWq
 aUw
 auH
 aRe
-aUw
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+alK
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aWD
 aWD
 aWD
@@ -47808,13 +47795,13 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aLb
 hfy
 aBN
@@ -47833,8 +47820,8 @@ uIq
 aay
 ala
 apX
-aCb
-aLb
+aGQ
+vxY
 qKL
 apZ
 aUi
@@ -47842,7 +47829,7 @@ azO
 ase
 avH
 aOn
-aCb
+aGQ
 aQa
 azQ
 aur
@@ -47860,14 +47847,14 @@ aUw
 adX
 alm
 aUw
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aWD
 aWD
 aWD
@@ -48066,13 +48053,13 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aAc
 awF
 aEW
@@ -48084,14 +48071,14 @@ aKK
 aVO
 aQN
 aNz
-aCb
+aGQ
 apX
 apX
 aar
 apX
 apX
 apP
-azZ
+cKD
 asP
 aOn
 aOM
@@ -48099,7 +48086,7 @@ qYr
 anV
 aLe
 aOn
-aCb
+aGQ
 aQa
 aus
 daZ
@@ -48119,12 +48106,12 @@ aPL
 aUw
 aUw
 aUw
-aCb
+aGQ
 alx
 alx
 alx
 alx
-aCb
+aGQ
 aWD
 aWD
 abJ
@@ -48324,14 +48311,14 @@ aZi
 aZi
 aZi
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aol
 adr
 aLQ
@@ -48341,7 +48328,7 @@ aSP
 asG
 aUS
 aol
-aCb
+aGQ
 aFm
 aSI
 oOw
@@ -48376,7 +48363,7 @@ ayL
 aMC
 ajg
 aUw
-aCb
+aGQ
 alx
 ajZ
 aAv
@@ -48581,14 +48568,14 @@ aZi
 aZi
 aZi
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aNz
 aNl
 aCU
@@ -48598,7 +48585,7 @@ aPh
 aVt
 aeM
 aNz
-aCb
+aGQ
 aGK
 akV
 aba
@@ -48633,7 +48620,7 @@ awp
 aMC
 aAT
 aUw
-aCb
+aGQ
 alx
 abh
 aUC
@@ -48838,14 +48825,14 @@ aZi
 aZi
 aZi
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aNz
 amd
 lhE
@@ -48855,7 +48842,7 @@ aXK
 aYb
 aPd
 aNz
-aCb
+aGQ
 aGK
 aJT
 aAI
@@ -48890,7 +48877,7 @@ awV
 arw
 aXR
 aUw
-aCb
+aGQ
 alx
 gDO
 icP
@@ -49096,13 +49083,13 @@ aZi
 aZi
 abJ
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aol
 agx
 aEC
@@ -49112,7 +49099,7 @@ aNR
 aZG
 agi
 aol
-aCb
+aGQ
 apX
 aVE
 agn
@@ -49147,12 +49134,12 @@ aUw
 aUw
 aUw
 aUw
-aCb
+aGQ
 alx
 aCG
 alx
 alx
-aCb
+aGQ
 abJ
 aZi
 aZi
@@ -49353,13 +49340,13 @@ aZi
 aZi
 aZi
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aNz
 aIT
 aiX
@@ -49369,7 +49356,7 @@ aqC
 aNw
 aqt
 aNz
-aCb
+aGQ
 apX
 abc
 aFf
@@ -49402,15 +49389,15 @@ sRK
 cbY
 aDI
 akP
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aZz
 abq
 aRm
 alx
-aCb
-aCb
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -49610,13 +49597,13 @@ aZi
 aZi
 abJ
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aNz
 aNz
 aNz
@@ -49626,7 +49613,7 @@ aNz
 aBh
 aNz
 aNz
-aCb
+aGQ
 apX
 afq
 aKZ
@@ -49659,15 +49646,15 @@ apC
 aOs
 aAS
 akP
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 alx
 aHx
 qkT
 alx
-aCb
-aCb
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -49867,23 +49854,23 @@ aZi
 aZi
 abJ
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aVU
 aMT
 aED
 aVU
-aCb
-aCb
+aGQ
+aGQ
 apX
 apX
 ani
@@ -49917,15 +49904,15 @@ aJu
 aGn
 akP
 aLj
-svP
-aCb
+qpW
+aGQ
 alx
 ast
 ast
 alx
 alx
-aCb
-aCb
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -50123,24 +50110,24 @@ aZi
 aZi
 abJ
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aQp
 fcq
 mdw
 aVU
-aCb
-aCb
+aGQ
+aGQ
 aZv
 aEV
 aeU
@@ -50173,16 +50160,16 @@ abs
 aLk
 akP
 akP
-axk
+amB
 ahD
-awF
+uIA
 aHD
 jat
 afp
 ioo
 alx
-aCb
-aCb
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -50380,25 +50367,25 @@ aZi
 aZi
 abJ
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aVU
 aYT
 aPk
 aVU
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 ahP
 kzX
 afO
@@ -50429,17 +50416,17 @@ ahe
 aha
 aMD
 akP
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 alx
 aFx
 ioo
 aGT
 adR
-aCb
-aCb
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -50636,19 +50623,19 @@ aZi
 aZi
 aZi
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 acA
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aQp
 aMT
 avh
@@ -50695,9 +50682,9 @@ ioo
 ioo
 aHW
 alx
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -50893,19 +50880,19 @@ aZi
 aZi
 aZi
 abJ
-aCb
-aCb
-aCb
-axk
-aCb
-aCv
+aGQ
+aGQ
+aGQ
+amB
+aGQ
+kxQ
 qjx
-aCT
-aCv
-aCb
-aCb
-aCb
-aCb
+aIZ
+kxQ
+aGQ
+aGQ
+aGQ
+aGQ
 aVU
 agl
 aPk
@@ -50952,9 +50939,9 @@ avR
 anH
 alx
 alx
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -51150,16 +51137,16 @@ aZi
 aZi
 aZi
 abJ
-aCb
-aCb
-azZ
+aGQ
+aGQ
+cKD
 hYK
-aCb
-aUe
+aGQ
+alK
 tvK
 ygX
 fow
-aCb
+aGQ
 aVU
 aVU
 aVU
@@ -51208,10 +51195,10 @@ amP
 aqq
 ayM
 alx
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -51406,13 +51393,13 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 abE
-awF
-aRN
+uIA
+agG
 nnM
 aNs
 sqe
@@ -51465,10 +51452,10 @@ atp
 avP
 alx
 alx
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -51664,15 +51651,15 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aUe
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+alK
 xmz
 jBg
-aCb
+aGQ
 fow
 vRw
 qYC
@@ -51721,11 +51708,11 @@ aAr
 aIo
 pnM
 alx
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -51922,15 +51909,15 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCv
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+kxQ
+aGQ
+aGQ
+aGQ
 awb
 awb
 awb
@@ -51978,12 +51965,12 @@ aAr
 aRL
 aJK
 alx
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -52181,13 +52168,13 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aVU
 awb
 aOg
@@ -52439,12 +52426,12 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aVU
 aVU
 aVU
@@ -52696,14 +52683,14 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aVU
 asF
 aNa
@@ -52954,13 +52941,13 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aVU
 aVU
 arn
@@ -53211,14 +53198,14 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aVU
 aos
 aOm
@@ -53468,14 +53455,14 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aUe
-aUe
-aUe
-aUe
-aUe
+aGQ
+aGQ
+aGQ
+alK
+alK
+alK
+alK
+alK
 aVU
 akL
 awt
@@ -53726,9 +53713,9 @@ aZi
 aZi
 akI
 aZi
-aCb
+aGQ
 vEe
-aUe
+alK
 auo
 aNT
 auo
@@ -53737,10 +53724,10 @@ aNn
 fUa
 adc
 aNn
-aZi
-aZi
-akI
-aZi
+svP
+svP
+aRN
+svP
 auo
 aNT
 auo
@@ -53983,21 +53970,21 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aUe
+aGQ
+aGQ
+alK
 auo
-aZi
-aZi
-aZi
+svP
+svP
+svP
 aVU
 pwQ
 tje
 aVU
-aZi
-aZi
-aZi
-aZi
+svP
+svP
+svP
+svP
 auo
 aZi
 aZi
@@ -54036,7 +54023,7 @@ aLZ
 ahr
 ajO
 abJ
-aCb
+aGQ
 aWD
 aWD
 aZi
@@ -54241,8 +54228,8 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aUe
+aGQ
+alK
 auo
 auo
 auo
@@ -54292,8 +54279,8 @@ afc
 aAe
 aAe
 abJ
-aCb
-aCb
+aGQ
+aGQ
 aWD
 aWD
 aZi
@@ -54548,10 +54535,10 @@ adM
 adm
 agK
 aAe
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 aWD
 aZi
 aZi
@@ -54805,10 +54792,10 @@ aoI
 hxQ
 axz
 aAe
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -55062,10 +55049,10 @@ acS
 arE
 aBW
 agS
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -55319,9 +55306,9 @@ atX
 avj
 avV
 aAe
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -55576,9 +55563,9 @@ ats
 aKw
 arz
 agS
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -55833,8 +55820,8 @@ ayc
 aOO
 aVg
 aAe
-aCb
-aCb
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -56090,8 +56077,8 @@ aai
 agS
 aAe
 aAe
-aCb
-aCb
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -56344,11 +56331,11 @@ aqe
 ang
 aai
 aZN
-aCT
+aIZ
 sYg
-aCb
-aCb
-aUe
+aGQ
+aGQ
+alK
 aZi
 aZi
 aZi
@@ -56601,11 +56588,11 @@ amz
 nfJ
 agS
 shy
-aLb
-aCb
-aCb
-aCb
-aUe
+vxY
+aGQ
+aGQ
+aGQ
+alK
 auo
 auo
 auo
@@ -56857,12 +56844,12 @@ aAe
 aIU
 apK
 aAe
-aCT
-aCb
-aCb
-aCb
-aUe
-aUe
+aIZ
+aGQ
+aGQ
+aGQ
+alK
+alK
 auo
 auo
 auo
@@ -57114,10 +57101,10 @@ fHL
 cui
 tOs
 agS
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -57371,9 +57358,9 @@ arC
 aOy
 ahG
 aAe
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -57628,8 +57615,8 @@ aAe
 aAe
 aAe
 aAe
-aCb
-aCb
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -57881,11 +57868,11 @@ aql
 aMi
 ake
 aOJ
-aLb
+vxY
 gVr
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -58139,9 +58126,9 @@ aWA
 aKN
 veH
 aKl
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aWD
 aZi
 aZi
@@ -58374,12 +58361,12 @@ aZi
 aZi
 aZi
 auo
-aZi
-aZi
-aZi
-aZi
-aZi
-aZi
+svP
+svP
+svP
+svP
+svP
+svP
 aKN
 aLg
 viu
@@ -58394,10 +58381,10 @@ aKN
 aMr
 aHH
 aKN
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
 abJ
 aWD
 aZi
@@ -58609,9 +58596,9 @@ asg
 aZi
 aZi
 aZi
-aCb
-aCb
-aUe
+aGQ
+aGQ
+alK
 auo
 auo
 auo
@@ -58631,12 +58618,12 @@ aZi
 aZi
 aZi
 auo
-aZi
-aZi
-aZi
-aZi
-aZi
-asg
+svP
+svP
+svP
+svP
+svP
+lfM
 aKN
 amD
 aeq
@@ -58651,9 +58638,9 @@ aKN
 aKN
 ake
 aKN
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 abJ
 abJ
 aZi
@@ -58865,35 +58852,35 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
-aUe
+aGQ
+aGQ
+aGQ
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
+alK
 aKN
 aKN
 aKN
@@ -58907,10 +58894,10 @@ ajB
 aKN
 aKN
 vsN
-aCT
-aCb
-aCb
-aCb
+aIZ
+aGQ
+aGQ
+aGQ
 abJ
 aZi
 aZi
@@ -59122,34 +59109,34 @@ aZi
 aZi
 aZi
 akI
-aCb
-aCb
+aGQ
+aGQ
 vEe
-aCb
-aCb
+aGQ
+aGQ
 vEe
-aCb
-aCb
+aGQ
+aGQ
 vEe
-aCb
-aCb
+aGQ
+aGQ
 vEe
-aCb
-aCb
+aGQ
+aGQ
 vEe
-aCb
-aCb
+aGQ
+aGQ
 vEe
-aCb
-aCb
+aGQ
+aGQ
 vEe
-aCb
-aCb
+aGQ
+aGQ
 vEe
-aCb
-aCb
+aGQ
+aGQ
 vEe
-aCb
+aGQ
 aNe
 wQh
 ake
@@ -59164,9 +59151,9 @@ lKH
 amM
 ake
 aOJ
-aLb
-aCb
-aCb
+vxY
+aGQ
+aGQ
 aWD
 abJ
 abJ
@@ -59378,36 +59365,36 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aLb
-axk
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+vxY
+amB
 asP
 aKN
 asZ
@@ -59421,8 +59408,8 @@ rKT
 ajt
 aKN
 itP
-aCb
-aCb
+aGQ
+aGQ
 aWD
 abJ
 ajO
@@ -59635,37 +59622,37 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 qut
 llr
-aCb
-awF
+aGQ
+uIA
 ake
 aic
 aNS
@@ -59677,9 +59664,9 @@ aKN
 avs
 aTT
 aKN
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 abJ
 ajO
 abJ
@@ -59893,36 +59880,36 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aKN
 aSv
 aBn
@@ -59934,8 +59921,8 @@ aKN
 aKN
 aKN
 aKN
-aCb
-aCb
+aGQ
+aGQ
 abJ
 abJ
 abJ
@@ -60150,36 +60137,36 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aKN
 aKN
 aKN
@@ -60188,10 +60175,10 @@ aKN
 ake
 aKN
 aKN
-aCb
+aGQ
 abJ
 abJ
-aCb
+aGQ
 aWD
 ajO
 aWD
@@ -60407,45 +60394,45 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aWD
 abJ
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 qCP
 aKB
-lfM
-aCb
-aCb
-aCb
+onh
+aGQ
+aGQ
+aGQ
 aWD
 aWD
 aWD
@@ -60665,27 +60652,27 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aWD
 abJ
 abJ
@@ -60693,16 +60680,16 @@ abJ
 abJ
 abJ
 aWD
-aCb
-aCb
-aCb
-aCb
-aCb
-aLb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+vxY
 afY
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
 aWD
 aWD
 aZi
@@ -60924,20 +60911,20 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -60950,15 +60937,15 @@ abJ
 abJ
 aWD
 abJ
-aCb
-aCb
-aCb
-aCb
-aCb
-aCT
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aIZ
+aGQ
+aGQ
+aGQ
 aWD
 aWD
 aZi
@@ -61183,15 +61170,15 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -61208,13 +61195,13 @@ abJ
 abJ
 abJ
 aWD
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -61441,12 +61428,12 @@ aZi
 aZi
 aZi
 aZi
-aCb
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -61466,11 +61453,11 @@ aWD
 abJ
 ajO
 aWD
-aCb
-aCb
-aCb
-aCb
-aCb
+aGQ
+aGQ
+aGQ
+aGQ
+aGQ
 aZi
 aZi
 aZi
@@ -61724,8 +61711,8 @@ aWD
 aWD
 aWD
 aWD
-aCb
-aCb
+aGQ
+aGQ
 aZi
 aZi
 aZi
diff --git a/maps/away/away_site/cult_base/cult_base_areas.dm b/maps/away/away_site/cult_base/cult_base_areas.dm
index 9861a35c87c..59bd4538dc5 100644
--- a/maps/away/away_site/cult_base/cult_base_areas.dm
+++ b/maps/away/away_site/cult_base/cult_base_areas.dm
@@ -107,10 +107,13 @@
 /area/cult_base/asteroid
 	name = "Asteroid"
 	icon_state = "exterior"
+	needs_starlight = TRUE
+	has_gravity = FALSE
+	requires_power = FALSE
 
 /area/cult_base/asteroid_inside
 	name = "Asteroid"
-	icon_state = "exterior"
+	icon_state = "purple"
 
 // ---- shuttle
 
diff --git a/maps/away/away_site/hivebot_hub/hivebot_hub.dm b/maps/away/away_site/hivebot_hub/hivebot_hub.dm
index 18fd65c21ce..8fc78d46722 100644
--- a/maps/away/away_site/hivebot_hub/hivebot_hub.dm
+++ b/maps/away/away_site/hivebot_hub/hivebot_hub.dm
@@ -84,6 +84,7 @@
 
 /area/hivebothub/exterior
 	name = "Independent Supply Hub - Exterior"
+	needs_starlight = TRUE
 	icon_state = "exterior"
 
 // Docks
diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_areas.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_areas.dm
index ebde8bc149c..fbe37830d71 100644
--- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_areas.dm
+++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_areas.dm
@@ -121,6 +121,7 @@
 	name = "Republic Astroforce Patrol Vessel - Exterior"
 	requires_power = FALSE
 	icon_state = "exterior"
+	needs_starlight = TRUE
 	has_gravity = FALSE
 
 // Shuttle area.
diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dm b/maps/away/ships/coc/coc_ranger/coc_ship.dm
index 4c04915a7de..82acf158287 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship.dm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship.dm
@@ -32,6 +32,13 @@
 	name = "Ranger Gunboat"
 	requires_power = TRUE
 
+/area/ship/ranger_corvette/exterior
+	name = "Ranger Gunboat Exterior"
+	requires_power = FALSE
+	has_gravity = FALSE
+	icon_state = "exterior"
+	needs_starlight = TRUE
+
 /area/ship/ranger_corvette/bridge
 	name = "Ranger Gunboat Bridge"
 
diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
index da8bd329e5f..2d5bee82ae7 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
@@ -245,8 +245,8 @@
 "aXi" = (
 /obj/structure/lattice/catwalk,
 /obj/item/hullbeacon/red,
-/turf/template_noop,
-/area/ship/ranger_corvette/engine1)
+/turf/space,
+/area/ship/ranger_corvette/exterior)
 "aXC" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/universal{
 	dir = 4
@@ -1104,6 +1104,11 @@
 	},
 /turf/simulated/floor/plating,
 /area/ship/ranger_corvette/foyer)
+"eAe" = (
+/obj/structure/ship_weapon_dummy,
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/ship/ranger_corvette/gunnery)
 "eBG" = (
 /obj/structure/bed/stool/chair/shuttle{
 	dir = 8
@@ -2059,7 +2064,7 @@
 /area/ship/ranger_corvette/foyer)
 "hUh" = (
 /obj/structure/ship_weapon_dummy,
-/turf/template_noop,
+/turf/simulated/floor/airless,
 /area/ship/ranger_corvette/engine1)
 "hUx" = (
 /obj/effect/landmark/entry_point/port{
@@ -2272,6 +2277,10 @@
 "iOe" = (
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/engine1)
+"iOV" = (
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/ship/ranger_corvette/engine1)
 "iPn" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
@@ -2568,6 +2577,11 @@
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/leader)
+"jQr" = (
+/obj/structure/lattice/catwalk,
+/obj/item/hullbeacon/red,
+/turf/space,
+/area/ship/ranger_corvette/engine1)
 "jRF" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/aux{
 	dir = 4
@@ -2828,9 +2842,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/foyer)
 "lhJ" = (
-/obj/structure/ship_weapon_dummy,
-/turf/template_noop,
-/area/space)
+/obj/structure/lattice/catwalk,
+/obj/structure/ship_weapon_dummy/barrel,
+/turf/space,
+/area/ship/ranger_corvette/gunnery)
 "lkY" = (
 /obj/structure/machinery/airlock_sensor{
 	pixel_x = -20;
@@ -3188,6 +3203,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/foyer)
+"mrW" = (
+/obj/structure/ship_weapon_dummy,
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/ship/ranger_corvette/engine1)
 "mun" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -4092,8 +4112,8 @@
 /area/ship/ranger_corvette/telecomms)
 "pZW" = (
 /obj/structure/lattice/catwalk,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ranger_corvette/exterior)
 "qbp" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/structure/machinery/door/blast/regular/open{
@@ -4104,8 +4124,9 @@
 /area/ship/ranger_corvette/foyer)
 "qbD" = (
 /obj/structure/ship_weapon_dummy/barrel,
-/turf/template_noop,
-/area/space)
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/ship/ranger_corvette/engine1)
 "qcF" = (
 /obj/structure/machinery/power/smes/buildable/third_party_shuttle,
 /obj/structure/cable/green,
@@ -4340,7 +4361,7 @@
 /obj/structure/machinery/ship_weapon/autocannon{
 	weapon_id = "Ranger Francisca Rotary Gun"
 	},
-/turf/template_noop,
+/turf/space,
 /area/ship/ranger_corvette/engine1)
 "qMt" = (
 /obj/effect/map_effect/map_helper/ruler_tiles_3{
@@ -4980,8 +5001,9 @@
 /obj/structure/ship_weapon_dummy{
 	is_barrel = 1
 	},
-/turf/template_noop,
-/area/space)
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/ship/ranger_corvette/gunnery)
 "sYH" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -5460,7 +5482,7 @@
 /obj/structure/railing/mapped,
 /obj/structure/machinery/iff_beacon,
 /turf/simulated/floor/airless,
-/area/ship/ranger_corvette)
+/area/ship/ranger_corvette/exterior)
 "udj" = (
 /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -5602,10 +5624,6 @@
 /obj/structure/machinery/vending/sovietsoda,
 /turf/simulated/floor/tiled/dark,
 /area/ship/ranger_corvette/engine1)
-"usZ" = (
-/obj/structure/lattice/catwalk,
-/turf/template_noop,
-/area/ship/ranger_corvette/engine1)
 "uty" = (
 /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -6180,7 +6198,7 @@
 	},
 /obj/structure/machinery/shipsensors/weak,
 /turf/simulated/floor/airless,
-/area/ship/ranger_corvette)
+/area/ship/ranger_corvette/exterior)
 "wmN" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -37125,7 +37143,7 @@ tWh
 tWh
 tWh
 tWh
-pZW
+iOV
 xRX
 xRX
 xRX
@@ -37382,7 +37400,7 @@ tWh
 hUh
 hUh
 hUh
-usZ
+iOV
 qHO
 xRX
 xRX
@@ -37639,7 +37657,7 @@ tWh
 hUh
 hUh
 hUh
-hUh
+mrW
 qbD
 xRX
 xRX
@@ -37896,8 +37914,8 @@ tWh
 hUh
 hUh
 hUh
-usZ
-aXi
+iOV
+jQr
 xRX
 rrQ
 rrQ
@@ -38153,7 +38171,7 @@ tWh
 boM
 tWh
 tWh
-usZ
+iOV
 xRX
 xRX
 rrQ
@@ -38168,7 +38186,7 @@ pFK
 tLA
 nIu
 nIu
-lhJ
+eAe
 lhJ
 xRX
 xRX
@@ -38682,7 +38700,7 @@ hbk
 deS
 deS
 hPo
-lhJ
+eAe
 lhJ
 xRX
 xRX
@@ -38939,8 +38957,8 @@ jrY
 enD
 lfi
 rKi
-xRX
-xRX
+pZW
+aXi
 xRX
 xRX
 xRX
@@ -39196,8 +39214,8 @@ qyq
 dcS
 cmI
 tLA
-xRX
-xRX
+pZW
+pZW
 xRX
 xRX
 xRX
diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm
index 079f4480ced..79fd690707b 100644
--- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm
+++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm
@@ -128,8 +128,8 @@
 /area/ship/ipc_refugee/dock)
 "bq" = (
 /obj/item/stack/rods,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "bs" = (
 /obj/structure/machinery/light/small/emergency{
 	dir = 8
@@ -260,7 +260,7 @@
 /obj/item/stack/rods,
 /obj/structure/window_frame/empty,
 /turf/simulated/floor/airless,
-/area/ship/ipc_refugee/forehall)
+/area/ship/ipc_refugee/exterior)
 "cw" = (
 /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -287,12 +287,12 @@
 /turf/simulated/floor,
 /area/ship/ipc_refugee/engie)
 "cL" = (
-/obj/structure/lattice,
 /obj/item/material/shard{
 	icon_state = "small"
 	},
-/turf/template_noop,
-/area/space)
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "cN" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1290,6 +1290,11 @@
 /obj/structure/inflatable/wall,
 /turf/simulated/floor/airless,
 /area/ship/ipc_refugee/engie)
+"kG" = (
+/obj/structure/grille,
+/obj/structure/lattice,
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "kK" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/industrial/warning{
@@ -1327,7 +1332,7 @@
 	name = "fore, messhall"
 	},
 /turf/space,
-/area/ship/ipc_refugee/forehall)
+/area/ship/ipc_refugee/exterior)
 "kS" = (
 /obj/structure/closet/crate,
 /obj/item/stack/material/steel{
@@ -1371,10 +1376,10 @@
 /turf/simulated/floor/tiled/rust,
 /area/ship/ipc_refugee/atmos)
 "lh" = (
-/obj/structure/lattice,
 /obj/item/material/shard/shrapnel,
-/turf/template_noop,
-/area/space)
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "lm" = (
 /obj/structure/table/steel,
 /obj/effect/floor_decal/corner_wide/brown/full,
@@ -1741,8 +1746,8 @@
 "nZ" = (
 /obj/structure/lattice,
 /obj/structure/grille,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "ob" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -2261,7 +2266,7 @@
 /obj/effect/decal/cleanable/floor_damage/broken2,
 /obj/effect/decal/cleanable/floor_damage/broken3,
 /turf/simulated/floor/airless,
-/area/ship/ipc_refugee/forehall)
+/area/ship/ipc_refugee/exterior)
 "rh" = (
 /obj/effect/decal/remains/robot{
 	pixel_y = -8;
@@ -2407,6 +2412,9 @@
 	},
 /turf/simulated/floor,
 /area/ship/ipc_refugee/cargopod_a)
+"sy" = (
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "sA" = (
 /obj/structure/lattice/catwalk/indoor/grate/old,
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -2515,8 +2523,8 @@
 "tl" = (
 /obj/structure/lattice/catwalk,
 /obj/item/stack/rods,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "ts" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2786,7 +2794,7 @@
 /obj/effect/decal/cleanable/floor_damage/broken6,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/airless,
-/area/ship/ipc_refugee/forehall)
+/area/ship/ipc_refugee/exterior)
 "vr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/floor_damage/broken7,
@@ -3318,8 +3326,8 @@
 /obj/structure/grille/broken,
 /obj/structure/lattice,
 /obj/item/material/shard/shrapnel,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "yJ" = (
 /turf/simulated/wall/shuttle/space_ship/mercenary,
 /area/shuttle/ipc_refugee_shuttle)
@@ -3863,8 +3871,8 @@
 /area/ship/ipc_refugee/atmos)
 "CJ" = (
 /obj/structure/grille,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "CK" = (
 /obj/structure/girder,
 /turf/simulated/floor/airless,
@@ -3996,8 +4004,8 @@
 "Ds" = (
 /obj/item/material/shard,
 /obj/structure/lattice,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "Du" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/machinery/atmospherics/unary/vent_pump/high_volume,
@@ -4268,8 +4276,8 @@
 /area/ship/ipc_refugee/bridge)
 "FC" = (
 /obj/structure/lattice,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "FD" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -4297,7 +4305,7 @@
 "FQ" = (
 /obj/structure/grille/broken,
 /obj/structure/lattice,
-/turf/template_noop,
+/turf/space,
 /area/space)
 "FR" = (
 /obj/structure/cable/green{
@@ -4483,10 +4491,10 @@
 /turf/simulated/floor/tiled,
 /area/ship/ipc_refugee/atmos)
 "HD" = (
-/obj/structure/lattice,
 /obj/item/stack/rods,
-/turf/template_noop,
-/area/space)
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "HO" = (
 /obj/effect/floor_decal/industrial/loading/yellow,
 /obj/effect/floor_decal/industrial/warning{
@@ -4594,6 +4602,10 @@
 /obj/structure/inflatable/wall,
 /turf/simulated/floor/airless,
 /area/ship/ipc_refugee/forehall)
+"IJ" = (
+/obj/structure/lattice,
+/turf/space,
+/area/space)
 "IK" = (
 /obj/structure/girder,
 /obj/item/ore{
@@ -4680,6 +4692,10 @@
 /obj/effect/decal/cleanable/blood/drip/oil,
 /turf/simulated/floor/tiled/rust,
 /area/ship/ipc_refugee/mainhall)
+"Jq" = (
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space)
 "Jt" = (
 /obj/effect/floor_decal/corner/green/full{
 	dir = 1
@@ -4848,8 +4864,8 @@
 "Kr" = (
 /obj/structure/lattice/catwalk,
 /obj/item/hullbeacon/red,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "Ks" = (
 /obj/structure/machinery/access_button{
 	dir = 1;
@@ -4911,6 +4927,11 @@
 	},
 /turf/simulated/floor,
 /area/ship/ipc_refugee/cargopod_b)
+"Lw" = (
+/obj/structure/lattice/catwalk,
+/obj/item/hullbeacon/red,
+/turf/space,
+/area/space)
 "LD" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/structure/machinery/door/airlock/external{
@@ -5078,8 +5099,8 @@
 /area/ship/ipc_refugee/bridge)
 "MA" = (
 /obj/structure/lattice/catwalk,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "MC" = (
 /obj/structure/girder,
 /obj/item/stack/material/steel{
@@ -5695,7 +5716,7 @@
 "SK" = (
 /obj/structure/grille,
 /obj/structure/lattice,
-/turf/template_noop,
+/turf/space,
 /area/space)
 "SM" = (
 /obj/effect/floor_decal/corner_wide/green{
@@ -5781,8 +5802,8 @@
 /area/ship/ipc_refugee/engie)
 "Tn" = (
 /obj/item/material/shard,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/ipc_refugee/exterior)
 "To" = (
 /obj/structure/table/standard,
 /obj/structure/machinery/light/small/emergency{
@@ -6116,7 +6137,6 @@
 	dir = 4;
 	name = "Washroom";
 	welded = 1;
-	icon_state = "door_locked";
 	locked = 1
 	},
 /obj/structure/machinery/door/firedoor/noid,
@@ -37021,7 +37041,7 @@ Ik
 Ik
 Ik
 SK
-FC
+IJ
 SK
 Ns
 Du
@@ -37029,7 +37049,7 @@ Np
 Sz
 Ns
 SK
-FC
+IJ
 SK
 Ik
 Ik
@@ -38044,7 +38064,7 @@ ya
 nc
 ky
 nS
-FC
+MA
 Ns
 QK
 Zf
@@ -38062,9 +38082,9 @@ PJ
 TR
 xW
 Ns
-FC
-FC
-FC
+MA
+MA
+MA
 BV
 CK
 BV
@@ -38328,7 +38348,7 @@ JZ
 Xb
 Yu
 tY
-Sg
+FC
 Ik
 Ik
 Ik
@@ -38558,7 +38578,7 @@ Zq
 dB
 qF
 nS
-FC
+MA
 Og
 xS
 fn
@@ -38577,7 +38597,7 @@ fk
 WM
 Og
 lh
-FC
+MA
 HD
 BV
 tw
@@ -38585,7 +38605,7 @@ Rl
 tL
 hl
 kO
-TN
+sy
 Ik
 Ik
 Ik
@@ -39583,7 +39603,7 @@ uv
 Vx
 Yl
 nS
-MA
+Jq
 Ik
 Ik
 Ik
@@ -39840,26 +39860,26 @@ fS
 nS
 nS
 nS
-Kr
+Lw
 Ik
 Ik
 Ik
 Ik
+MA
+sy
+kG
 FC
-Ik
-SK
-FC
-SK
+kG
 Ns
 kX
 cN
 Cp
 Ns
-SK
+kG
 FC
-SK
+kG
 Tn
-FC
+MA
 Ik
 Ik
 vO
@@ -40097,25 +40117,25 @@ Wn
 ei
 Yw
 xV
+Jq
+Ik
+Ik
+Ik
+Ik
 MA
-Ik
-Ik
-Ik
-Ik
+sy
+sy
 FC
-Ik
-Ik
-FC
-Ik
+sy
 Ns
 Ns
 Yx
 Ns
 Ns
-Ik
+sy
 FC
-Ik
-Ik
+sy
+sy
 cL
 Ik
 Ik
@@ -41644,21 +41664,21 @@ Ik
 Ik
 Ik
 Ik
-FC
-Ik
-Ik
+MA
+sy
+sy
 Ds
-Ik
+sy
 fC
 fC
 rX
 fC
 fC
-Ik
-FC
-Ik
-Ik
+sy
 FC
+sy
+sy
+MA
 Ik
 Ik
 Rs
@@ -41901,9 +41921,9 @@ Ik
 Ik
 Ik
 Ik
-FC
+MA
 bq
-SK
+kG
 FC
 nZ
 fC
@@ -41913,9 +41933,9 @@ Hd
 fC
 nZ
 FC
-SK
-Ik
-FC
+kG
+sy
+MA
 Ik
 Ik
 Rs
@@ -43184,7 +43204,7 @@ jP
 JJ
 EK
 JJ
-FC
+MA
 iq
 IQ
 Qf
@@ -43202,9 +43222,9 @@ kN
 Re
 Dc
 iq
-FC
-FC
-FC
+MA
+MA
+MA
 BV
 YS
 ud
@@ -43698,7 +43718,7 @@ JJ
 EK
 EK
 JJ
-FC
+MA
 fC
 gS
 wC
@@ -43716,9 +43736,9 @@ uN
 uN
 nA
 fC
-FC
-FC
-FC
+MA
+MA
+MA
 mI
 Xh
 nt
@@ -44730,16 +44750,16 @@ Ik
 Ik
 Ik
 Ik
-SK
+kG
 FC
-SK
+kG
 fC
 fb
 pK
 Vf
 fC
 SK
-FC
+IJ
 FQ
 Ik
 Ik
diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_areas.dm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_areas.dm
index f421355dc84..f57b95588b9 100644
--- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_areas.dm
+++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_areas.dm
@@ -5,6 +5,13 @@
 	base_turf = /turf/space
 	area_flags = AREA_FLAG_RAD_SHIELDED
 
+/area/ship/ipc_refugee/exterior
+	name = "Decrepit Freighter - Exterior"
+	icon_state = "exterior"
+	needs_starlight = TRUE
+	has_gravity = FALSE
+	requires_power = FALSE
+
 /area/ship/ipc_refugee/engie
 	name = "Decrepit Freighter - Engineering"
 	ambience = AMBIENCE_FOREBODING
diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
index 27cb4696268..2fb8e797dcf 100644
--- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
+++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
@@ -371,7 +371,7 @@
 	},
 /obj/item/hullbeacon/red,
 /turf/simulated/floor/airless,
-/area/ship/kasf_corvette/engie)
+/area/ship/kasf_corvette/exterior)
 "cq" = (
 /obj/structure/table/rack,
 /obj/item/ship_ammunition/francisca/frag,
@@ -909,7 +909,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/airless,
-/area/space)
+/area/ship/kasf_corvette/exterior)
 "fD" = (
 /obj/structure/machinery/atmospherics/unary/vent_pump/on,
 /obj/effect/floor_decal/corner/orange{
@@ -1371,13 +1371,6 @@
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/ship/kasf_corvette/mainhall)
-"ih" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/railing/mapped{
-	dir = 8
-	},
-/turf/simulated/floor/airless,
-/area/ship/kasf_corvette/engie)
 "ij" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -1675,12 +1668,12 @@
 /turf/simulated/wall/shuttle/space_ship/mercenary,
 /area/ship/kasf_corvette/atmos)
 "kg" = (
-/obj/structure/lattice,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/template_noop,
-/area/space)
+/obj/structure/lattice/catwalk/indoor,
+/turf/space,
+/area/ship/kasf_corvette/exterior)
 "kr" = (
 /obj/effect/floor_decal/corner_wide/dark_blue{
 	dir = 5
@@ -2669,7 +2662,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/airless,
-/area/ship/kasf_corvette/atmos)
+/area/ship/kasf_corvette/exterior)
 "qf" = (
 /obj/effect/map_effect/marker/airlock/external{
 	master_tag = "airlock_kasf_port";
@@ -3514,11 +3507,8 @@
 /area/shuttle/kasf_shuttle)
 "uE" = (
 /obj/structure/lattice/catwalk,
-/obj/structure/railing/mapped{
-	dir = 4
-	},
-/turf/simulated/floor/airless,
-/area/space)
+/turf/space,
+/area/ship/kasf_corvette/exterior)
 "uH" = (
 /obj/structure/machinery/door/firedoor/noid,
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3610,7 +3600,7 @@
 	pixel_y = 4
 	},
 /turf/simulated/floor/airless,
-/area/ship/kasf_corvette/atmos)
+/area/ship/kasf_corvette/exterior)
 "vg" = (
 /obj/effect/floor_decal/corner_wide/dark_blue{
 	dir = 5
@@ -3999,7 +3989,7 @@
 	},
 /obj/item/hullbeacon/red,
 /turf/simulated/floor/airless,
-/area/ship/kasf_corvette/atmos)
+/area/ship/kasf_corvette/exterior)
 "xR" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
@@ -5160,7 +5150,7 @@
 "DH" = (
 /obj/structure/lattice/catwalk,
 /turf/simulated/floor/airless,
-/area/space)
+/area/ship/kasf_corvette/exterior)
 "DI" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/full,
@@ -5681,7 +5671,7 @@
 	pixel_y = 4
 	},
 /turf/simulated/floor/airless,
-/area/ship/kasf_corvette/engie)
+/area/ship/kasf_corvette/exterior)
 "FZ" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/cable{
@@ -5701,7 +5691,7 @@
 /obj/structure/lattice/catwalk,
 /obj/item/hullbeacon/red,
 /turf/simulated/floor/airless,
-/area/space)
+/area/ship/kasf_corvette/exterior)
 "Gl" = (
 /obj/structure/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -5963,12 +5953,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/kasf_corvette/starboardthrust)
 "HJ" = (
-/obj/structure/lattice,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/template_noop,
-/area/space)
+/obj/structure/lattice/catwalk/indoor,
+/turf/space,
+/area/ship/kasf_corvette/exterior)
 "HV" = (
 /obj/structure/table/standard,
 /obj/structure/machinery/light,
@@ -7153,8 +7143,8 @@
 /area/ship/kasf_corvette/engie)
 "OL" = (
 /obj/structure/lattice,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/kasf_corvette/exterior)
 "OM" = (
 /obj/effect/floor_decal/spline/plain/white{
 	dir = 9
@@ -7993,8 +7983,8 @@
 /area/ship/kasf_corvette/mainhall)
 "Tb" = (
 /obj/structure/grille,
-/turf/template_noop,
-/area/space)
+/turf/space,
+/area/ship/kasf_corvette/exterior)
 "Tg" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal{
@@ -39358,8 +39348,8 @@ DN
 DN
 DN
 DN
-OL
-OL
+fB
+DH
 fB
 fB
 zJ
@@ -39848,7 +39838,7 @@ Is
 Is
 Is
 Is
-OL
+uE
 zH
 Yy
 gP
@@ -40105,7 +40095,7 @@ Is
 Is
 Is
 Is
-OL
+uE
 KO
 iZ
 rQ
@@ -40401,8 +40391,8 @@ zJ
 zJ
 zJ
 zJ
-ih
-ih
+fB
+fB
 cn
 FY
 Is
@@ -42165,7 +42155,7 @@ Is
 Is
 Is
 Is
-OL
+uE
 qY
 Gq
 rP
@@ -42422,7 +42412,7 @@ Is
 Is
 Is
 Is
-OL
+uE
 Ok
 xn
 OS
@@ -42679,7 +42669,7 @@ Is
 Is
 Is
 Is
-OL
+uE
 qY
 Ed
 rP
@@ -44731,7 +44721,7 @@ Is
 Is
 Is
 Is
-OL
+uE
 QQ
 by
 ze
@@ -44988,7 +44978,7 @@ Is
 Is
 Is
 Is
-OL
+uE
 kW
 jx
 Av
@@ -45526,10 +45516,10 @@ uI
 uI
 uI
 uI
-OL
-OL
-uE
-uE
+qd
+DH
+qd
+qd
 ns
 ns
 Ey
diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship_areas.dm b/maps/away/ships/konyang/kasf_ship/kasf_ship_areas.dm
index 41fae20bc44..fe58e36b215 100644
--- a/maps/away/ships/konyang/kasf_ship/kasf_ship_areas.dm
+++ b/maps/away/ships/konyang/kasf_ship/kasf_ship_areas.dm
@@ -5,6 +5,13 @@
 	base_turf = /turf/space
 	area_flags = AREA_FLAG_RAD_SHIELDED
 
+/area/ship/kasf_corvette/exterior
+	name = "KASF Corvette - Exterior"
+	icon_state = "exterior"
+	needs_starlight = TRUE
+	has_gravity = FALSE
+	requires_power = FALSE
+
 /area/ship/kasf_corvette/portthrust
 	name = "KASF Corvette - Port Thruster Pod"
 	ambience = AMBIENCE_ATMOS
diff --git a/maps/away/ships/sadar_scout/sadar_scout.dmm b/maps/away/ships/sadar_scout/sadar_scout.dmm
index 97bfa1db433..56b1117cd3f 100644
--- a/maps/away/ships/sadar_scout/sadar_scout.dmm
+++ b/maps/away/ships/sadar_scout/sadar_scout.dmm
@@ -461,13 +461,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/ship/sadar_scout/hydro)
 "cK" = (
-/obj/structure/machinery/biogenerator{
-	icon_state = "biogen-empty"
-	},
 /obj/structure/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/outline/service,
+/obj/structure/machinery/biogenerator,
 /turf/simulated/floor/tiled/dark,
 /area/ship/sadar_scout/hydro)
 "cM" = (
diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm
index ac7b9a52a39..ec4138d423a 100644
--- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm
+++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm
@@ -1451,7 +1451,7 @@
 "jY" = (
 /obj/structure/lattice/catwalk,
 /turf/space,
-/area/space)
+/area/ship/tirakqi_smuggler/exterior)
 "jZ" = (
 /obj/structure/machinery/door/airlock/external{
 	dir = 4
@@ -1481,6 +1481,11 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/shuttle/tirakqi_smuggler_shuttle)
+"kd" = (
+/obj/item/hullbeacon/red,
+/obj/structure/lattice,
+/turf/simulated/floor/airless,
+/area/ship/tirakqi_smuggler/exterior)
 "kh" = (
 /turf/simulated/wall/shuttle/space_ship{
 	color = "#695391"
@@ -2748,7 +2753,7 @@
 "rJ" = (
 /obj/structure/lattice/catwalk,
 /turf/simulated/floor/airless,
-/area/ship/tirakqi_smuggler/engi)
+/area/ship/tirakqi_smuggler/exterior)
 "rK" = (
 /mob/living/simple_animal/cosmozoan{
 	name = "Qu'qip";
@@ -6146,7 +6151,7 @@
 /obj/structure/lattice/catwalk,
 /obj/structure/railing/mapped,
 /turf/simulated/floor/airless,
-/area/space)
+/area/ship/tirakqi_smuggler/exterior)
 "LG" = (
 /obj/effect/floor_decal/industrial/outline/red,
 /obj/effect/decal/cleanable/dirt,
@@ -8278,7 +8283,7 @@
 "Zw" = (
 /obj/structure/lattice,
 /turf/space,
-/area/space)
+/area/ship/tirakqi_smuggler/exterior)
 "Zx" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/machinery/atmospherics/unary/vent_pump/on,
@@ -35200,7 +35205,7 @@ sY
 sY
 sY
 sY
-Dp
+jY
 ZW
 ZW
 ZW
@@ -37255,7 +37260,7 @@ sY
 sY
 sY
 sY
-Dp
+jY
 JB
 JC
 IH
@@ -38040,7 +38045,7 @@ fN
 mr
 nd
 nd
-Dp
+jY
 sY
 sY
 sY
@@ -38297,8 +38302,8 @@ ab
 NV
 MR
 nd
-Cx
-Dp
+kd
+jY
 sY
 sY
 sY
@@ -38555,7 +38560,7 @@ XD
 Yf
 nd
 nd
-Dp
+jY
 sY
 sY
 sY
@@ -39809,12 +39814,12 @@ sY
 sY
 sY
 sY
-Cx
+kd
 oL
 bJ
 eq
 oL
-Cx
+kd
 MU
 MU
 VH
@@ -42893,12 +42898,12 @@ sY
 sY
 sY
 sY
-Cx
+kd
 Zw
 jY
 jY
 Zw
-Cx
+kd
 MU
 MU
 fe
@@ -44209,7 +44214,7 @@ mC
 yD
 nd
 nd
-Dp
+jY
 sY
 sY
 sY
@@ -44465,8 +44470,8 @@ mJ
 NV
 Rj
 nd
-Cx
-Dp
+kd
+jY
 sY
 sY
 sY
@@ -44722,7 +44727,7 @@ xj
 mr
 nd
 nd
-Dp
+jY
 sY
 sY
 sY
@@ -45479,7 +45484,7 @@ sY
 sY
 sY
 sY
-Dp
+jY
 rJ
 Dy
 OS
@@ -47536,7 +47541,7 @@ sY
 sY
 sY
 sY
-Dp
+jY
 dH
 dH
 dH
diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler_areas.dm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler_areas.dm
index 2fe1e8e4373..c5b14d52845 100644
--- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler_areas.dm
+++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler_areas.dm
@@ -5,6 +5,13 @@
 	base_turf = /turf/space
 	area_flags = AREA_FLAG_RAD_SHIELDED
 
+/area/ship/tirakqi_smuggler/exterior
+	name = "Ti'Rakqi Freighter - Exterior"
+	icon_state = "exterior"
+	needs_starlight = TRUE
+	has_gravity = FALSE
+	requires_power = FALSE
+
 /area/ship/tirakqi_smuggler/engi
 	name = "Ti'Rakqi Freighter - Engineering"
 	ambience = AMBIENCE_ENGINEERING
diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dmm b/maps/away/ships/tramp_freighter/tramp_freighter.dmm
index 67cf5d94d1a..4c8f5d31e18 100644
--- a/maps/away/ships/tramp_freighter/tramp_freighter.dmm
+++ b/maps/away/ships/tramp_freighter/tramp_freighter.dmm
@@ -3243,7 +3243,7 @@
 	dir = 8
 	},
 /turf/space/dynamic,
-/area/tramp_freighter/bridge)
+/area/tramp_freighter/exterior)
 "ra" = (
 /obj/structure/machinery/atmospherics/binary/pump/high_power{
 	dir = 8;
@@ -5460,7 +5460,7 @@
 /obj/structure/lattice/catwalk,
 /obj/structure/railing/mapped,
 /turf/space/dynamic,
-/area/space)
+/area/tramp_freighter/exterior)
 "AM" = (
 /obj/structure/cable/green{
 	icon_state = "0-2"
@@ -5486,7 +5486,7 @@
 "AN" = (
 /obj/structure/lattice/catwalk,
 /turf/space/dynamic,
-/area/tramp_freighter/bridge)
+/area/tramp_freighter/exterior)
 "AV" = (
 /obj/structure/machinery/door/airlock/external,
 /obj/effect/floor_decal/industrial/hatch/red,
@@ -5801,7 +5801,7 @@
 	},
 /obj/structure/railing/mapped,
 /turf/space/dynamic,
-/area/space)
+/area/tramp_freighter/exterior)
 "Dr" = (
 /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -6787,7 +6787,7 @@
 	},
 /obj/structure/railing/mapped,
 /turf/space/dynamic,
-/area/space)
+/area/tramp_freighter/exterior)
 "Jn" = (
 /turf/simulated/floor/carpet/brown,
 /area/tramp_freighter/captain_bed)
@@ -7112,10 +7112,6 @@
 	},
 /turf/simulated/wall/shuttle/space_ship,
 /area/tramp_freighter/crew_quarters)
-"Lo" = (
-/obj/structure/lattice/catwalk,
-/turf/space/dynamic,
-/area/space)
 "Lp" = (
 /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -7633,7 +7629,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/tramp_freighter/bridge)
+/area/tramp_freighter/exterior)
 "NK" = (
 /obj/structure/table/stone/marble,
 /obj/item/trash/tray,
@@ -8580,7 +8576,7 @@
 	pixel_x = -2
 	},
 /turf/space/dynamic,
-/area/space)
+/area/tramp_freighter/exterior)
 "Sp" = (
 /obj/structure/machinery/door/airlock/external,
 /obj/structure/machinery/atmospherics/pipe/simple/hidden,
@@ -9267,7 +9263,7 @@
 	pixel_x = 2
 	},
 /turf/space/dynamic,
-/area/space)
+/area/tramp_freighter/exterior)
 "VQ" = (
 /obj/structure/machinery/light/small{
 	dir = 8;
@@ -39738,7 +39734,7 @@ jU
 xz
 Sn
 Sn
-Lo
+AN
 Sn
 Dp
 hX
@@ -45649,7 +45645,7 @@ az
 YV
 VN
 VN
-Lo
+AN
 VN
 Jm
 hX
diff --git a/maps/away/ships/tramp_freighter/tramp_freighter_areas.dm b/maps/away/ships/tramp_freighter/tramp_freighter_areas.dm
index d38614700c1..47d84a6bebe 100644
--- a/maps/away/ships/tramp_freighter/tramp_freighter_areas.dm
+++ b/maps/away/ships/tramp_freighter/tramp_freighter_areas.dm
@@ -6,6 +6,13 @@
 	base_turf = /turf/space
 	area_flags = AREA_FLAG_RAD_SHIELDED
 
+/area/tramp_freighter/exterior
+	name = "Independent Freighter - Exterior"
+	icon_state = "exterior"
+	needs_starlight = TRUE
+	has_gravity = FALSE
+	requires_power = FALSE
+
 /area/tramp_freighter/bridge
 	name = "Independent Freighter - Bridge"
 	icon_state = "bridge"
diff --git a/maps/away/ships/xanu/xanu_frigate.dmm b/maps/away/ships/xanu/xanu_frigate.dmm
index 678599bc1a0..924d2573080 100644
--- a/maps/away/ships/xanu/xanu_frigate.dmm
+++ b/maps/away/ships/xanu/xanu_frigate.dmm
@@ -213,8 +213,10 @@
 /turf/simulated/floor/tiled/white,
 /area/ship/xanu_frigate/medbay)
 "bd" = (
-/obj/structure/lattice,
-/turf/space/dynamic,
+/obj/effect/landmark/entry_point/fore{
+	name = "fore, starboard gunnery"
+	},
+/turf/template_noop,
 /area/space)
 "bg" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/yellow{
@@ -302,7 +304,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "bt" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -670,7 +672,7 @@
 /area/ship/xanu_frigate/galley)
 "cy" = (
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/starboard)
+/area/ship/xanu_frigate/exterior)
 "cA" = (
 /obj/structure/bed/stool/chair/sofa/left/black,
 /obj/structure/machinery/alarm/north,
@@ -703,7 +705,7 @@
 	},
 /obj/item/hullbeacon/green,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "cF" = (
 /obj/structure/machinery/computer/ship/sensors/terminal{
 	dir = 1
@@ -1061,7 +1063,7 @@
 	name = "aft, port engines"
 	},
 /turf/space/dynamic,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "dU" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1314,8 +1316,9 @@
 /area/ship/xanu_frigate/corridor/fore_atrium)
 "eG" = (
 /obj/structure/ship_weapon_dummy/barrel,
+/obj/structure/lattice/catwalk,
 /turf/space/dynamic,
-/area/space)
+/area/ship/xanu_frigate/weapon/grauwolf)
 "eI" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 5
@@ -1471,9 +1474,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/ship/xanu_frigate/bridge)
-"fe" = (
-/turf/simulated/wall/shuttle/dark/cardinal/coalition,
-/area/space)
 "fg" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/red{
 	dir = 10
@@ -1768,7 +1768,7 @@
 "gg" = (
 /obj/structure/grille,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "gk" = (
 /turf/space/transit/east,
 /area/space)
@@ -2664,7 +2664,7 @@
 	},
 /obj/item/hullbeacon/red,
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/hydroponics)
+/area/ship/xanu_frigate/exterior)
 "je" = (
 /obj/structure/machinery/door/firedoor{
 	dir = 4
@@ -2871,7 +2871,7 @@
 "jL" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "jM" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
@@ -3201,10 +3201,10 @@
 /turf/simulated/wall/shuttle/dark/cardinal/coalition,
 /area/shuttle/xanu_boarder/main)
 "kK" = (
-/obj/structure/lattice,
 /obj/item/hullbeacon/green,
+/obj/structure/lattice/catwalk,
 /turf/space/dynamic,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "kL" = (
 /obj/structure/machinery/atmospherics/pipe/simple/visible/universal{
 	dir = 4
@@ -3247,7 +3247,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/bridge)
+/area/ship/xanu_frigate/exterior)
 "kS" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 8
@@ -3625,10 +3625,10 @@
 /turf/simulated/floor/plating,
 /area/shuttle/xanu_fighter)
 "mF" = (
-/obj/structure/lattice,
 /obj/item/hullbeacon/red,
+/obj/structure/lattice/catwalk,
 /turf/space/dynamic,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "mG" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3677,7 +3677,7 @@
 /obj/structure/grille,
 /obj/effect/map_effect/map_helper/ruler_tiles_3,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "mP" = (
 /obj/structure/machinery/hologram/holopad,
 /obj/effect/floor_decal/industrial/outline/security,
@@ -3903,7 +3903,7 @@
 /area/ship/xanu_frigate/engineering/starboard)
 "nr" = (
 /obj/effect/landmark/entry_point/port{
-	name = "port, midsection"
+	name = "port, gunnery"
 	},
 /turf/template_noop,
 /area/space)
@@ -5407,7 +5407,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/medbay)
+/area/ship/xanu_frigate/exterior)
 "sI" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -5427,7 +5427,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/bridge)
+/area/ship/xanu_frigate/exterior)
 "sL" = (
 /obj/structure/table/rack,
 /obj/item/ship_ammunition/grauwolf_bundle/ap,
@@ -5762,6 +5762,11 @@
 "tQ" = (
 /turf/simulated/floor/tiled/gunmetal,
 /area/ship/xanu_frigate/cargo_bay)
+"tT" = (
+/obj/structure/ship_weapon_dummy/barrel,
+/obj/structure/lattice/catwalk,
+/turf/space/dynamic,
+/area/ship/xanu_frigate/weapon/longbow)
 "tU" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -5944,7 +5949,7 @@
 /obj/effect/floor_decal/industrial/warning,
 /obj/item/hullbeacon/red,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "us" = (
 /obj/structure/machinery/power/smes/buildable/substation{
 	input_attempt = 1;
@@ -6666,7 +6671,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/hydroponics)
+/area/ship/xanu_frigate/exterior)
 "wU" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/aux{
 	dir = 4
@@ -6748,7 +6753,7 @@
 	},
 /obj/item/hullbeacon/red,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "xm" = (
 /obj/effect/floor_decal/corner/orange/full{
 	dir = 8
@@ -6953,7 +6958,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/meeting)
+/area/ship/xanu_frigate/exterior)
 "yp" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -7314,7 +7319,7 @@
 /obj/effect/floor_decal/industrial/warning,
 /obj/item/hullbeacon/green,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "zw" = (
 /obj/structure/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/structure/cable{
@@ -7432,7 +7437,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/starboard)
+/area/ship/xanu_frigate/exterior)
 "zR" = (
 /obj/structure/machinery/portable_atmospherics/hydroponics,
 /obj/structure/machinery/power/apc/west,
@@ -7670,7 +7675,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "AO" = (
 /obj/structure/machinery/door/airlock/external,
 /obj/structure/machinery/door/blast/regular/open{
@@ -8028,7 +8033,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/port)
+/area/ship/xanu_frigate/exterior)
 "Cg" = (
 /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -8381,7 +8386,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/starboard)
+/area/ship/xanu_frigate/exterior)
 "Dm" = (
 /obj/structure/bed/stool/chair/shuttle,
 /obj/structure/machinery/button/remote/blast_door{
@@ -8755,7 +8760,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/port)
+/area/ship/xanu_frigate/exterior)
 "Ew" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -9005,7 +9010,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "Fi" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -9107,12 +9112,6 @@
 	},
 /turf/simulated/wall/shuttle/dark/cardinal/coalition,
 /area/shuttle/xanu_boarder/engineering)
-"FA" = (
-/obj/effect/floor_decal/spline/plain/orange{
-	dir = 8
-	},
-/turf/simulated/floor/reinforced/airless,
-/area/space)
 "FB" = (
 /obj/structure/machinery/vending/engivend{
 	req_access = list(222)
@@ -9485,7 +9484,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/hydroponics)
+/area/ship/xanu_frigate/exterior)
 "GT" = (
 /obj/effect/floor_decal/industrial/warning/full,
 /mob/living/heavy_vehicle/premade/firefighter{
@@ -9675,7 +9674,7 @@
 "Hr" = (
 /obj/effect/floor_decal/spline/plain/corner/orange,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "Hs" = (
 /obj/structure/machinery/ship_weapon/longbow{
 	pixel_x = -32;
@@ -9694,12 +9693,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/ship/xanu_frigate/galley)
-"Hv" = (
-/obj/effect/floor_decal/spline/plain/orange{
-	dir = 4
-	},
-/turf/simulated/floor/reinforced/airless,
-/area/space)
 "Hw" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -9922,7 +9915,7 @@
 /area/ship/xanu_frigate/cic)
 "Ic" = (
 /obj/effect/landmark/entry_point/starboard{
-	name = "starboard, midsection"
+	name = "starboard, gunnery"
 	},
 /turf/template_noop,
 /area/space)
@@ -9959,8 +9952,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/xanu_boarder/main)
 "In" = (
-/turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/port)
+/obj/effect/landmark/entry_point/fore{
+	name = "fore, port gunnery"
+	},
+/turf/template_noop,
+/area/space)
 "Io" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -10226,7 +10222,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/starboard)
+/area/ship/xanu_frigate/exterior)
 "Jn" = (
 /obj/structure/machinery/computer/ship/sensors/terminal{
 	dir = 4
@@ -11069,7 +11065,7 @@
 	name = "aft, starboard engines"
 	},
 /turf/space/dynamic,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "LG" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/machinery/light/floor{
@@ -11145,7 +11141,7 @@
 	},
 /obj/item/hullbeacon/green,
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/medbay)
+/area/ship/xanu_frigate/exterior)
 "LQ" = (
 /obj/structure/machinery/light,
 /obj/structure/machinery/atmospherics/unary/vent_scrubber/on{
@@ -11167,7 +11163,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/medbay)
+/area/ship/xanu_frigate/exterior)
 "LX" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -11247,7 +11243,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/bridge)
+/area/ship/xanu_frigate/exterior)
 "Mo" = (
 /obj/structure/machinery/door/airlock/glass_security{
 	dir = 4;
@@ -11367,12 +11363,6 @@
 "MJ" = (
 /turf/simulated/floor/reinforced,
 /area/ship/xanu_frigate/weapon/grauwolf)
-"MN" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/starboard)
 "MO" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/lattice/catwalk/indoor/grate/dark,
@@ -11434,7 +11424,7 @@
 /obj/structure/ship_weapon_dummy,
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/weapon/grauwolf)
 "Nb" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -11477,7 +11467,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "Ng" = (
 /obj/structure/closet/firecloset,
 /obj/effect/floor_decal/industrial/outline/firefighting_closet,
@@ -11606,14 +11596,14 @@
 /obj/item/hullbeacon/green,
 /obj/effect/floor_decal/industrial/warning/full,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "NC" = (
 /obj/structure/machinery/shipsensors,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/bridge)
+/area/ship/xanu_frigate/exterior)
 "NE" = (
 /obj/structure/machinery/computer/ship/targeting/terminal{
 	dir = 8;
@@ -11886,7 +11876,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/bridge)
+/area/ship/xanu_frigate/exterior)
 "Ov" = (
 /obj/structure/platform/cutout/dark,
 /obj/structure/platform_stairs/full/east_west_cap{
@@ -12221,7 +12211,7 @@
 	},
 /obj/item/hullbeacon/green,
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/starboard)
+/area/ship/xanu_frigate/exterior)
 "PD" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 5
@@ -12685,7 +12675,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/starboard)
+/area/ship/xanu_frigate/exterior)
 "Rj" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -12780,7 +12770,7 @@
 /obj/item/hullbeacon/red,
 /obj/effect/floor_decal/industrial/warning/full,
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "RE" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/machinery/atmospherics/unary/vent_pump/on{
@@ -13260,7 +13250,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "Ta" = (
 /turf/simulated/wall/shuttle/dark/cardinal/coalition,
 /area/ship/xanu_frigate/eva)
@@ -13272,7 +13262,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/bridge)
+/area/ship/xanu_frigate/exterior)
 "Te" = (
 /obj/structure/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
 	dir = 1;
@@ -13431,11 +13421,17 @@
 /area/ship/xanu_frigate/bridge)
 "TF" = (
 /obj/structure/ship_weapon_dummy,
+/obj/structure/lattice/catwalk,
 /turf/space/dynamic,
-/area/space)
+/area/ship/xanu_frigate/weapon/longbow)
 "TH" = (
 /turf/simulated/wall/shuttle/dark/cardinal/coalition,
 /area/shuttle/xanu_boarder/cockpit)
+"TJ" = (
+/obj/structure/ship_weapon_dummy,
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/xanu_frigate/weapon/longbow)
 "TK" = (
 /obj/structure/machinery/atmospherics/binary/pump/aux/on{
 	name = "Distribution to CIC Loop";
@@ -13565,7 +13561,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/port)
+/area/ship/xanu_frigate/exterior)
 "Ud" = (
 /obj/structure/machinery/light,
 /obj/structure/synthesized_instrument/synthesizer/piano,
@@ -14076,13 +14072,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/xanu_frigate/weapon/longbow)
-"VQ" = (
-/obj/effect/map_effect/map_helper/ruler_tiles_3,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/starboard)
 "VR" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /obj/effect/floor_decal/corner_wide/blue{
@@ -14261,7 +14250,7 @@
 	},
 /obj/item/hullbeacon/red,
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/port)
+/area/ship/xanu_frigate/exterior)
 "Wx" = (
 /obj/structure/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 4
@@ -14687,7 +14676,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/bridge)
+/area/ship/xanu_frigate/exterior)
 "XV" = (
 /turf/simulated/floor/tiled/dark,
 /area/ship/xanu_frigate/cic)
@@ -15151,7 +15140,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "Ze" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/railing/mapped{
@@ -15162,7 +15151,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/airless,
-/area/ship/xanu_frigate/engineering/starboard)
+/area/ship/xanu_frigate/exterior)
 "Zf" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -15298,7 +15287,7 @@
 "ZP" = (
 /obj/structure/lattice/catwalk,
 /turf/space/dynamic,
-/area/space)
+/area/ship/xanu_frigate/exterior)
 "ZQ" = (
 /obj/structure/machinery/door/airlock/highsecurity{
 	name = "Longbow Bay";
@@ -40152,7 +40141,7 @@ Ic
 Zm
 Zm
 Zm
-bd
+ZP
 Zm
 Zm
 Zm
@@ -40654,9 +40643,9 @@ Zm
 Zm
 Zm
 Zm
-bd
-bd
-bd
+ZP
+ZP
+ZP
 gg
 gg
 Ux
@@ -41439,12 +41428,12 @@ sG
 sG
 JG
 ry
-Na
+TJ
 TF
 TF
 TF
 TF
-eG
+tT
 Zm
 Zm
 Zm
@@ -41696,7 +41685,7 @@ Hs
 sG
 JG
 ry
-Na
+TJ
 TF
 TF
 TF
@@ -42211,7 +42200,7 @@ BZ
 sA
 xL
 zv
-Zm
+bd
 Zm
 Zm
 Zm
@@ -43996,7 +43985,7 @@ Zm
 Zm
 Zm
 iJ
-fe
+KT
 KT
 nh
 JC
@@ -44252,7 +44241,7 @@ Zm
 Zm
 Zm
 Zm
-fe
+KT
 KT
 KT
 Ju
@@ -44268,8 +44257,8 @@ ET
 yu
 yu
 gg
-FA
-FA
+LU
+LU
 cD
 RH
 Zm
@@ -44735,7 +44724,7 @@ th
 th
 Va
 Va
-MN
+Ce
 cy
 cy
 xY
@@ -44992,7 +44981,7 @@ vv
 BQ
 Va
 Va
-VQ
+Uc
 cy
 cy
 xY
@@ -45249,7 +45238,7 @@ YO
 HD
 Va
 Va
-MN
+Ce
 cy
 xY
 xY
@@ -45506,7 +45495,7 @@ wq
 KF
 iV
 Va
-MN
+Ce
 xY
 xY
 xY
@@ -45763,7 +45752,7 @@ HJ
 ZJ
 ni
 Fr
-VQ
+Uc
 xY
 xY
 lv
@@ -46020,7 +46009,7 @@ Xp
 bn
 QA
 Va
-MN
+Ce
 xY
 xY
 uy
@@ -46277,7 +46266,7 @@ Va
 Va
 Fy
 Va
-MN
+Ce
 xY
 xY
 pF
@@ -48848,7 +48837,7 @@ wX
 TH
 up
 Ce
-In
+cy
 zB
 tK
 Yk
@@ -49105,7 +49094,7 @@ qo
 bH
 vM
 Ce
-In
+cy
 zB
 Jr
 nz
@@ -49362,7 +49351,7 @@ TH
 TH
 KK
 Uc
-In
+cy
 Ta
 Ta
 Ta
@@ -49619,9 +49608,9 @@ Zm
 Zm
 vq
 Ce
-In
+cy
 Ev
-In
+cy
 kF
 Zf
 SO
@@ -49906,7 +49895,7 @@ Zm
 Zm
 Zm
 Zm
-fe
+gZ
 gZ
 gZ
 QK
@@ -49922,8 +49911,8 @@ Mg
 bP
 bP
 gg
-Hv
-Hv
+wT
+wT
 xl
 RH
 Zm
@@ -50164,7 +50153,7 @@ Zm
 Zm
 Zm
 kG
-fe
+gZ
 gZ
 BM
 YS
@@ -52748,7 +52737,7 @@ Ro
 MJ
 lT
 uq
-Zm
+In
 Zm
 Zm
 Zm
@@ -53504,9 +53493,9 @@ Zm
 Zm
 Zm
 Zm
-bd
-bd
-bd
+ZP
+ZP
+ZP
 gg
 gg
 Wf
@@ -54030,7 +54019,7 @@ Zm
 Zm
 Zm
 Zm
-bd
+ZP
 Zm
 Zm
 Zm
diff --git a/maps/away/ships/xanu/xanu_frigate_areas.dm b/maps/away/ships/xanu/xanu_frigate_areas.dm
index 03b9d8012c9..971c6af4f02 100644
--- a/maps/away/ships/xanu/xanu_frigate_areas.dm
+++ b/maps/away/ships/xanu/xanu_frigate_areas.dm
@@ -148,6 +148,13 @@
 /area/ship/xanu_frigate/corridor/aft
 	name = "Xanu Frigate - Aft Corridor"
 
+/area/ship/xanu_frigate/exterior
+	name = "Xanu Frigate - Exterior"
+	icon_state = "exterior"
+	needs_starlight = TRUE
+	has_gravity = FALSE
+	requires_power = FALSE
+
 //Shuttles
 /area/shuttle/xanu_boarder
 	name = "Xanu Spacefleet Runabout Parent Area"