diff --git a/code/game/landmarks/spawnpoint/tradeport.dm b/code/game/landmarks/spawnpoint/tradeport.dm
index 24adc1185e24..4cc6312e3ff5 100644
--- a/code/game/landmarks/spawnpoint/tradeport.dm
+++ b/code/game/landmarks/spawnpoint/tradeport.dm
@@ -7,3 +7,12 @@
 /obj/landmark/spawnpoint/latejoin/tradeport
 	name = "Tradeport Latejoin"
 	faction = JOB_FACTION_TRADEPORT
+
+/obj/landmark/spawnpoint/job/trader/visitor
+	name = "Nebula visitor"
+	job_path = /datum/role/job/station/assistant
+	latejoin = TRUE
+	latejoin_override = TRUE
+
+/obj/landmark/spawnpoint/latejoin/tradeport/visitor
+	name = "Visitor Tradeport Latejoin"
diff --git a/code/modules/jobs/job_types/station/civillian/assistant.dm b/code/modules/jobs/job_types/station/civillian/assistant.dm
index 7537c89fc28d..e1b1039a438b 100644
--- a/code/modules/jobs/job_types/station/civillian/assistant.dm
+++ b/code/modules/jobs/job_types/station/civillian/assistant.dm
@@ -15,7 +15,11 @@
 		"Visitor" = /datum/prototype/struct/alt_title/visitor,
 		"Server" = /datum/prototype/struct/alt_title/server,
 		"Morale Officer" = /datum/prototype/struct/alt_title/morale_officer,
-		"Assistant" = /datum/prototype/struct/alt_title/assistant
+		"Assistant" = /datum/prototype/struct/alt_title/assistant,
+		"Contractor" = /datum/prototype/struct/alt_title/contractor,
+		"Freelancer" = /datum/prototype/struct/alt_title/freelancer,
+		"Frontier Colonist" = /datum/prototype/struct/alt_title/colonist,
+		"Tourist" = /datum/prototype/struct/alt_title/tourist
 	)
 
 /datum/role/job/station/assistant/get_access()
@@ -42,6 +46,22 @@
 	title = "Assistant"
 	title_outfit = /datum/outfit/job/station/assistant
 
+/datum/prototype/struct/alt_title/contractor
+	title = "Contractor"
+	title_outfit = /datum/outfit/job/station/assistant/contractor
+
+/datum/prototype/struct/alt_title/freelancer
+	title = "Freelancer"
+	title_outfit = /datum/outfit/job/station/assistant/freelancer
+
+/datum/prototype/struct/alt_title/colonist
+	title = "Frontier Colonist"
+	title_outfit = /datum/outfit/job/station/assistant/colonist
+
+/datum/prototype/struct/alt_title/tourist
+	title = "Tourist"
+	title_outfit = /datum/outfit/job/station/assistant/tourist
+
 /datum/outfit/job/station/assistant
 	name = OUTFIT_JOB_NAME(USELESS_JOB)
 	id_type = /obj/item/card/id/assistant
@@ -83,3 +103,15 @@
 	name = OUTFIT_JOB_NAME("Server")
 	uniform = /obj/item/clothing/under/waiter
 	l_ear = /obj/item/radio/headset/headset_service
+
+/datum/outfit/job/station/assistant/contractor
+	id_pda_assignment = "Contractor"
+
+/datum/outfit/job/station/assistant/freelancer
+	id_pda_assignment = "Freelancer"
+
+/datum/outfit/job/station/assistant/colonist
+	id_pda_assignment = "Colonist"
+
+/datum/outfit/job/station/assistant/tourist
+	id_pda_assignment = "Tourist"
diff --git a/code/modules/maps/overmap/space/trade_station/trade_station.dm b/code/modules/maps/overmap/space/trade_station/trade_station.dm
index 24b37cdd11ed..ec05bd38f41f 100644
--- a/code/modules/maps/overmap/space/trade_station/trade_station.dm
+++ b/code/modules/maps/overmap/space/trade_station/trade_station.dm
@@ -74,6 +74,24 @@
 	announce_channel = "Trade"
 	on_store_name = "Beruang Trading Corp Storage"
 
