diff --git a/code/modules/effects/map_effects/window_spawner.dm b/code/modules/effects/map_effects/window_spawner.dm
index 3cebf89a983..d2c7e9c83a2 100644
--- a/code/modules/effects/map_effects/window_spawner.dm
+++ b/code/modules/effects/map_effects/window_spawner.dm
@@ -236,6 +236,10 @@
 	icon_state = "full_rwindow_shuttle"
 	window_path = /obj/structure/window/full/reinforced
 
+/obj/effect/map_effect/window_spawner/full/shuttle/spaceship
+	icon_state = "full_rwindow_shuttle_spaceship"
+	frame_color = "#81868B"
+
 /obj/effect/map_effect/window_spawner/full/shuttle/scc
 	icon_state = "full_rwindow_shuttle_scc"
 	frame_color = "#AAAFC7"
diff --git a/html/changelogs/Ben10083 - Orion Ship Revamp.yml b/html/changelogs/Ben10083 - Orion Ship Revamp.yml
index af843f4068f..bb9d8d87936 100644
--- a/html/changelogs/Ben10083 - Orion Ship Revamp.yml	
+++ b/html/changelogs/Ben10083 - Orion Ship Revamp.yml	
@@ -55,4 +55,5 @@ delete-after: True
 # 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:
-  - rscadd: "Various improvements to the Orion Express mobile station, including new docking arm for starboard and port docks."
+  - rscadd: "Various improvements to the Orion Express mobile station, including new docking arm for docking in all directions."
+  - code_imp: "New window spawner 'spaceship' variant."
diff --git a/icons/effects/map_effects.dmi b/icons/effects/map_effects.dmi
index b6f8ab13bd9..fbbc8815d5c 100644
Binary files a/icons/effects/map_effects.dmi and b/icons/effects/map_effects.dmi differ
diff --git a/maps/away/ships/orion/orion_express_ship.dmm b/maps/away/ships/orion/orion_express_ship.dmm
index a4738e456e2..e2fbe89b9c0 100644
--- a/maps/away/ships/orion/orion_express_ship.dmm
+++ b/maps/away/ships/orion/orion_express_ship.dmm
@@ -820,6 +820,10 @@
 	dir = 9
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/light{
+	dir = 4;
+	inserted_light = /obj/item/light/tube/colored/blue
+	},
 /turf/simulated/floor,
 /area/ship/orion/docking)
 "cHm" = (
@@ -1286,8 +1290,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/aux{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/firealarm/north,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor,
 /area/ship/orion/docking)
 "eoY" = (
 /obj/structure/cable/green{
@@ -2940,7 +2951,6 @@
 	dir = 5
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/firealarm/south,
 /turf/simulated/floor,
 /area/ship/orion/docking)
 "kYl" = (
@@ -3816,10 +3826,6 @@
 	dir = 4;
 	name = "Toilet"
 	},
-/obj/machinery/door/airlock/silver{
-	dir = 4;
-	name = "Kitchen"
-	},
 /turf/simulated/floor/tiled/white,
 /area/ship/orion/forehall)
 "nKX" = (
@@ -5184,13 +5190,7 @@
 /turf/simulated/floor,
 /area/ship/orion/bridge)
 "sAp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
-	dir = 8
-	},
-/obj/machinery/light{
-	pixel_y = -2
-	},
-/turf/simulated/floor/tiled/dark,
+/obj/effect/map_effect/window_spawner/full/shuttle/spaceship,
 /area/ship/orion/docking)
 "sBH" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -6046,6 +6046,7 @@
 	dir = 5
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/firealarm/south,
 /turf/simulated/floor,
 /area/ship/orion/docking)
 "vjR" = (
@@ -6374,6 +6375,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/ship/orion/shop)
+"wdM" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+	dir = 5
+	},
+/obj/machinery/light{
+	pixel_y = -2
+	},
+/turf/simulated/floor/tiled/dark,
+/area/ship/orion/docking)
 "wgM" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/cable/green{
@@ -33933,7 +33943,7 @@ xRX
 ppM
 qnR
 cds
-nXS
+wdM
 ppM
 xRX
 xRX
@@ -34187,11 +34197,11 @@ xRX
 xRX
 xRX
 xRX
-ppM
+sAp
 qnR
 qnR
 kYO
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -34444,11 +34454,11 @@ xRX
 bPp
 xRX
 xRX
-ppM
+sAp
 qnR
 qnR
+kYO
 sAp
-ppM
 xRX
 xRX
 xRX
@@ -34701,11 +34711,11 @@ xRX
 xRX
 xRX
 xRX
-ppM
+sAp
 qnR
 viE
 kUD
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -34958,11 +34968,11 @@ xRX
 xRX
 xRX
 xRX
-ppM
+sAp
 qnR
 qnR
 wXU
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -38794,18 +38804,18 @@ auV
 ppM
 ppM
 ppM
+sAp
+sAp
+sAp
+sAp
 ppM
 ppM
 ppM
 ppM
-ppM
-ppM
-ppM
-ppM
-ppM
-ppM
-ppM
-ppM
+sAp
+sAp
+sAp
+sAp
 ppM
 ppM
 ppM
@@ -39074,7 +39084,7 @@ qnR
 qnR
 qnR
 gMn
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -39331,7 +39341,7 @@ qnR
 qnR
 qnR
 gMn
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -39571,9 +39581,9 @@ sBH
 qqS
 qqS
 wWe
+qEK
 qqS
 qqS
-qEK
 qqS
 qqS
 qqS
@@ -39586,9 +39596,9 @@ fGW
 qqS
 qqS
 qqS
-qEK
+qqS
 cAn
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -39830,6 +39840,10 @@ nmt
 ppM
 ppM
 ppM
+sAp
+sAp
+sAp
+sAp
 ppM
 ppM
 ppM
@@ -39837,13 +39851,9 @@ ppM
 ppM
 ppM
 ppM
-ppM
-ppM
-ppM
-ppM
-ppM
-ppM
-ppM
+sAp
+sAp
+sAp
 ppM
 ppM
 xRX
@@ -43165,7 +43175,7 @@ xRX
 xRX
 xRX
 ppM
-upw
+enf
 qnR
 qnR
 ppM
@@ -43682,7 +43692,7 @@ ppM
 hdc
 soA
 qnR
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -43935,11 +43945,11 @@ xRX
 xRX
 xRX
 xRX
-ppM
+sAp
 nAU
 qnR
 qnR
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -44192,11 +44202,11 @@ xRX
 xRX
 xRX
 xRX
-ppM
+sAp
 qVI
 rZb
 qnR
-ppM
+sAp
 xRX
 xRX
 bPp
@@ -44449,11 +44459,11 @@ xRX
 xRX
 xRX
 xRX
-ppM
+sAp
 kYO
 qnR
 qnR
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -44706,11 +44716,11 @@ xRX
 xRX
 xRX
 xRX
-ppM
-enf
+sAp
+kYO
 qnR
 qnR
-ppM
+sAp
 xRX
 xRX
 xRX
@@ -44967,7 +44977,7 @@ ppM
 rpV
 qnR
 qnR
-ppM
+sAp
 xRX
 xRX
 bPp