diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm
index 3304429885e..8cb413b42f0 100644
--- a/_maps/map_files/moonstation/moonstation.dmm
+++ b/_maps/map_files/moonstation/moonstation.dmm
@@ -2029,9 +2029,9 @@
 /turf/open/floor/iron,
 /area/station/cargo/miningdock)
 "aEz" = (
-/obj/machinery/transport/destination_sign/indicator/directional/south,
 /obj/machinery/button/transport/tram/directional/south{
-	id = 1
+	id = 1;
+	specific_transport_id = "moon_1"
 	},
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
 /obj/machinery/camera/autoname/directional/south{
@@ -3865,11 +3865,10 @@
 /area/station/engineering/atmos)
 "beV" = (
 /obj/structure/transport/linear/tram,
-/obj/structure/fluff/tram_rail/electric{
-	dir = 1
+/obj/structure/tram,
+/obj/machinery/transport/destination_sign/moonstation{
+	pixel_x = 16
 	},
-/obj/machinery/computer/tram_controls/directional/south,
-/obj/structure/thermoplastic,
 /turf/open/floor/plating,
 /area/station/terminal/lobby)
 "beY" = (
@@ -7882,6 +7881,16 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron/showroomfloor,
 /area/station/commons/toilet/auxiliary)
+"cvG" = (
+/obj/structure/chair/sofa/bench/tram/right{
+	dir = 8
+	},
+/obj/structure/transport/linear/tram,
+/obj/structure/fluff/tram_rail/electric,
+/obj/structure/thermoplastic/light,
+/obj/machinery/computer/tram_controls/moonstation/directional/north,
+/turf/open/floor/plating,
+/area/station/terminal/lobby)
 "cvT" = (
 /obj/item/radio/intercom/directional/south,
 /obj/structure/disposalpipe/trunk{
@@ -9706,6 +9715,15 @@
 	},
 /turf/open/floor/iron/dark/corner,
 /area/station/hallway/primary/starboard)
+"cZy" = (
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
+	},
+/obj/machinery/transport/power_rectifier,
+/turf/open/floor/iron/dark/corner{
+	dir = 1
+	},
+/area/station/hallway/primary/tram/left)
 "cZH" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
@@ -10523,6 +10541,10 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
+"dlk" = (
+/obj/machinery/transport/destination_sign/indicator/moonstation,
+/turf/closed/wall,
+/area/station/hallway/primary/tram/left)
 "dll" = (
 /turf/open/floor/carpet/red,
 /area/station/service/library/artgallery)
@@ -15768,6 +15790,15 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark/corner,
 /area/station/common/pool)