+/datum/spawnpoint/trade/visitor
+	display_name = "Nebula Visitor Arrival"
+	restrict_job = list("Visitor")
+	announce_channel = "Trade"
+	method = LATEJOIN_METHOD_ARRIVALS_SHUTTLE
+
+/obj/machinery/cryopod/robot/door/gateway/trade/visitor
+	name = "Trade public teleporter"
+	desc = "The short-range teleporter you might've came in from. You could leave easily using this."
+	icon = 'icons/obj/machines/teleporter.dmi'
+	icon_state = "pad_idle"
+	announce_channel = "Trade"
+	base_icon_state = "pad"
+	occupied_icon_state = "pad_active"
+	on_store_message = "has departed via short-range teleport."
+	on_enter_occupant_message = "The teleporter activates, and you step into the swirling portal."
+	spawnpoint_type = /datum/spawnpoint/trade/visitor
+
 // Their shuttle
 
 // Shuttle landmarks. Need to be removed at some point and generic waypoints used
diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm
index 7f531c74e37d..a29286873e8c 100644
--- a/maps/rift/levels/rift-10-west_plains.dmm
+++ b/maps/rift/levels/rift-10-west_plains.dmm
@@ -1122,6 +1122,12 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/steel_dirty/lythios43c,
 /area/rift/surfacebase/outside/west)
+"fi" = (
+/obj/effect/shuttle_landmark/automatic{
+	base_turf = /turf/simulated/floor/outdoors/snow/lythios43c
+	},
+/turf/simulated/floor/outdoors/snow/lythios43c,
+/area/rift/surfacebase/outside/west)
 "fj" = (
 /obj/machinery/power/apc/alarms_hidden/north_mount{
 	cell_type = null;
@@ -7096,6 +7102,10 @@
 	},
 /turf/simulated/floor,
 /area/rnd/outpost/anomaly_lab/storage)
+"Hf" = (
+/obj/tether_away_spawner/lythios_animals,
+/turf/simulated/floor/outdoors/snow/lythios43c,
+/area/rift/exterior/bunker)
 "Hg" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "0-8"
@@ -19002,7 +19012,7 @@ PP
 PP
 PP
 sv
-sv
+cL
 sv
 sv
 sv
@@ -20167,7 +20177,7 @@ PP
 PP
 PP
 sv
-cL
+sv
 sv
 sv
 sv
@@ -20559,7 +20569,7 @@ sv
 sv
 sv
 sv
-sv
+fi
 sv
 sv
 sv
@@ -22121,7 +22131,7 @@ sv
 sv
 sv
 sv
-sv
+fi
 sv
 sv
 sv
@@ -22296,7 +22306,7 @@ PP
 sv
 sv
 sv
-sv
+cL
 sv
 sv
 sv
@@ -23474,7 +23484,7 @@ sv
 sv
 sv
 sv
-cL
+sv
 sv
 sv
 sv
@@ -26180,7 +26190,7 @@ nz
 nz
 nz
 nz
-nz
+Hf
 nz
 YE
 sv
@@ -26188,7 +26198,7 @@ sv
 sv
 sv
 sv
-sv
+fi
 sv
 sv
 sv
@@ -29094,7 +29104,7 @@ sv
 sv
 sv
 sv
-sv
+cL
 sv
 sv
 sv
diff --git a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
index c16757b54c69..851fcab15033 100644
--- a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
+++ b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm
@@ -1250,9 +1250,6 @@
 /turf/simulated/wall/r_wall,
 /area/tradeport/dock)
 "adC" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 1
