diff --git a/maps/offmap_vr/om_ships/bearcat.dm b/maps/offmap_vr/om_ships/bearcat.dm
index 90c54d70c41..003e938803d 100644
--- a/maps/offmap_vr/om_ships/bearcat.dm
+++ b/maps/offmap_vr/om_ships/bearcat.dm
@@ -44,6 +44,7 @@
 	defer_initialisation = TRUE //We're not loaded until an admin does it
 	fuel_consumption = 4 //chonker uses more fuel
 	move_direction = NORTH
+	ceiling_type = /turf/simulated/floor/reinforced/airless
 
 // A shuttle lateloader landmark
 /obj/effect/shuttle_landmark/shuttle_initializer/bearcat
diff --git a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
index 01b4643cd3b..a1fced18ed8 100644
--- a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
+++ b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
@@ -455,7 +455,6 @@
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "kd" = (
-/obj/machinery/door/airlock/hatch,
 /obj/effect/map_helper/airlock/sensor/ext_sensor,
 /obj/effect/map_helper/airlock/door/ext_door,
 /obj/machinery/airlock_sensor/airlock_exterior/shuttle{
@@ -464,8 +463,16 @@
 	pixel_y = 26
 	},
 /obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
 	id = "gecko_wreck_cr_blast";
-	name = "Blast Shields"
+	name = "Blast Shields";
+	opacity = 0
+	},
+/obj/machinery/door/airlock/hatch{
+	density = 0;
+	icon_state = "door_open";
+	opacity = 0
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
@@ -1135,16 +1142,6 @@
 /obj/structure/table/steel,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_cockpit_wreck)
-"wH" = (
-/obj/structure/railing/grey{
-	dir = 1
-	},
-/obj/structure/catwalk,
-/obj/structure/sign/directions/engineering{
-	pixel_y = -22
-	},
-/turf/simulated/floor/airless,
-/area/shuttle/gecko_cr_wreck)
 "wU" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -2881,9 +2878,13 @@
 /area/shuttle/gecko_cr_cockpit_wreck)
 "YV" = (
 /obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
 	id = "gecko_wreck_cr_blast";
-	name = "Blast Shields"
+	name = "Blast Shields";
+	opacity = 0
 	},
+/obj/structure/grille/broken,
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "Zb" = (
@@ -3570,8 +3571,8 @@ Gx
 Lu
 Vi
 Fe
-wH
-Wr
+TE
+Pf
 ai
 Do
 dO
@@ -3872,7 +3873,7 @@ xU
 xU
 Oz
 BC
-ZJ
+Pf
 WP
 WP
 WP
diff --git a/maps/offmap_vr/om_ships/geckos.dm b/maps/offmap_vr/om_ships/geckos.dm
index d0d9b3098bf..adc7545e8d9 100644
--- a/maps/offmap_vr/om_ships/geckos.dm
+++ b/maps/offmap_vr/om_ships/geckos.dm
@@ -102,6 +102,7 @@
 	shuttle_area = list(/area/shuttle/gecko_sh,/area/shuttle/gecko_sh_cockpit,/area/shuttle/gecko_sh_engineering)
 	defer_initialisation = TRUE //We're not loaded until an admin does it
 	fuel_consumption = 7.5
+	ceiling_type = /turf/simulated/floor/reinforced/airless
 
 /datum/shuttle/autodock/overmap/gecko_cr
 	name = "Gecko Cargo Hauler"
@@ -110,6 +111,7 @@
 	shuttle_area = list(/area/shuttle/gecko_cr,/area/shuttle/gecko_cr_cockpit,/area/shuttle/gecko_cr_engineering)
 	defer_initialisation = TRUE //We're not loaded until an admin does it
 	fuel_consumption = 7.5
+	ceiling_type = /turf/simulated/floor/reinforced/airless
 
 /datum/shuttle/autodock/overmap/gecko_cr_wreck
 	name = "Wrecked Gecko Cargo Hauler"
@@ -118,6 +120,7 @@
 	shuttle_area = list(/area/shuttle/gecko_cr_wreck,/area/shuttle/gecko_cr_cockpit_wreck,/area/shuttle/gecko_cr_engineering_wreck)
 	defer_initialisation = TRUE //We're not loaded until an admin does it
 	fuel_consumption = 7.5
+	ceiling_type = /turf/simulated/floor/reinforced/airless
 
 // A shuttle lateloader landmark
 /obj/effect/shuttle_landmark/shuttle_initializer/gecko_sh
diff --git a/maps/offmap_vr/om_ships/mackerel_hc.dmm b/maps/offmap_vr/om_ships/mackerel_hc.dmm
index d8cb1f4acfc..63ff651cda3 100644
--- a/maps/offmap_vr/om_ships/mackerel_hc.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_hc.dmm
@@ -9,8 +9,13 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mackerel_hc)
 "aF" = (
-/obj/effect/wingrille_spawn/reinforced,
 /obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc)
 "bh" = (
@@ -21,7 +26,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/structure/closet/walllocker/emerglocker/south,
 /obj/machinery/light,
 /obj/machinery/embedded_controller/radio/docking_port_multi{
 	child_names_txt = "Port Airlock Control;Starboard Airlock Control";
@@ -256,7 +260,6 @@
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /obj/structure/window/reinforced,
@@ -316,8 +319,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /turf/simulated/wall/rshull,
 /area/shuttle/mackerel_hc)
@@ -408,7 +410,7 @@
 	},
 /obj/structure/window/reinforced,
 /obj/machinery/door/window,