+"ePz" = (
+/obj/structure/transport/linear/tram,
+/obj/structure/fluff/tram_rail/electric{
+	dir = 1
+	},
+/obj/structure/thermoplastic,
+/obj/machinery/computer/tram_controls/moonstation/directional/south,
+/turf/open/floor/plating,
+/area/station/terminal/lobby)
 "ePE" = (
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 8
@@ -31457,7 +31488,6 @@
 "jFl" = (
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
 /obj/structure/closet/emcloset,
-/obj/machinery/newscaster/directional/south,
 /turf/open/floor/iron,
 /area/station/terminal/lobby)
 "jFn" = (
@@ -31778,7 +31808,6 @@
 /area/station/security/detectives_office)
 "jKF" = (
 /obj/structure/transport/linear/tram,
-/obj/machinery/transport/tram_controller,
 /obj/structure/tram/alt/titanium,
 /turf/open/floor/plating,
 /area/station/terminal/lobby)
@@ -35026,6 +35055,9 @@
 /obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"kKt" = (
+/turf/closed/wall/r_wall,
+/area/station/hallway/primary/tram/left)
 "kKy" = (
 /turf/closed/wall,
 /area/station/commons/dorms/room3)
@@ -36183,14 +36215,8 @@
 /turf/open/floor/iron/white,
 /area/station/command/heads_quarters/cmo)
 "lby" = (
-/obj/structure/chair/sofa/bench/tram/right{
-	dir = 8
-	},
-/obj/structure/transport/linear/tram,
-/obj/structure/fluff/tram_rail/electric,
-/obj/machinery/computer/tram_controls/directional/north,
-/obj/structure/thermoplastic/light,
-/turf/open/floor/plating,
+/obj/machinery/transport/destination_sign/indicator/moonstation,
+/turf/closed/wall,
 /area/station/terminal/lobby)
 "lbH" = (
 /obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -40335,9 +40361,9 @@
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "mlr" = (
-/obj/machinery/transport/destination_sign/indicator/directional/south,
 /obj/machinery/button/transport/tram/directional/south{
-	id = 3
+	id = 2;
+	specific_transport_id = "moon_1"
 	},
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -42694,9 +42720,9 @@
 /turf/open/floor/mineral/gold,
 /area/station/command/heads_quarters/qm)
 "mWO" = (
+/obj/structure/tram,
 /obj/structure/transport/linear/tram,
-/obj/structure/tram/alt/titanium,
-/obj/machinery/transport/destination_sign/split/south,
+/obj/machinery/transport/tram_controller/moonstation,
 /turf/open/floor/plating,
 /area/station/terminal/lobby)
 "mWT" = (
@@ -43167,9 +43193,8 @@
 /turf/open/floor/plating,
 /area/station/maintenance/port)
 "ndO" = (
-/obj/structure/transport/linear/tram,
 /obj/structure/tram/alt/titanium,
-/obj/structure/plaque/static_plaque/tram,
+/obj/structure/transport/linear/tram,
 /turf/open/floor/plating,
 /area/station/terminal/lobby)
 "ndQ" = (
@@ -51673,9 +51698,11 @@
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/hop)
 "pJF" = (
+/obj/structure/tram,
 /obj/structure/transport/linear/tram,
-/obj/structure/tram/alt/titanium,
-/obj/machinery/transport/destination_sign/split/north,
+/obj/structure/plaque/static_plaque/tram{
+	specific_transport_id = "moon_1"
+	},
 /turf/open/floor/plating,
 /area/station/terminal/lobby)
 "pJW" = (
@@ -72656,6 +72683,12 @@
 /obj/structure/table,
 /turf/open/floor/wood,
 /area/station/engineering/lobby)
+"wcA" = (
+/obj/machinery/transport/power_rectifier{
+	pixel_y = 0
+	},
+/turf/closed/wall/r_wall,
+/area/station/terminal/lobby)
 "wcG" = (
 /obj/structure/table,
 /obj/effect/spawner/random/food_or_drink/cake_ingredients,
@@ -79202,7 +79235,10 @@
 /turf/open/floor/engine,
 /area/station/engineering/atmos/project)
 "ybe" = (
-/obj/machinery/door/airlock/tram,
+/obj/machinery/door/airlock/tram{
+	transport_linked_id = "moon_1";
+	name = "Moon Rover"
+	},
 /obj/structure/transport/linear/tram,
 /obj/structure/thermoplastic/light,
 /turf/open/floor/plating,
@@ -213168,7 +213204,7 @@ sDL
 tjZ
 eUc
 geh
-sDL
+mWO
 tHD
 bGx
 kxs
@@ -213425,7 +213461,7 @@ jKF
 fil
 uiv
 geh
-ndO
+jKF
 tHD
 pQX
 fux
@@ -213678,11 +213714,11 @@ fhy
 iNo
 iNo
 yhM
-pJF
-lby
-syH
 beV
-mWO
+gZD
+syH
+ePz
+beV
 tHD
 eii
 fux
@@ -213936,7 +213972,7 @@ crT
 iNo
 yhM
 mdG
-gZD
+cvG
 fwM
 geh
 mdG
@@ -214196,7 +214232,7 @@ ybe
 iWG
 kBx
 iMX
-sDL
+ndO
 tHD
 asy
 sfL
@@ -214453,7 +214489,7 @@ sqG
 iWG
 eNL
 iMX
-sDL
+pJF
 tHD
 asy
 wpy
@@ -214962,7 +214998,7 @@ idX
 lLr
 cOG
 aEz
-idX
+lby
 ocT
 dmG
 vzC
@@ -215476,7 +215512,7 @@ ahL
 ahL
 ahL
 jFl
-idX
+wcA
 scN
 gEj
 cHz
@@ -230121,8 +230157,8 @@ stM
 jWC
 eYR
 mAX
-vQx
-jhQ
+kKt
+cZy
 eEv
 avW
 aWa
@@ -230379,7 +230415,7 @@ iJZ
 wxh
 iJZ
 iJZ
-hdn
+jhQ
 eEv
 avW
 aWa
@@ -231667,7 +231703,7 @@ qup
 hdn
 eEv
 mlr
-hZv
+dlk
 fzs
 wuM
 eWR
diff --git a/code/__DEFINES/~~bubber_defines/transport.dm b/code/__DEFINES/~~bubber_defines/transport.dm
new file mode 100644
index 00000000000..51f81a714e6
--- /dev/null
+++ b/code/__DEFINES/~~bubber_defines/transport.dm
@@ -0,0 +1,6 @@
+// Tram lines
+#define MOONSTATION_LINE_1 "moon_1"
+
+// Destinations/platforms
+#define MOONSTATION_TERMINAL 1
+#define MOONSTATION_MAIN_STATION 2
diff --git a/code/modules/transport/tram/tram_displays.dm b/code/modules/transport/tram/tram_displays.dm
index 1975a54e7e6..0e36295f97e 100644
--- a/code/modules/transport/tram/tram_displays.dm
+++ b/code/modules/transport/tram/tram_displays.dm
@@ -123,13 +123,6 @@
 		update_appearance()
 		return
 
-	//BUBBERSTATION CHANGE START: FIXES 2-DESTINATION TRAMS
-	if(travel_direction == NONE)
-		sign_face = null
-		update_appearance()
-		return
-	//BUBBERSTATION CHANGE END: FIXES 2-DESTINATION TRAMS
-
 	sign_face = ""
 	sign_face += "[base_icon_state]_"
 	if(!LAZYFIND(available_faces, controller.specific_transport_id))
diff --git a/modular_zubbers/code/modules/transport/transport_navigation.dm b/modular_zubbers/code/modules/transport/transport_navigation.dm
deleted file mode 100644
index f5d05fe1b93..00000000000
--- a/modular_zubbers/code/modules/transport/transport_navigation.dm
+++ /dev/null
@@ -1,19 +0,0 @@
-//Moon Station
-
-/obj/effect/landmark/transport/transport_id/moonstation/line_1
-	specific_transport_id = TRAMSTATION_LINE_1
-
-/obj/effect/landmark/transport/nav_beacon/tram/nav/moonstation/main
-	name = TRAMSTATION_LINE_1
-	specific_transport_id = TRAM_NAV_BEACONS
-	dir = WEST
-
-/obj/effect/landmark/transport/nav_beacon/tram/platform/moonstation/terminal
-	name = "Terminal"
-	platform_code = TRAMSTATION_WEST
-	tgui_icons = list("Terminal" = "plane-arrival")
-
-/obj/effect/landmark/transport/nav_beacon/tram/platform/moonstation/station
-	name = "Station"
-	platform_code = TRAMSTATION_EAST
-	tgui_icons = list("Station" = "plane-departure")
diff --git a/modular_zubbers/modules/bubber_tram/code/moonstation_tram.dm b/modular_zubbers/modules/bubber_tram/code/moonstation_tram.dm
new file mode 100644
index 00000000000..ca001ff0b5b
--- /dev/null
+++ b/modular_zubbers/modules/bubber_tram/code/moonstation_tram.dm
@@ -0,0 +1,58 @@
+/obj/effect/landmark/transport/transport_id/moonstation/line_1
+	specific_transport_id = MOONSTATION_LINE_1
+
+/obj/effect/landmark/transport/nav_beacon/tram/nav/moonstation/main
+	name = MOONSTATION_LINE_1
+	specific_transport_id = TRAM_NAV_BEACONS
+	dir = WEST
+
+/obj/effect/landmark/transport/nav_beacon/tram/platform/moonstation/terminal
+	name = "Arrivals Terminal"
+	specific_transport_id = MOONSTATION_LINE_1
+	platform_code = MOONSTATION_TERMINAL
+	tgui_icons = list("Arrivals Terminal" = "plane-arrival", "Cryogenic Sleepers" = "bed-pulse")
+
+/obj/effect/landmark/transport/nav_beacon/tram/platform/moonstation/station
+	name = "Main Station"
+	specific_transport_id = MOONSTATION_LINE_1
+	platform_code = MOONSTATION_MAIN_STATION
+	tgui_icons = list("Main Station" = "arrow-right-to-city", "Departures/Evac" = "plane-departure")
+
+/obj/machinery/transport/tram_controller/moonstation
+	name = "moon rover controller"
+	desc = "Unlike the iconic moon rover of yesteryears, our tram is here to remind you that even in space, mediocrity finds a way."
+	configured_transport_id = MOONSTATION_LINE_1
+	obj_flags = parent_type::obj_flags | NO_DECONSTRUCTION
+
+/obj/machinery/transport/destination_sign/moonstation
+	icon = 'modular_zubbers/modules/bubber_tram/icons/tram_display.dmi'
+	configured_transport_id = MOONSTATION_LINE_1
+
+/obj/machinery/transport/destination_sign/indicator/moonstation
+	icon = 'modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi'
+	configured_transport_id = MOONSTATION_LINE_1
+
+/obj/machinery/transport/destination_sign/Initialize(mapload)
+	. = ..()
+	LAZYADD(available_faces, MOONSTATION_LINE_1)
+
+/obj/machinery/computer/tram_controls/moonstation
+	name = "moon rover controls"
+	desc = "Unlike the iconic moon rover of yesteryears, our tram is here to remind you that even in space, mediocrity finds a way."
+	icon = 'modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi'
+	icon_screen = MOONSTATION_LINE_1
+	specific_transport_id = MOONSTATION_LINE_1
+
+/obj/machinery/computer/tram_controls/moonstation/directional/north
+	dir = SOUTH
+	pixel_x = -16
+	pixel_y = 32
+
+/obj/machinery/computer/tram_controls/moonstation/directional/south
+	dir = NORTH
+	pixel_x = 16
+	pixel_y = -32
+
+/obj/machinery/door/airlock/tram/moonstation
+	name = "moon rover door"
+	transport_linked_id = MOONSTATION_LINE_1
diff --git a/modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi b/modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi
new file mode 100644
index 00000000000..0b3909e962d
Binary files /dev/null and b/modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi differ
diff --git a/modular_zubbers/modules/bubber_tram/icons/tram_display.dmi b/modular_zubbers/modules/bubber_tram/icons/tram_display.dmi
new file mode 100644
index 00000000000..460c0eb54e5
Binary files /dev/null and b/modular_zubbers/modules/bubber_tram/icons/tram_display.dmi differ
diff --git a/modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi b/modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi
new file mode 100644
index 00000000000..5b79d162f7f
Binary files /dev/null and b/modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 8b6d7756f39..9484dfa29e5 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -486,6 +486,7 @@
 #include "code\__DEFINES\~~bubber_defines\species.dm"
 #include "code\__DEFINES\~~bubber_defines\status_indicator_defines.dm"
 #include "code\__DEFINES\~~bubber_defines\traits.dm"
+#include "code\__DEFINES\~~bubber_defines\transport.dm"
 #include "code\__DEFINES\~~bubber_defines\___HELPERS\global_lists.dm"
 #include "code\__HELPERS\_auxtools_api.dm"
 #include "code\__HELPERS\_lists.dm"
@@ -8494,7 +8495,6 @@
 #include "modular_zubbers\code\modules\surgery\organs\internal\eyes\_eyes.dm"
 #include "modular_zubbers\code\modules\surgery\organs\internal\lungs\_lungs.dm"
 #include "modular_zubbers\code\modules\traitor\goal_overrides.dm"
-#include "modular_zubbers\code\modules\transport\transport_navigation.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\dangerous.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
@@ -8553,6 +8553,7 @@
 #include "modular_zubbers\modules\borgs\code\robot_items.dm"
 #include "modular_zubbers\modules\borgs\code\robot_model.dm"
 #include "modular_zubbers\modules\borgs\code\robot_upgrade.dm"
+#include "modular_zubbers\modules\bubber_tram\code\moonstation_tram.dm"
 #include "modular_zubbers\modules\client\code\chat_color.dm"
 #include "modular_zubbers\modules\client\code\preferences.dm"
 #include "modular_zubbers\modules\client\code\ssd.dm"
diff --git a/tgui/packages/tgui/interfaces/TramControl.tsx b/tgui/packages/tgui/interfaces/TramControl.tsx
index 74b93c61dec..ff39679f754 100644
--- a/tgui/packages/tgui/interfaces/TramControl.tsx
+++ b/tgui/packages/tgui/interfaces/TramControl.tsx
@@ -38,6 +38,11 @@ const DEPARTMENT2COLOR = {
   Ordnance: 'yellow',
   Office: 'red',
   Dormitories: 'black',
+  // BUBBER EDIT ADD - Moonstation
+  'Arrivals Terminal': 'yellow',
+  'Cryogenic Sleepers': 'purple',
+  'Main Station': 'blue',
+  'Departures/Evac': 'green',
 } as const;
 
 const COLOR2BLURB = {