-	},
 /obj/structure/window/reinforced/tinted,
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -1260,6 +1257,9 @@
 /obj/machinery/atmospherics/pipe/tank/air{
 	dir = 1
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/monogrid,
 /area/shuttle/tug)
 "adD" = (
@@ -2124,7 +2124,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/cryopod/robot/door/gateway,
+/obj/machinery/cryopod/robot/door/gateway/trade/visitor,
 /turf/simulated/floor/tiled/old_tile/beige,
 /area/tradeport/commhall)
 "afS" = (
@@ -2655,6 +2655,7 @@
 	icon_state = "1-2"
 	},
 /obj/effect/floor_decal/rust,
+/obj/machinery/air_alarm/alarms_hidden/east_mount,
 /turf/simulated/floor/plating,
 /area/shuttle/udang/main)
 "ahi" = (
@@ -3050,6 +3051,7 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = 32
 	},
+/obj/machinery/space_heater,
 /turf/simulated/floor/tiled/techfloor/monogrid,
 /area/sector/nebula_tradeport/dock2)
 "aig" = (
@@ -3634,6 +3636,11 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/blast/shutters{
+	dir = 2;
+	id = "clerk2";
+	name = "Clerk Shutters"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/tradeport/commons)
 "ajB" = (
@@ -4034,6 +4041,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/sector/nebula_tradeport/dock2)
 "akD" = (
+/obj/landmark/spawnpoint/job/trader/visitor,
 /turf/simulated/floor/tiled/old_tile/beige,
 /area/tradeport/commhall)
 "akE" = (
@@ -4696,6 +4704,7 @@
 	dir = 4;
 	old_wall = 1
 	},
+/obj/machinery/space_heater,
 /turf/simulated/floor/tiled/techfloor/monogrid,
 /area/shuttle/adventurer)
 "amu" = (
@@ -5088,7 +5097,7 @@
 /turf/space,
 /area/tradeport/spine)
 "anA" = (
-/obj/machinery/cryopod/robot/door/gateway,
+/obj/machinery/cryopod/robot/door/gateway/trade/visitor,
 /turf/simulated/floor/tiled/old_tile/beige,
 /area/tradeport/commhall)
 "anB" = (
@@ -5228,6 +5237,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/monotechmaint,
 /area/shuttle/utilitymicro)
 "anV" = (
@@ -7075,10 +7087,6 @@
 	},
 /turf/simulated/floor/airless,
 /area/space)
-"asZ" = (
-/obj/structure/loot_pile/surface/drone,
-/turf/simulated/mineral/floor/vacuum,
-/area/space)
 "ata" = (
 /obj/machinery/door/firedoor{
 	dir = 8
@@ -7219,7 +7227,6 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/window/reinforced,
 /turf/simulated/floor/tiled/monodark,
 /area/sector/nebula_tradeport/comroom)
 "att" = (
@@ -7896,6 +7903,11 @@
 	req_one_access = null
 	},
 /obj/map_helper/access_helper/airlock/station/external_airlock,
+/obj/machinery/door/blast/shutters{
+	dir = 2;
+	id = "clerk2";
+	name = "Clerk Shutters"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/tradeport/commons)
 "ave" = (
@@ -8125,9 +8137,6 @@
 /obj/structure/bed/chair/shuttle{
 	dir = 4
 	},
-/obj/structure/window/reinforced/polarized{
-	id = "udang_cargo"
-	},
 /obj/effect/floor_decal/borderfloorblack,
 /turf/simulated/floor/tiled/old_tile/yellow,
 /area/shuttle/udang/main)
@@ -8840,6 +8849,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/monotechmaint,
 /area/shuttle/tug)
 "axi" = (
@@ -8874,6 +8886,9 @@
 	pixel_x = -27
 	},
 /obj/machinery/power/apc/alarms_hidden/north_mount,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
 /turf/simulated/floor/tiled/monotechmaint,
 /area/shuttle/utilitymicro)
 "axo" = (
@@ -9437,9 +9452,6 @@
 /obj/structure/bed/chair/shuttle{
 	dir = 4
 	},
-/obj/structure/window/reinforced/polarized{
-	id = "udang_cargo"
-	},
 /obj/effect/floor_decal/borderfloorblack,
 /turf/simulated/floor/tiled/old_tile/yellow,
 /area/shuttle/udang/main)
