diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index b6ebd5e595c..30f723a6d9b 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -5464,13 +5464,6 @@
 /area/ruin/unpowered/syndicate_lava_base/telecomms)
 "nJ" = (
 /obj/structure/table/reinforced,
-/obj/item/device/radio/intercom{
-	broadcasting = 0;
-	dir = 8;
-	freerange = 1;
-	listening = 1;
-	name = "Pirate Radio Listening Channel"
-	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -5798,11 +5791,8 @@
 "oj" = (
 /obj/structure/table/reinforced,
 /obj/item/device/radio/intercom{
-	broadcasting = 1;
-	dir = 8;
 	freerange = 1;
-	listening = 0;
-	name = "Pirate Radio Broadcast Channel"
+	name = "Syndicate Radio Intercom"
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index e71104ff663..b738fdbba1e 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -678,6 +678,7 @@
 /area/shuttle/caravan/pirate)
 "dI" = (
 /obj/machinery/atmospherics/components/unary/tank/air,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "dJ" = (
@@ -721,6 +722,9 @@
 /obj/structure/reagent_dispensers/watertank,
 /obj/item/reagent_containers/glass/bucket,
 /obj/item/mop,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "dQ" = (
@@ -731,13 +735,13 @@
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "dR" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Engineering"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering{
+	name = "Engineering"
+	},
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "dS" = (
@@ -824,6 +828,9 @@
 /area/shuttle/caravan/pirate)
 "eb" = (
 /obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "ec" = (
@@ -863,13 +870,13 @@
 /turf/open/floor/plasteel/floorgrime,
 /area/shuttle/caravan/pirate)
 "ei" = (
-/obj/machinery/door/airlock/medical/glass{
-	name = "Medbay"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/medical/glass{
+	name = "Medbay"
+	},
 /turf/open/floor/plasteel/floorgrime,
 /area/shuttle/caravan/pirate)
 "ej" = (
@@ -906,6 +913,9 @@
 	dir = 4
 	},
 /obj/machinery/space_heater,
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "eo" = (
@@ -1177,6 +1187,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "eW" = (
@@ -1275,13 +1288,13 @@
 	},
 /area/shuttle/caravan/pirate)
 "ff" = (
-/obj/machinery/door/airlock/command{
-	name = "Bridge"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command{
+	name = "Bridge"
+	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -1313,8 +1326,7 @@
 /obj/machinery/button/door{
 	id = "caravanpirate_bridge";
 	name = "Bridge Blast Door Control";
-	pixel_x = -16;
-	req_access_txt = "150"
+	pixel_x = -16
 	},
 /turf/open/floor/plasteel/darkred/side,
 /area/shuttle/caravan/pirate)
@@ -1338,6 +1350,9 @@
 /obj/item/stack/sheet/mineral/plasma{
 	amount = 20
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "fl" = (
@@ -1361,11 +1376,11 @@
 /turf/open/floor/plasteel/floorgrime,
 /area/shuttle/caravan/pirate)
 "fp" = (
-/obj/machinery/door/airlock/security,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security,
 /turf/open/floor/plasteel/floorgrime,
 /area/shuttle/caravan/pirate)
 "fq" = (
@@ -1401,6 +1416,9 @@
 	anchored = 1
 	},
 /obj/item/wrench,
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "fu" = (
@@ -1474,6 +1492,7 @@
 /obj/machinery/cell_charger,
 /obj/item/stack/cable_coil/yellow,
 /obj/item/stock_parts/cell/high,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/plating,
 /area/shuttle/caravan/pirate)
 "fD" = (
@@ -1552,13 +1571,13 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/caravan/freighter1)
 "fO" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Engine Room"
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Engine Room"
+	},
 /turf/open/floor/plating/airless,
 /area/shuttle/caravan/freighter1)
 "fP" = (
@@ -2052,13 +2071,13 @@
 	},
 /area/shuttle/caravan/freighter1)
 "hi" = (
-/obj/machinery/door/airlock/command{
-	name = "Bridge"
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/door/airlock/command{
+	name = "Bridge"
+	},
 /turf/open/floor/plasteel/airless/dark,
 /area/shuttle/caravan/freighter1)
 "hj" = (
@@ -3191,7 +3210,7 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/caravan/syndicate2)
 "km" = (
-/obj/machinery/camera{
+/obj/machinery/camera/xray{
 	c_tag = "External View";
 	dir = 1;
 	network = list("caravansyndicate2");
@@ -3308,7 +3327,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/structure/closet/syndicate/personal,
+/obj/structure/closet/syndicate/personal{
+	anchored = 1
+	},
 /obj/machinery/light/small{
 	dir = 4
 	},
@@ -3318,7 +3339,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/structure/closet/syndicate,
+/obj/structure/closet/syndicate{
+	anchored = 1
+	},
 /obj/structure/sign/warning/vacuum{
 	pixel_y = 32
 	},
@@ -3460,8 +3483,10 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/obj/structure/closet/syndicate,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/syndicate{
+	anchored = 1
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/caravan/syndicate3)
 "kO" = (
@@ -3477,7 +3502,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/obj/structure/closet/syndicate,
+/obj/structure/closet/syndicate{
+	anchored = 1
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/caravan/syndicate3)
 "kQ" = (
@@ -3606,7 +3633,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/caravan/syndicate1)
 "kX" = (
-/obj/machinery/camera{
+/obj/machinery/camera/xray{
 	c_tag = "External View";
 	dir = 4;
 	network = list("caravansyndicate1");
@@ -3691,8 +3718,10 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/obj/structure/closet/syndicate,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/syndicate{
+	anchored = 1
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/caravan/syndicate3)
 "ll" = (
@@ -3763,23 +3792,27 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/structure/closet/syndicate/personal,
 /obj/machinery/light/small{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/syndicate/personal{
+	anchored = 1
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/caravan/syndicate3)
 "lv" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/structure/closet/syndicate,
 /obj/structure/sign/warning/vacuum{
 	pixel_y = -32
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/syndicate{
+	anchored = 1
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/caravan/syndicate3)
 "lw" = (
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index b25b2482eef..e9fd25bb52e 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -3,7 +3,7 @@
 /turf/template_noop,
 /area/template_noop)
 "ab" = (
-/turf/closed/mineral,
+/turf/closed/mineral/random,
 /area/ruin/unpowered/no_grav)
 "ac" = (
 /turf/closed/wall,
@@ -23,14 +23,12 @@
 /area/ruin/space/has_grav/listeningstation)
 "ae" = (
 /obj/structure/table/reinforced,
-/obj/item/paper_bin,
 /obj/machinery/firealarm{
 	dir = 2;
 	pixel_y = 24
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/item/paper/fluff/ruins/listeningstation/reports/november,
-/obj/item/pen,
+/obj/machinery/computer/libraryconsole/bookmanagement,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/listeningstation)
 "af" = (
@@ -53,6 +51,14 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/newscaster{
+	pixel_y = 32
+	},
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "Syndicate Radio Intercom";
+	pixel_x = -30
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/listeningstation)
 "ai" = (
@@ -145,11 +151,11 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/ruin/space/has_grav/listeningstation)
 "as" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/machinery/computer/med_data/syndie{
 	dir = 4;
 	req_one_access = null
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/listeningstation)
 "at" = (
@@ -183,6 +189,10 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 25
 	},
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/paper/fluff/ruins/listeningstation/reports/november,
+/obj/item/pen,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/listeningstation)
 "aw" = (
@@ -367,10 +377,6 @@
 /area/ruin/space/has_grav/listeningstation)
 "aK" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/hatch{
-	name = "Telecommunications";
-	req_access_txt = "150"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -378,6 +384,10 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
+/obj/machinery/door/airlock/hatch{
+	name = "Telecommunications";
+	req_access_txt = "150"
+	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -391,16 +401,16 @@
 /area/ruin/space/has_grav/listeningstation)
 "aM" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/hatch{
-	name = "E.V.A. Equipment";
-	req_access_txt = "150"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	piping_layer = 3;
 	pixel_x = 5;
 	pixel_y = 5
 	},
+/obj/machinery/door/airlock/hatch{
+	name = "E.V.A. Equipment";
+	req_access_txt = "150"
+	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -411,7 +421,7 @@
 	dir = 8;
 	pixel_x = -26
 	},
-/obj/structure/showcase/machinery/microwave,
+/obj/machinery/microwave,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -459,9 +469,6 @@
 /area/ruin/space/has_grav/listeningstation)
 "aR" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock{
-	name = "Personal Quarters"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
@@ -471,6 +478,9 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
+/obj/machinery/door/airlock{
+	name = "Personal Quarters"
+	},
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "aS" = (
@@ -746,9 +756,6 @@
 /area/ruin/space/has_grav/listeningstation)
 "bo" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
-	name = "Medbay"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -756,6 +763,9 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
+/obj/machinery/door/airlock/medical/glass{
+	name = "Medbay"
+	},
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav/listeningstation)
 "bp" = (
@@ -834,11 +844,9 @@
 	},
 /area/ruin/space/has_grav/listeningstation)
 "bu" = (
-/obj/machinery/sleeper/syndie{
-	dir = 8
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet/medical1,
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav/listeningstation)
 "bv" = (
@@ -988,6 +996,25 @@
 	dir = 5
 	},
 /area/ruin/space/has_grav/listeningstation)
+"bJ" = (
+/obj/docking_port/stationary{
+	dir = 4;
+	dwidth = 6;
+	height = 7;
+	id = "caravansyndicate3_listeningpost";
+	name = "Syndicate Listening Post";
+	width = 15
+	},
+/obj/docking_port/stationary{
+	dir = 4;
+	dwidth = 4;
+	height = 5;
+	id = "caravansyndicate1_listeningpost";
+	name = "Syndicate Listening Post";
+	width = 9
+	},
+/turf/template_noop,
+/area/template_noop)
 
 (1,1,1) = {"
 aa
@@ -2239,7 +2266,7 @@ aa
 aa
 aa
 aa
-aa
+bJ
 aa
 aa
 aa
diff --git a/code/modules/ruins/spaceruin_code/caravanambush.dm b/code/modules/ruins/spaceruin_code/caravanambush.dm
index e6b928f3330..603af76f1a7 100644
--- a/code/modules/ruins/spaceruin_code/caravanambush.dm
+++ b/code/modules/ruins/spaceruin_code/caravanambush.dm
@@ -99,7 +99,7 @@
 	req_access = list(ACCESS_SYNDICATE)
 	circuit = /obj/item/circuitboard/computer/caravan/syndicate1
 	shuttleId = "caravansyndicate1"
-	possible_destinations = "caravansyndicate1_custom;caravansyndicate1_ambush"
+	possible_destinations = "caravansyndicate1_custom;caravansyndicate1_ambush;caravansyndicate1_listeningpost"
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1
 	name = "Syndicate Fighter Navigation Computer"
@@ -110,7 +110,7 @@
 	lock_override = NONE
 	shuttlePortId = "caravansyndicate1_custom"
 	shuttlePortName = "Custom Location"
-	jumpto_ports = list("caravansyndicate1_ambush" = 1)
+	jumpto_ports = list("caravansyndicate1_ambush" = 1, "caravansyndicate1_listeningpost" = 1)
 	view_range = 7
 	x_offset = 2
 	y_offset = 0
@@ -124,7 +124,7 @@
 	light_color = LIGHT_COLOR_RED
 	circuit = /obj/item/circuitboard/computer/caravan/syndicate2
 	shuttleId = "caravansyndicate2"
-	possible_destinations = "caravansyndicate2_custom;caravansyndicate2_ambush"
+	possible_destinations = "caravansyndicate2_custom;caravansyndicate2_ambush;caravansyndicate1_listeningpost"
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate2
 	name = "Syndicate Fighter Navigation Computer"
@@ -135,7 +135,7 @@
 	lock_override = NONE
 	shuttlePortId = "caravansyndicate2_custom"
 	shuttlePortName = "Custom Location"
-	jumpto_ports = list("caravansyndicate2_ambush" = 1)
+	jumpto_ports = list("caravansyndicate2_ambush" = 1, "caravansyndicate1_listeningpost" = 1)
 	view_range = 7
 	x_offset = 0
 	y_offset = 2
@@ -149,7 +149,7 @@
 	light_color = LIGHT_COLOR_RED
 	circuit = /obj/item/circuitboard/computer/caravan/syndicate3
 	shuttleId = "caravansyndicate3"
-	possible_destinations = "caravansyndicate3_custom;caravansyndicate3_ambush"
+	possible_destinations = "caravansyndicate3_custom;caravansyndicate3_ambush;caravansyndicate3_listeningpost"
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate3
 	name = "Syndicate Drop Ship Navigation Computer"
@@ -160,7 +160,7 @@
 	lock_override = NONE
 	shuttlePortId = "caravansyndicate3_custom"
 	shuttlePortName = "Custom Location"
-	jumpto_ports = list("caravansyndicate3_ambush" = 1)
+	jumpto_ports = list("caravansyndicate3_ambush" = 1, "caravansyndicate3_listeningpost" = 1)
 	view_range = 10
 	x_offset = -1
 	y_offset = -3
\ No newline at end of file