diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 3aec6c8c376..4e53589c2ff 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -387,7 +387,7 @@ var/global/datum/controller/occupations/job_master
 		if(job)
 
 			//Equip custom gear loadout.
-			var/list/custom_equip_slots = list() //If more than one item takes the same slot, all after the first one spawn in storage.
+			var/list/custom_equip_slots = list()
 			var/list/custom_equip_leftovers = list()
 			if(H.client.prefs.gear && H.client.prefs.gear.len && !(job.mob_type & JOB_SILICON))
 				for(var/thing in H.client.prefs.gear)
@@ -420,14 +420,15 @@ var/global/datum/controller/occupations/job_master
 						I.implant_loadout(H)
 						continue
 
-					// Try desperately (and sorta poorly) to equip the item
+					// Try desperately (and sorta poorly) to equip the item. Now with increased desperation!
 					if(G.slot && !(G.slot in custom_equip_slots))
 						var/metadata = H.client.prefs.gear[G.display_name]
 						if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head)
 							custom_equip_leftovers += thing
 						else if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot))
 							to_chat(H, "<span class='notice'>Equipping you with \the [thing]!</span>")
-							custom_equip_slots.Add(G.slot)
+							if(G.slot != slot_tie)
+								custom_equip_slots.Add(G.slot)
 						else
 							custom_equip_leftovers.Add(thing)
 					else
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index ff68a02eacf..953f4d01acf 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -220,7 +220,7 @@
 				break
 
 	if((equip_preview_mob & EQUIP_PREVIEW_LOADOUT) && !(previewJob && (equip_preview_mob & EQUIP_PREVIEW_JOB) && (previewJob.type == /datum/job/ai || previewJob.type == /datum/job/cyborg)))
-		var/list/equipped_slots = list() //If more than one item takes the same slot only spawn the first
+		var/list/equipped_slots = list()
 		for(var/thing in gear)
 			var/datum/gear/G = gear_datums[thing]
 			if(G)
@@ -243,7 +243,8 @@
 				if(G.slot && !(G.slot in equipped_slots))
 					var/metadata = gear[G.display_name]
 					if(mannequin.equip_to_slot_or_del(G.spawn_item(mannequin, metadata), G.slot))
-						equipped_slots += G.slot
+						if(G.slot != slot_tie)
+							equipped_slots += G.slot
 
 	if((equip_preview_mob & EQUIP_PREVIEW_JOB) && previewJob)
 		mannequin.job = previewJob.title
diff --git a/code/modules/turbolift/turbolift_console_vr.dm b/code/modules/turbolift/turbolift_console_vr.dm
new file mode 100644
index 00000000000..a02730c08d9
--- /dev/null
+++ b/code/modules/turbolift/turbolift_console_vr.dm
@@ -0,0 +1,7 @@
+// TFF 6/10/20 - Just a little thing to prevent the button
+				// and console from being destroyed by explosions.
+/obj/structure/lift/button/ex_act()
+	return
+
+/obj/structure/lift/panel/ex_act()
+	return
\ No newline at end of file
diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm
index df59ffb35da..d5ec12ee855 100644
--- a/code/modules/vore/eating/digest_act_vr.dm
+++ b/code/modules/vore/eating/digest_act_vr.dm
@@ -28,7 +28,7 @@
 		if(g_damage > digest_stage)
 			g_damage = digest_stage
 		digest_stage -= g_damage
-	else
+	if(digest_stage <= 0)
 		for(var/obj/item/O in contents)
 			if(istype(O,/obj/item/weapon/storage/internal)) //Dump contents from dummy pockets.
 				for(var/obj/item/SO in O)
@@ -38,6 +38,8 @@
 			else if(item_storage)
 				O.forceMove(item_storage)
 		qdel(src)
+	if(g_damage > w_class)
+		return w_class
 	return g_damage
 
 /////////////
diff --git a/icons/effects/lighting_overlay.dmi b/icons/effects/lighting_overlay.dmi
index bc3d25204ce..80807db1e62 100644
Binary files a/icons/effects/lighting_overlay.dmi and b/icons/effects/lighting_overlay.dmi differ
diff --git a/maps/offmap_vr/om_ships/gecko_cr.dmm b/maps/offmap_vr/om_ships/gecko_cr.dmm
index 5d2dab74010..3bc59b8e4f8 100644
--- a/maps/offmap_vr/om_ships/gecko_cr.dmm
+++ b/maps/offmap_vr/om_ships/gecko_cr.dmm
@@ -63,7 +63,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_engineering)
 "bJ" = (
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
@@ -177,8 +179,10 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/hatch,
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_engineering)
 "eD" = (
@@ -499,12 +503,14 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_cockpit)
 "kU" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_engineering)
 "lg" = (
@@ -814,7 +820,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit)
 "qh" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -824,6 +829,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr)
 "qx" = (
@@ -1401,8 +1409,10 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr)
 "Br" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_cockpit)
 "BH" = (
@@ -1480,6 +1490,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_engineering)
+"Cs" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/gecko_cr_cockpit)
 "Ct" = (
 /obj/effect/floor_decal/industrial/warning/corner,
 /obj/machinery/airlock_sensor{
@@ -1901,7 +1920,9 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit)
 "JE" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_cockpit)
 "JL" = (
@@ -1962,7 +1983,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_cockpit)
 "KA" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