@@ -9495,6 +9507,10 @@
 	},
 /obj/structure/closet/crate/corporate/nanotrasen,
 /obj/structure/handrail,
+/obj/structure/window/reinforced/polarized{
+	id = "udang_cargo";
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/udang/main)
 "ayZ" = (
@@ -9904,7 +9920,6 @@
 /turf/simulated/floor/outdoors/dirt,
 /area/tradeport/cyndishow)
 "aAb" = (
-/obj/structure/window/reinforced/tinted,
 /obj/structure/window/reinforced/tinted{
 	dir = 1
 	},
@@ -10076,6 +10091,10 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/window/reinforced/polarized{
+	id = "udang_cargo";
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/udang/main)
 "aAv" = (
@@ -10224,6 +10243,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 1
 	},
+/obj/machinery/space_heater,
 /turf/simulated/floor/plating,
 /area/sector/nebula_tradeport/engineering)
 "aAQ" = (
@@ -11023,20 +11043,6 @@
 /obj/spawner/window/low_wall/reinforced/full/firelocks,
 /turf/simulated/floor/plating,
 /area/tradeport/commons)
-"aCN" = (
-/obj/machinery/door/blast/shutters{
-	id = "Tug2"
-	},
-/obj/machinery/door/blast/regular{
-	density = 0;
-	dir = 4;
-	icon_state = "pdoorc0";
-	id = "tugdoor2";
-	name = "Tug hauler shuttle Airlock";
-	opacity = 0
-	},
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/tug)
 "aCP" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 1
@@ -11280,9 +11286,6 @@
 /turf/simulated/floor/tiled/old_tile/purple,
 /area/tradeport/spine)
 "aDx" = (
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -11703,6 +11706,7 @@
 	charge = 15000;
 	cur_coils = 3
 	},
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/utilitymicro)
 "aEL" = (
@@ -12075,9 +12079,6 @@
 /obj/structure/bed/chair/shuttle{
 	dir = 4
 	},
-/obj/structure/window/reinforced/polarized{
-	id = "udang_cargo"
-	},
 /obj/effect/floor_decal/borderfloorblack,
 /turf/simulated/floor/tiled/old_tile/yellow,
 /area/shuttle/udang/main)
@@ -12881,9 +12882,6 @@
 /area/shuttle/trade_ship/general)
 "aHR" = (
 /obj/structure/railing/grey,
-/obj/structure/window/reinforced/polarized{
-	id = "udang_cargo"
-	},
 /obj/structure/bed/chair/shuttle{
 	dir = 4
 	},
@@ -13029,6 +13027,9 @@
 /area/tradeport/safari)
 "aIl" = (
 /obj/machinery/telecomms/relay/preset/telecomms,
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/utilitymicro)
 "aIm" = (
@@ -14246,6 +14247,10 @@
 /obj/structure/railing/grey{
 	dir = 8
 	},
+/obj/structure/window/reinforced/polarized{
+	id = "udang_cargo";
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/udang/main)
 "aLE" = (
@@ -14349,6 +14354,10 @@
 /obj/machinery/portable_atmospherics/canister/empty/phoron,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/structure/handrail,
+/obj/structure/window/reinforced/polarized{
+	id = "udang_cargo";
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/udang/main)
 "aLU" = (
@@ -14367,6 +14376,7 @@
 /obj/machinery/atm{
 	pixel_y = 27
 	},
+/obj/landmark/spawnpoint/job/trader/visitor,
 /turf/simulated/floor/tiled/old_tile/beige,
 /area/tradeport/commhall)
 "aLX" = (
@@ -14731,14 +14741,17 @@
 	},
 /obj/effect/shuttle_landmark/triumph/trade/utilitymicro,
 /obj/overmap/entity/visitable/ship/landable/trade/utilitymicro,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/monotechmaint,
 /area/shuttle/utilitymicro)
 "aMX" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 9
 	},
 /turf/simulated/floor/carpet/patterened/blue,
 /area/shuttle/caravan)