-/obj/random/multiple/corp_crate,
+/obj/random/multiple/large_corp_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
 "Dh" = (
@@ -425,8 +427,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
@@ -484,10 +485,9 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_x = 0
+	dir = 8
 	},
+/obj/structure/closet/walllocker/emerglocker/west,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
 "Gm" = (
@@ -497,7 +497,7 @@
 	},
 /obj/structure/window/reinforced,
 /obj/machinery/door/window/westright,
-/obj/random/multiple/corp_crate,
+/obj/random/multiple/large_corp_crate,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
 "GF" = (
@@ -555,6 +555,7 @@
 /obj/structure/handrail{
 	dir = 1
 	},
+/obj/structure/closet/walllocker/emerglocker/north,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
 "JQ" = (
@@ -568,7 +569,6 @@
 	},
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
-	icon_state = "extinguisher_closed";
 	pixel_x = -30
 	},
 /obj/structure/window/reinforced,
@@ -586,7 +586,6 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -743,8 +742,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "east bump";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -782,6 +780,7 @@
 	},
 /obj/machinery/light,
 /obj/structure/handrail,
+/obj/structure/closet/walllocker/emerglocker/south,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
 "Wv" = (
@@ -862,8 +861,7 @@
 "ZJ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
 /obj/machinery/computer/ship/engines{
-	dir = 1;
-	icon_state = "computer"
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
@@ -878,12 +876,10 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /turf/simulated/floor/tiled/techfloor,
diff --git a/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm b/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
index 4178045551b..83a9170b7ac 100644
--- a/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
@@ -4,14 +4,22 @@
 	id = "cargo_hatch_port";
 	name = "Port Cargo Hatch"
 	},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced,
 /area/shuttle/mackerel_hc_skel)
 "az" = (
 /turf/simulated/floor/airless,
 /area/shuttle/mackerel_hc_skel)
 "aF" = (
-/obj/effect/wingrille_spawn/reinforced,
 /obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel_cockpit)
 "bw" = (
@@ -52,7 +60,12 @@
 "cg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
-/obj/effect/wingrille_spawn/reinforced,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel_eng)
 "cv" = (
@@ -91,9 +104,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel)
 "fD" = (
-/obj/structure/handrail{
-	dir = 4
-	},
 /obj/machinery/light/small{
 	dir = 1
 	},
@@ -127,6 +137,7 @@
 	dir = 8
 	},
 /obj/structure/railing/grey,
+/obj/structure/closet/walllocker/emerglocker/east,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc_skel)
 "fL" = (
@@ -171,6 +182,11 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel)
 "ju" = (
+/obj/machinery/power/smes/buildable,
+/obj/structure/cable{
+	d2 = 4;
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel)
 "ka" = (
@@ -220,8 +236,11 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mackerel_hc_skel)
 "ms" = (
-/obj/structure/sign/warning/airlock,
-/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/wall/rshull,
 /area/shuttle/mackerel_hc_skel)
 "mw" = (
@@ -299,7 +318,10 @@
 	id = "cargo_hatch_star";
 	name = "Starboard Cargo Hatch"
 	},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/turf/simulated/floor/reinforced,
 /area/shuttle/mackerel_hc_skel)
 "sg" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
@@ -347,7 +369,17 @@
 "ug" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
-/obj/effect/wingrille_spawn/reinforced,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel_cockpit)
 "ul" = (
@@ -386,6 +418,16 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel_cockpit)
 "we" = (
@@ -395,11 +437,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc_skel_eng)
 "wF" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/reinforced,
 /area/shuttle/mackerel_hc_skel)
@@ -424,7 +461,12 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor/glass,
-/obj/effect/wingrille_spawn/reinforced,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel_cockpit)
 "xG" = (
@@ -448,11 +490,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel)
 "zq" = (
-/obj/machinery/power/smes/buildable,
-/obj/structure/cable{
-	d2 = 4;
-	icon_state = "0-4"
-	},
 /obj/structure/sign/warning/vacuum{
 	pixel_x = -32
 	},
@@ -512,17 +549,9 @@
 /area/shuttle/mackerel_hc_skel)
 "Dl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/reinforced,
 /area/shuttle/mackerel_hc_skel)
 "Ds" = (
-/obj/machinery/power/terminal{
-	dir = 1
-	},
 /obj/machinery/light/small{
 	dir = 8
 	},
@@ -575,6 +604,9 @@
 	pixel_x = -24;
 	pixel_y = -8
 	},