@@ -1971,6 +1991,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit)
 "KS" = (
@@ -2223,7 +2246,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit)
 "OJ" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -2233,6 +2255,9 @@
 	name = "Blast Shields";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr)
 "ON" = (
@@ -2459,7 +2484,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr)
 "RB" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -2476,6 +2500,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr)
 "RG" = (
@@ -2848,7 +2875,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_engineering)
 "Xs" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -2858,6 +2884,9 @@
 	name = "Blast Shields";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_engineering)
 "XJ" = (
@@ -3432,7 +3461,7 @@ Mf
 zE
 Gs
 fe
-bJ
+Cs
 dS
 jT
 kI
@@ -3690,7 +3719,7 @@ HJ
 Iz
 XU
 mY
-bJ
+Cs
 Ct
 NE
 Jn
diff --git a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
index 1e1616251f4..18aab66287f 100644
--- a/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
+++ b/maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
@@ -66,10 +66,12 @@
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_engineering_wreck)
 "bJ" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "bL" = (
@@ -838,13 +840,15 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "qh" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/blast/regular{
 	dir = 4;
 	id = "gecko_wreck_cr_blast";
 	name = "Blast Shields"
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_wreck)
 "qx" = (
@@ -1352,8 +1356,10 @@
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_wreck)
 "Br" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "BC" = (
@@ -1818,7 +1824,9 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "JE" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "JL" = (
@@ -1879,7 +1887,6 @@
 	},
 /area/shuttle/gecko_cr_cockpit_wreck)
 "KA" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
@@ -1888,6 +1895,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "KS" = (
@@ -2044,12 +2054,14 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_cr_cockpit_wreck)
 "NG" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_engineering_wreck)
 "NI" = (
@@ -2232,13 +2244,15 @@
 /turf/simulated/floor/reinforced/airless,
 /area/shuttle/gecko_cr_wreck)
 "Pv" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	dir = 4;
 	id = "gecko_wreck_cr_blast";
 	name = "Blast Shields"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_cr_wreck)
 "Px" = (
@@ -2410,7 +2424,6 @@
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_wreck)
 "RB" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -2424,6 +2437,9 @@
 	name = "Blast Shields"
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0
@@ -2797,8 +2813,10 @@
 	},
 /area/shuttle/gecko_cr_engineering_wreck)
 "Xs" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor{
 	nitrogen = 0;
 	oxygen = 0
@@ -2951,8 +2969,10 @@
 	name = "Blast Shields"
 	},
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/hatch,
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/airless,
 /area/shuttle/gecko_cr_engineering_wreck)
 "Zs" = (
diff --git a/maps/offmap_vr/om_ships/gecko_sh.dmm b/maps/offmap_vr/om_ships/gecko_sh.dmm
index c50673fe9ab..c2a0dbec4ef 100644
--- a/maps/offmap_vr/om_ships/gecko_sh.dmm
+++ b/maps/offmap_vr/om_ships/gecko_sh.dmm
@@ -237,8 +237,10 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/hatch,
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "ec" = (
@@ -289,10 +291,12 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh_cockpit)
 "eP" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "fe" = (
@@ -500,7 +504,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "kJ" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
@@ -513,15 +516,20 @@
 	opacity = 0
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "kU" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "lh" = (
@@ -738,8 +746,10 @@
 /turf/simulated/wall/rshull,
 /area/shuttle/gecko_sh)
 "qh" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "qx" = (
@@ -860,7 +870,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh)
 "rY" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -870,6 +879,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh)
 "sB" = (
@@ -897,7 +909,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "sS" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -907,6 +918,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh)
 "te" = (
@@ -925,7 +939,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh)
 "tM" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -935,6 +948,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "tP" = (
@@ -1079,7 +1095,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh)
 "xc" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
@@ -1088,6 +1103,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "xd" = (
@@ -1307,7 +1325,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh)
 "Br" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -1316,6 +1333,9 @@
 	name = "Blast Shields";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh)
 "Bz" = (
@@ -1811,7 +1831,9 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "JE" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh_cockpit)
 "Kn" = (
@@ -1856,10 +1878,12 @@
 /turf/simulated/floor/plating,
 /area/shuttle/gecko_sh_engineering)
 "Lc" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh_cockpit)
 "Lf" = (
@@ -2257,7 +2281,6 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh)
 "RB" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -2266,6 +2289,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/gecko_sh_engineering)
 "RG" = (
@@ -2560,7 +2586,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh_engineering)
 "Xs" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -2570,6 +2595,9 @@
 	name = "Blast Shields";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/gecko_sh_engineering)
 "XJ" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_hc.dmm b/maps/offmap_vr/om_ships/mackerel_hc.dmm