@@ -14916,6 +14929,9 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/utilitymicro)
 "aNx" = (
@@ -15702,7 +15718,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/airless,
-/area/tradeport/exterior)
+/area/space)
 "aPJ" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
@@ -15830,14 +15846,14 @@
 /turf/simulated/floor/tiled/old_tile/blue,
 /area/tradeport/cafeteria)
 "aQb" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 1
-	},
 /obj/structure/window/reinforced/tinted,
 /obj/machinery/power/smes/buildable{
 	charge = 15000;
 	cur_coils = 3
 	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/tiled/techfloor/monogrid,
 /area/shuttle/tug)
 "aQd" = (
@@ -16523,7 +16539,6 @@
 /turf/space/basic,
 /area/space)
 "aRU" = (
-/obj/structure/window/reinforced/tinted,
 /obj/structure/window/reinforced/tinted{
 	dir = 1
 	},
@@ -17639,6 +17654,10 @@
 	},
 /obj/machinery/portable_atmospherics/canister/empty/phoron,
 /obj/structure/handrail,
+/obj/structure/window/reinforced/polarized{
+	id = "udang_cargo";
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/udang/main)
 "aUL" = (
@@ -18230,7 +18249,7 @@
 /turf/space/basic,
 /area/sector/nebula_tradeport/motel/vip)
 "aWu" = (
-/obj/machinery/vending/security,
+/obj/structure/table/rack/shelf/steel,
 /turf/simulated/floor/tiled/old_tile/red,
 /area/sector/nebula_tradeport/security)
 "aWv" = (
@@ -19058,6 +19077,7 @@
 /area/shuttle/trade_ship/general)
 "aYL" = (
 /obj/structure/closet/walllocker_double/south,
+/obj/machinery/space_heater,
 /turf/simulated/floor/carpet/patterened/brown,
 /area/shuttle/caravan)
 "aYM" = (
@@ -19069,13 +19089,6 @@
 	id = "tugdoor1";
 	name = "Tug Barge door"
 	},
-/obj/machinery/button/remote/blast_door{
-	pixel_x = 33;
-	pixel_y = -2;
-	dir = 8;
-	id = "Tug2";
-	name = "Tug Air refuel"
-	},
 /obj/machinery/button/remote/blast_door{
 	pixel_x = 23;
 	pixel_y = -2;
@@ -19135,6 +19148,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
+/obj/machinery/space_heater,
 /turf/simulated/floor/plating,
 /area/sector/nebula_tradeport/engineering)
 "aYV" = (
@@ -19376,6 +19390,9 @@
 /turf/simulated/floor/carpet/patterened/blue/alt,
 /area/sector/nebula_tradeport/motel/vip)
 "aZE" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/utilitymicro)
 "aZF" = (
@@ -19436,9 +19453,6 @@
 	pixel_x = 32;
 	pixel_y = -3
 	},
-/obj/structure/window/reinforced/polarized{
-	id = "udang_cargo"
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 6
 	},
@@ -19496,8 +19510,11 @@
 /turf/simulated/floor/tiled/neutral,
 /area/tradeport/commons)
 "aZT" = (
-/obj/structure/railing,
-/turf/simulated/mineral/floor/vacuum,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/solar,
+/turf/simulated/floor/airless,
 /area/tradeport/exterior)
 "aZU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -20053,6 +20070,10 @@
 	},
 /turf/simulated/floor/wood,
 /area/sector/nebula_tradeport/motel/room5)
+"cqS" = (
+/obj/machinery/space_heater,
+/turf/simulated/floor/plating,
+/area/shuttle/tug)
 "crj" = (
 /obj/structure/table/hardwoodtable,
 /obj/item/material/knife,
@@ -20268,6 +20289,10 @@
 /obj/machinery/gear_painter,
 /turf/simulated/floor/tiled/steel,
 /area/tradeport/commons)