+/obj/machinery/power/terminal{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel)
 "EW" = (
@@ -621,10 +653,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel)
-"FN" = (
-/obj/structure/closet/walllocker/emerglocker/north,
-/turf/simulated/wall/rshull,
-/area/shuttle/mackerel_hc_skel)
 "FS" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -670,24 +698,25 @@
 /area/shuttle/mackerel_hc_skel)
 "GI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/wingrille_spawn/reinforced,
 /obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel_eng)
 "GK" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel)
 "Jq" = (
@@ -717,6 +746,7 @@
 	dir = 4;
 	pixel_x = -26
 	},
+/obj/structure/railing/grey,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc_skel)
 "JW" = (
@@ -759,6 +789,9 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
 	},
+/obj/structure/railing/grey{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc_skel)
 "NN" = (
@@ -884,6 +917,9 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
+/obj/structure/railing/grey{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc_skel)
 "RV" = (
@@ -970,6 +1006,7 @@
 	dir = 8;
 	pixel_x = 26
 	},
+/obj/structure/railing/grey,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc_skel)
 "WW" = (
@@ -1270,8 +1307,8 @@ ka
 ka
 sZ
 sZ
+ms
 sZ
-FN
 FH
 Qu
 wF
@@ -1379,7 +1416,7 @@ ka
 sZ
 sZ
 Da
-FN
+sZ
 ED
 um
 LU
@@ -1387,7 +1424,7 @@ RB
 Xn
 Td
 ZK
-ms
+Td
 fL
 KZ
 sZ
diff --git a/maps/offmap_vr/om_ships/mackerel_lc.dmm b/maps/offmap_vr/om_ships/mackerel_lc.dmm
index 400d862d6c4..b1d65389bbf 100644
--- a/maps/offmap_vr/om_ships/mackerel_lc.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_lc.dmm
@@ -12,8 +12,13 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mackerel_lc)
 "aF" = (
-/obj/effect/wingrille_spawn/reinforced,
 /obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_lc)
 "bw" = (
@@ -97,7 +102,6 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -142,13 +146,11 @@
 "lT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /obj/structure/railing/grey,
@@ -273,8 +275,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "east bump";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -321,9 +322,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_x = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc)
@@ -351,8 +350,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
@@ -386,8 +384,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /turf/simulated/wall/rshull,
 /area/shuttle/mackerel_lc)
@@ -412,16 +409,13 @@
 "Ck" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_x = 0
+	dir = 8
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
 	},
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
-	icon_state = "extinguisher_closed";
 	pixel_x = -30
 	},
 /obj/structure/railing/grey,
@@ -486,9 +480,7 @@
 "FH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_x = 0