index 63ff651cda3..2bc1ccf030a 100644
--- a/maps/offmap_vr/om_ships/mackerel_hc.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_hc.dmm
@@ -63,7 +63,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
 "cv" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc)
 "cD" = (
@@ -300,7 +302,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_hc)
 "uR" = (
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc)
 "we" = (
@@ -371,13 +376,15 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc)
 "BN" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc)
 "BP" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm b/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
index 83a9170b7ac..0fd66f642e8 100644
--- a/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
@@ -69,7 +69,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel_eng)
 "cv" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel_cockpit)
 "cD" = (
@@ -411,7 +413,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel)
 "uR" = (
-/obj/machinery/door/airlock/hatch,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -428,6 +429,9 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel_cockpit)
 "we" = (
@@ -503,13 +507,15 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_hc_skel)
 "BN" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_hc_skel_eng)
 "BP" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_lc.dmm b/maps/offmap_vr/om_ships/mackerel_lc.dmm
index b1d65389bbf..03d853964d8 100644
--- a/maps/offmap_vr/om_ships/mackerel_lc.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_lc.dmm
@@ -22,7 +22,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_lc)
 "bw" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc)
 "bI" = (
@@ -43,13 +45,15 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc)
 "cg" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc)
 "cv" = (
@@ -314,7 +318,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc)
 "ug" = (
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc)
 "um" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
index fa1ccb1128e..418b6a416ac 100644
--- a/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
@@ -26,7 +26,9 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mackerel_lc_wreck)
 "bw" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint/airless,
 /area/shuttle/mackerel_lc_wreck)
 "bI" = (
@@ -54,13 +56,15 @@
 /turf/simulated/floor/airless,
 /area/shuttle/mackerel_lc_wreck)
 "cg" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc_wreck)
 "cv" = (
@@ -329,8 +333,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_lc_wreck)
 "ug" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_lc_wreck)
 "um" = (
diff --git a/maps/offmap_vr/om_ships/mackerel_sh.dmm b/maps/offmap_vr/om_ships/mackerel_sh.dmm
index de0c58a95cc..7511ece7da8 100644
--- a/maps/offmap_vr/om_ships/mackerel_sh.dmm
+++ b/maps/offmap_vr/om_ships/mackerel_sh.dmm
@@ -22,7 +22,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/mackerel_sh)
 "bw" = (
-/obj/machinery/computer/ship/helm,
+/obj/machinery/computer/ship/helm{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_sh)
 "bI" = (
@@ -43,13 +45,15 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_sh)
 "cg" = (
-/obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_sh)
 "cv" = (
@@ -324,7 +328,10 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/mackerel_sh)
 "ug" = (
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/airlock/hatch{
+	req_one_access = list()
+	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/mackerel_sh)
 "um" = (
diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm
index 2cba4892a6a..b194f0220a9 100644
--- a/maps/offmap_vr/talon/talon1.dmm
+++ b/maps/offmap_vr/talon/talon1.dmm
@@ -1402,15 +1402,15 @@
 /obj/machinery/atmospherics/pipe/cap/hidden{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	dir = 1;
-	icon_state = "0-4"
-	},
 /obj/machinery/power/apc/talon{
 	dir = 1;
 	name = "north bump";
 	pixel_y = 28
 	},
+/obj/structure/cable/green{
+	d2 = 8;
+	icon_state = "0-8"
+	},
 /turf/simulated/floor/tiled/eris/dark/brown_perforated,
 /area/talon/deckone/port_eng)
 "cQ" = (
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 08ba427fa91..04ae672b7e6 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -11536,6 +11536,16 @@
 	},
 /turf/simulated/floor/water/pool,
 /area/tether/surfacebase/surface_one_hall)
+"atm" = (
+/obj/structure/bed/chair/wood,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/lino,
+/area/crew_quarters/visitor_dining)
 "atn" = (
 /obj/machinery/status_display{
 	pixel_x = 32;
@@ -17352,17 +17362,6 @@
 	},
 /turf/simulated/floor/lino,
 /area/crew_quarters/visitor_dining)
-"aIs" = (
-/obj/structure/bed/chair/wood,
-/obj/structure/bed/chair/wood,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/lino,
-/area/crew_quarters/visitor_dining)
 "aIt" = (
 /obj/structure/bed/chair/wood,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -46116,7 +46115,7 @@ aEK
 aEK
 aEK
 aDu
-aIs
+atm
 aCQ
 aJV
 aDu
diff --git a/vorestation.dme b/vorestation.dme
index 027fd582853..d23c614b38d 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3603,6 +3603,7 @@
 #include "code\modules\turbolift\turbolift.dm"
 #include "code\modules\turbolift\turbolift_areas.dm"
 #include "code\modules\turbolift\turbolift_console.dm"
+#include "code\modules\turbolift\turbolift_console_vr.dm"
 #include "code\modules\turbolift\turbolift_door.dm"
 #include "code\modules\turbolift\turbolift_door_vr.dm"
 #include "code\modules\turbolift\turbolift_floor.dm"