+"cTW" = (
+/obj/structure/catwalk,
+/turf/space/basic,
+/area/space)
 "cUz" = (
 /obj/structure/shuttle/engine/heater{
 	dir = 4
@@ -20757,6 +20782,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/scoophead/main)
+"dYD" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/patterened/blue,
+/area/shuttle/caravan)
 "dYK" = (
 /obj/structure/transit_tube,
 /obj/effect/floor_decal/industrial/warning{
@@ -20922,6 +20956,15 @@
 	},
 /turf/simulated/floor/tiled/steel_dirty/dark,
 /area/shuttle/arrowhead)
+"evN" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/airless,
+/area/space)
 "evZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -25248,6 +25291,13 @@
 /obj/item/reagent_containers/food/snacks/candy_corn,
 /turf/simulated/floor/tiled/old_tile/blue,
 /area/tradeport/commons)
+"rdP" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/utilitymicro)
 "rfq" = (
 /obj/machinery/newscaster{
 	pixel_y = 35
@@ -25658,6 +25708,15 @@
 /obj/structure/inflatable,
 /turf/simulated/floor/tiled/old_tile/yellow,
 /area/tradeport/spine)
+"sEm" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/valve{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/patterened/blue,
+/area/shuttle/caravan)
 "sFL" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -26404,6 +26463,14 @@
 /obj/machinery/atmospheric_field_generator/perma,
 /turf/simulated/floor/plating,
 /area/shuttle/scoophead/main)
+"uQS" = (
+/obj/machinery/button/remote/blast_door{
+	id = "clerk2";
+	pixel_y = 27;
+	req_access = list(160)
+	},
+/turf/simulated/floor/tiled,
+/area/tradeport/commons)
 "uRl" = (
 /obj/structure/fuel_port{
 	pixel_x = -26
@@ -27458,6 +27525,9 @@
 	},
 /turf/simulated/floor/tiled/old_tile/white,
 /area/sector/nebula_tradeport/motel/room3)