+	dir = 8
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -519,8 +511,7 @@
 "FS" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
 /obj/machinery/computer/ship/engines{
-	dir = 1;
-	icon_state = "computer"
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc)
@@ -686,8 +677,7 @@
 "So" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -755,9 +745,7 @@
 /area/shuttle/mackerel_lc)
 "Wr" = (
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_x = 0
+	dir = 8
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -819,12 +807,10 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /turf/simulated/floor/tiled/techfloor,
diff --git a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
index cfb6bfaa77a..fa9b016a841 100644
--- a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aq" = (
-/obj/machinery/light/small/flicker{
+/obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor/airless,
@@ -106,7 +106,7 @@
 /area/shuttle/mackerel_lc_wreck)
 "kU" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
-/obj/machinery/light/small/flicker{
+/obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor/airless,
@@ -252,7 +252,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/structure/closet/walllocker/emerglocker/south,
 /obj/machinery/embedded_controller/radio/docking_port_multi{
 	child_names_txt = "Port Airlock Control;Starboard Airlock Control";
 	child_tags_txt = "mackerel_lc_wreck_docking_port;mackerel_lc_wreck_docking_star";
@@ -341,6 +340,7 @@
 /obj/machinery/light/flicker{
 	dir = 8
 	},
+/obj/structure/closet/walllocker/emerglocker/west,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "ut" = (
@@ -349,6 +349,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
+/obj/structure/closet/walllocker/emerglocker/south,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "uR" = (
@@ -501,6 +502,7 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
+/obj/structure/closet/walllocker/emerglocker/north,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "EK" = (
@@ -589,6 +591,20 @@
 /obj/machinery/computer/ship/sensors,
 /turf/simulated/floor/tiled/techmaint/airless,
 /area/shuttle/mackerel_lc_wreck)
+"HI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/structure/railing/grey{
+	dir = 1
+	},
+/obj/random/crate,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/mackerel_lc_wreck)
 "Ib" = (
 /obj/effect/map_helper/airlock/door/int_door,
 /obj/machinery/door/airlock/hatch,
@@ -1151,7 +1167,7 @@ Ly
 mf
 uR
 EK
-So
+HI
 LW
 GK
 Pc
diff --git a/maps/offmap_vr/om_ships/mackerel_sh.dmm b/maps/offmap_vr/om_ships/mackerel_sh.dmm
index 79d2b5d0282..de0c58a95cc 100644
--- a/maps/offmap_vr/om_ships/mackerel_sh.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_sh.dmm
@@ -12,8 +12,13 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mackerel_sh)
 "aF" = (
-/obj/effect/wingrille_spawn/reinforced,
 /obj/machinery/door/firedoor/glass,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_sh)
 "bw" = (
@@ -97,7 +102,6 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /turf/simulated/floor/tiled/techmaint,
@@ -144,8 +148,7 @@
 "lT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/structure/bed/chair/bay/shuttle{
@@ -153,7 +156,6 @@
 	},
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -281,8 +283,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "east bump";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -331,9 +332,7 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_x = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_sh)
@@ -367,8 +366,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
@@ -401,8 +399,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /turf/simulated/wall/rshull,
 /area/shuttle/mackerel_sh)
@@ -428,9 +425,7 @@
 "Ck" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_x = 0
+	dir = 8
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
@@ -440,7 +435,6 @@
 	},
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
-	icon_state = "extinguisher_closed";
 	pixel_x = -30
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -512,9 +506,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_x = 0
+	dir = 8
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -542,8 +534,7 @@
 "FS" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
 /obj/machinery/computer/ship/engines{
-	dir = 1;
-	icon_state = "computer"
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_sh)
@@ -581,8 +572,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -645,7 +635,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -706,7 +695,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
-	icon_state = "extinguisher_closed";
 	pixel_x = -30
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -749,8 +737,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -821,9 +808,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_x = 0
+	dir = 8
 	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -882,12 +867,10 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/structure/extinguisher_cabinet{
 	dir = 8;
-	icon_state = "extinguisher_closed";
 	pixel_x = 30
 	},
 /turf/simulated/floor/tiled/techfloor,
diff --git a/maps/offmap_vr/om_ships/mackerels.dm b/maps/offmap_vr/om_ships/mackerels.dm
index 1b778525ad0..7a1aeb8a83a 100644
--- a/maps/offmap_vr/om_ships/mackerels.dm
+++ b/maps/offmap_vr/om_ships/mackerels.dm
@@ -115,6 +115,7 @@
 	shuttle_area = list(/area/shuttle/mackerel_sh)
 	defer_initialisation = TRUE
 	fuel_consumption = 1
+	ceiling_type = /turf/simulated/floor/reinforced/airless
 
 /datum/shuttle/autodock/overmap/mackerel_lc
 	name = "Mackerel Light Cargo"
@@ -123,6 +124,7 @@
 	shuttle_area = list(/area/shuttle/mackerel_lc)
 	defer_initialisation = TRUE
 	fuel_consumption = 1
+	ceiling_type = /turf/simulated/floor/reinforced/airless
 
 /datum/shuttle/autodock/overmap/mackerel_hc
 	name = "Mackerel Heavy Cargo"
@@ -131,6 +133,7 @@
 	shuttle_area = list(/area/shuttle/mackerel_hc)
 	defer_initialisation = TRUE
 	fuel_consumption = 1.25 //slightly higher due to the added framework/plating
+	ceiling_type = /turf/simulated/floor/reinforced/airless
 
 /datum/shuttle/autodock/overmap/mackerel_hc_skel
 	name = "Mackerel Heavy Cargo Spartan"
@@ -139,6 +142,7 @@
 	shuttle_area = list(/area/shuttle/mackerel_hc_skel,/area/shuttle/mackerel_hc_skel_cockpit,/area/shuttle/mackerel_hc_skel_eng)
 	defer_initialisation = TRUE
 	fuel_consumption = 1.20 //slightly lower due to the stripped-down internals
+	ceiling_type = /turf/simulated/floor/reinforced/airless
 
 /datum/shuttle/autodock/overmap/mackerel_lc_wreck
 	name = "Mackerel Light Cargo II"
@@ -147,6 +151,7 @@
 	shuttle_area = list(/area/shuttle/mackerel_lc_wreck)
 	defer_initialisation = TRUE
 	fuel_consumption = 1
+	ceiling_type = /turf/simulated/floor/reinforced/airless
 
 // A shuttle lateloader landmark
 /obj/effect/shuttle_landmark/shuttle_initializer/mackerel_sh