+"yjZ" = (
+/turf/simulated/floor/tiled/old_tile/beige,
+/area/tradeport/commhall)
 
 (1,1,1) = {"
 acd
@@ -35131,7 +35201,7 @@ adU
 aog
 aog
 aNU
-aCN
+aog
 aCS
 aEd
 aKa
@@ -35503,7 +35573,7 @@ aMf
 aVE
 aXl
 aIh
-anj
+dYD
 aHO
 aXl
 atV
@@ -35697,7 +35767,7 @@ aMf
 aVE
 aPx
 aQK
-anj
+sEm
 aRn
 aXl
 atV
@@ -35907,7 +35977,7 @@ agT
 agT
 agT
 agT
-agT
+cqS
 aog
 aEd
 ahd
@@ -36272,7 +36342,7 @@ cXs
 aOy
 aHW
 aJz
-akD
+yjZ
 axS
 aoN
 apv
@@ -38416,7 +38486,7 @@ aHl
 aEd
 ahe
 aLz
-aLz
+rdP
 aBm
 aEd
 aHv
@@ -45548,7 +45618,7 @@ acd
 acd
 acd
 aDh
-aDh
+acd
 aDh
 aDh
 aDh
@@ -45740,8 +45810,6 @@ acd
 acd
 acd
 acd
-acd
-aDh
 aDh
 abs
 abs
@@ -45750,6 +45818,8 @@ abs
 abs
 abs
 abs
+abs
+abs
 aWv
 apJ
 adm
@@ -45934,8 +46004,6 @@ acd
 acd
 acd
 acd
-acd
-aDh
 aMr
 aEi
 aEi
@@ -45945,6 +46013,8 @@ aEi
 aEi
 aEi
 aEi
+aEi
+aEi
 acT
 aEi
 aEi
@@ -46128,8 +46198,6 @@ acd
 acd
 acd
 acd
-acd
-aDh
 aMr
 aBg
 aVZ
@@ -46139,6 +46207,8 @@ aVZ
 aVZ
 aVZ
 aVZ
+aVZ
+aVZ
 aPp
 aPQ
 aPQ
@@ -46322,8 +46392,6 @@ acd
 acd
 acd
 acd
-acd
-aDh
 aMr
 aag
 aag
@@ -46333,6 +46401,8 @@ aag
 aag
 aag
 aag
+aag
+aag
 acT
 aag
 aag
@@ -46516,8 +46586,6 @@ acd
 acd
 acd
 acd
-acd
-aDh
 aMr
 aiv
 aiv
@@ -46527,6 +46595,8 @@ aiv
 aiv
 aiv
 aiv
+aiv
+aiv
 acT
 aiv
 aiv
@@ -46710,8 +46780,6 @@ acd
 acd
 acd
 acd
-acd
-aDh
 aMr
 aEi
 aEi
@@ -46721,6 +46789,8 @@ aEi
 aEi
 aEi
 aEi
+aEi
+aEi
 acT
 aEi
 aEi
@@ -46904,8 +46974,6 @@ acd
 acd
 acd
 acd
-acd
-aDh
 aMr
 aBg
 aVZ
@@ -46915,6 +46983,8 @@ aVZ
 aVZ
 aVZ
 aVZ
+aVZ
+aVZ
 aPp
 aPQ
 aPQ
@@ -47098,8 +47168,6 @@ acd
 acd
 acd
 acd
-acd
-aDh
 aMr
 aag
 aag
@@ -47109,6 +47177,8 @@ aag
 aag
 aag
 aag
+aag
+aag
 acT
 aag
 aag
@@ -47292,8 +47362,6 @@ aDh
 aDh
 aDh
 aDh
-aDh
-aDh
 aMr
 aiv
 aiv
@@ -47303,6 +47371,8 @@ aiv
 aiv
 aiv
 aiv
+aiv
+aiv
 acT
 aiv
 aiv
@@ -47486,8 +47556,6 @@ aDh
 aDh
 aDh
 aDh
-aDh
-aDh
 aMr
 aEi
 aEi
@@ -47497,6 +47565,8 @@ aEi
 aEi
 aEi
 aEi
+aEi
+aEi
 acT
 aEi
 aEi
@@ -47680,8 +47750,6 @@ aDh
 aDh
 aDh
 aDh
-aDh
-aDh
 aMr
 aBg
 aVZ
@@ -47691,6 +47759,8 @@ aVZ
 aVZ
 aVZ
 aVZ
+aVZ
+aVZ
 aPp
 aPQ
 aPQ
@@ -47874,8 +47944,6 @@ aDh
 aDh
 aDh
 aDh
-aDh
-aDh
 aMr
 aag
 aag
@@ -47885,6 +47953,8 @@ aag
 aag
 aag
 aag
+aag
+aag
 acT
 aag
 aag
@@ -48068,8 +48138,6 @@ aDh
 aDh
 aDh
 aDh
-aDh
-aDh
 aMr
 aiv
 aiv
@@ -48079,6 +48147,8 @@ aiv
 aiv
 aiv
 aiv
+aiv
+aiv
 acT
 aiv
 aiv
@@ -48262,8 +48332,6 @@ aDh
 aDh
 aDh
 aDh
-aDh
-aDh
 aMr
 aEi
 aEi
@@ -48273,6 +48341,8 @@ aEi
 aEi
 aEi
 aEi
+aEi
+aEi
 acT
 aEi
 aEi
@@ -48456,13 +48526,13 @@ aDh
 aDh
 aDh
 aDh
-aDh
-aDh
 aMr
 aBg
 aVZ
 aVZ
 aVZ
+aVZ
+aVZ
 ark
 aEU
 aEU
@@ -48650,8 +48720,6 @@ aDh
 aDh
 aDh
 aDh
-aDh
-aDh
 aQv
 aag
 aag
@@ -48661,6 +48729,8 @@ aag
 aag
 aag
 aag
+aag
+aag
 acT
 aag
 aag
@@ -48844,8 +48914,6 @@ avW
 avW
 aDh
 aDh
-aDh
-aDh
 aQv
 aOe
 aiv
@@ -48855,6 +48923,8 @@ aiv
 aiv
 aiv
 aiv
+aiv
+aiv
 acT
 aiv
 aiv
@@ -49038,8 +49108,6 @@ avW
 avW
 avW
 avW
-aDh
-aDh
 aQv
 aEi
 aEi
@@ -49049,6 +49117,8 @@ aEi
 aEi
 aEi
 aEi
+aEi
+aEi
 acT
 aEi
 aEi
@@ -49232,13 +49302,13 @@ avW
 avW
 avW
 avW
-avW
-aDh
 aQv
 aBg
 aVZ
 aVZ
 aVZ
+aVZ
+aVZ
 ark
 aEU
 aEU
@@ -49426,8 +49496,6 @@ avW
 avW
 avW
 avW
-avW
-avW
 aQv
 aag
 aag
@@ -49437,6 +49505,8 @@ aag
 aag
 aag
 aag
+aag
+aag
 acT
 aag
 aag
@@ -49620,13 +49690,13 @@ avW
 avW
 avW
 avW
-avW
-avW
 aQv
 aOe
 aOe
 aOe
 aOe
+aOe
+aOe
 aiv
 aiv
 aiv
@@ -49814,8 +49884,6 @@ avW
 avW
 avW
 avW
-abk
-avW
 aQv
 aEi
 aEi
@@ -49825,6 +49893,8 @@ aEi
 aEi
 aEi
 aEi
+aEi
+aEi
 acT
 aEi
 aEi
@@ -50008,13 +50078,13 @@ avW
 avW
 avW
 avW
-avW
-avW
 aQv
 aBg
 aVZ
 aVZ
 aVZ
+aVZ
+aVZ
 ark
 aEU
 aEU
@@ -50179,8 +50249,7 @@ aDh
 aDh
 aDh
 aEh
-aEh
-avW
+axY
 avW
 avW
 avW
@@ -50203,7 +50272,8 @@ avW
 avW
 avW
 avW
-axY
+aQv
+aZT
 aZT
 aag
 aag
@@ -50408,25 +50478,25 @@ auG
 auG
 auG
 acT
-auG
-auG
-auG
-auG
-auG
-aew
-aew
-aew
-aew
-aew
-aew
-aew
-aew
-aew
-aew
-aew
-aew
-aew
-aDh
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+cTW
+aSY
 aTq
 aMr
 xsx
@@ -50602,25 +50672,25 @@ avW
 avW
 avW
 acT
-avW
-avW
-avW
-avW
-avW
-avW
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aEi
+aSY
 aTq
 aMr
 xsx
@@ -50795,26 +50865,26 @@ avW
 avW
 avW
 avW
-acT
-asZ
-avW
-avW
-awV
-awV
-abk
-avW
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
+evN
+akv
+akv
+akv
+aml
+aPQ
+akv
+akv
+aml
+akv
+akv
+aml
+aPQ
+aPQ
+aPQ
+aPQ
+aPQ
+aPQ
+aET
+aSY
 aTq
 aMr
 xsx
@@ -50990,25 +51060,25 @@ avW
 awV
 awV
 aPI
-awV
-awV
-awV
-awV
-awV
-awV
-avW
-awV
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aag
+aSY
 aTq
 aMr
 xsx
@@ -51193,15 +51263,15 @@ awV
 avt
 awV
 awV
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
-aDh
+aew
+aew
+aew
+aew
+aew
+aew
+aew
+aew
+aew
 aDh
 aTq
 aMr
@@ -58786,7 +58856,7 @@ anq
 agq
 aCM
 anq
-agH
+uQS
 abG
 anq
 akf