diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm
index 871278ff23..2da19793e5 100644
--- a/code/datums/skills/uscm.dm
+++ b/code/datums/skills/uscm.dm
@@ -287,7 +287,7 @@ COMMAND STAFF
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_POLICE = SKILL_POLICE_FLASH,
-		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
+		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
 		SKILL_INTEL = SKILL_INTEL_TRAINED,
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
diff --git a/code/game/objects/structures/gun_rack.dm b/code/game/objects/structures/gun_rack.dm
index ac32b0162d..400002fa35 100644
--- a/code/game/objects/structures/gun_rack.dm
+++ b/code/game/objects/structures/gun_rack.dm
@@ -54,3 +54,24 @@
 	max_stored = 6
 	initial_stored = 6
 	allowed_type = /obj/item/weapon/gun/rifle/type71
+
+/obj/structure/gun_rack/apc
+	name = "APC ammo compartment"
+	icon_state = "frontal"
+	desc = "Uhoh. You shouldn't be seeing this."
+
+/obj/structure/gun_rack/apc/frontal
+	name = "frontal cannon ammo storage compartment"
+	icon_state = "frontal"
+	desc = "A small compartment that stores ammunition for the APC's 'Bleihagel RE-RE700 Frontal Cannon'."
+	max_stored = 2
+	initial_stored = 0
+	allowed_type = /obj/item/ammo_magazine/hardpoint/m56_cupola/frontal_cannon
+
+/obj/structure/gun_rack/apc/boyars
+	name = "dual cannon ammo storage compartment"
+	icon_state = "boyars"
+	desc = "A small compartment that stores ammunition for the APC's 'PARS-159 Boyars Dualcannon'."
+	max_stored = 2
+	initial_stored = 0
+	allowed_type = /obj/item/ammo_magazine/hardpoint/boyars_dualcannon
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 8d6441293f..c059301467 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -622,6 +622,23 @@
 	icon_state = "clothtable"
 	table_prefix = "cloth"
 
+/obj/structure/surface/table/reinforced/toc
+	name = "operations table"
+	desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs."
+	icon_state = "tocWtable"
+	table_prefix = "toc"
+
+/obj/structure/surface/table/reinforced/toc/update_icon()
+	return
+
+/obj/structure/surface/table/reinforced/toc/west
+	desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs."
+	icon_state = "tocWtable"
+
+/obj/structure/surface/table/reinforced/toc/east
+	desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs."
+	icon_state = "tocEtable"
+
 /*
  * Racks
  */
diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm
index 4c29fe9d5f..9491475ace 100644
--- a/code/modules/almayer/machinery.dm
+++ b/code/modules/almayer/machinery.dm
@@ -113,6 +113,11 @@
 	minimap_type = MINIMAP_FLAG_PMC
 	faction = FACTION_PMC
 
+/obj/structure/machinery/prop/almayer/CICmap/toc
+	name = "tactical map screen"
+	desc = "A screen on the TOC computer displaying the tactical map."
+	icon_state =  "toc_map"
+
 //Nonpower using props
 
 /obj/structure/prop/almayer
diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
index 6de3a17396..7b6572a781 100644
--- a/code/modules/cm_marines/overwatch.dm
+++ b/code/modules/cm_marines/overwatch.dm
@@ -906,6 +906,14 @@
 /obj/structure/machinery/computer/overwatch/freelance
 	faction = FACTION_FREELANCER
 
+/obj/structure/machinery/computer/overwatch/toc
+	name = "TOC Overwatch Console"
+	desc = "The Tactical Operations Center overwatch console. Many different screens make up the display."
+	icon = 'icons/obj/structures/machinery/toc.dmi'
+	icon_state = "toc"
+	bound_width = 64
+	bound_height = 32
+
 /obj/structure/supply_drop
 	name = "Supply Drop Pad"
 	desc = "Place a crate on here to allow bridge Overwatch officers to drop them on people's heads."
diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm
index d86d409a6b..3f688c5721 100644
--- a/code/modules/shuttle/computers/dropship_computer.dm
+++ b/code/modules/shuttle/computers/dropship_computer.dm
@@ -500,3 +500,11 @@
 	icon_state = "shuttle"
 	is_remote = TRUE
 	needs_power = TRUE
+
+/obj/structure/machinery/computer/shuttle/dropship/flight/toc
+	name = "midway control screen"
+	desc = "A screen on the TOC computer for controlling the dropship linked to it."
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "toc_shuttle"
+	shuttleId = DROPSHIP_MIDWAY
+	is_remote = TRUE
diff --git a/code/modules/vehicles/interior/interactable/seats.dm b/code/modules/vehicles/interior/interactable/seats.dm
index 017b9e6b58..06217d4cc0 100644
--- a/code/modules/vehicles/interior/interactable/seats.dm
+++ b/code/modules/vehicles/interior/interactable/seats.dm
@@ -300,6 +300,7 @@
 	desc = "A sturdy chair with a brace that lowers over your body. Prevents being flung around in vehicle during crash being injured as a result. Fasten your seatbelts, kids! Fix with welding tool in case of damage."
 	icon = 'icons/obj/vehicles/interiors/general.dmi'
 	icon_state = "vehicle_seat"
+	buckling_sound = 'sound/effects/metal_close.ogg'
 	var/image/chairbar = null
 	var/broken = FALSE
 	buildstackamount = 0
@@ -442,3 +443,39 @@
 				break_seat()
 		if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY)
 			break_seat()
+
+/obj/structure/bed/chair/vehicle/toc
+	name = "overwatch chair"
+	desc = "A sturdy chair with a brace that lowers over the body. Prevents being flung around in vehicle during a crash and being injured as a result. Fasten your seatbelts, kids! Fix with welding tool in case of damage."
+	icon_state = "armor_chair"
+	can_rotate = TRUE
+
+/obj/structure/bed/chair/vehicle/toc/afterbuckle(mob/M)
+	if(buckled_mob)
+		if(buckled_mob != M)
+			return
+		icon_state = initial(icon_state) + "_buckled"
+		overlays += chairbar
+
+		if(buckle_offset_x != 0)
+			mob_old_x = M.pixel_x
+			M.pixel_x = buckle_offset_x
+		if(buckle_offset_y != 0)
+			mob_old_y = M.pixel_y
+			M.pixel_y = buckle_offset_y
+
+		ADD_TRAIT(buckled_mob, TRAIT_UNDENSE, BUCKLED_TRAIT)
+	else
+		icon_state = initial(icon_state)
+		overlays -= chairbar
+
+		if(buckle_offset_x != 0)
+			M.pixel_x = mob_old_x
+			mob_old_x = 0
+		if(buckle_offset_y != 0)
+			M.pixel_y = mob_old_y
+			mob_old_y = 0
+
+		REMOVE_TRAIT(M, TRAIT_UNDENSE, BUCKLED_TRAIT)
+
+	handle_rotation()
diff --git a/code/modules/vehicles/interior/interactable/vehicle_locker.dm b/code/modules/vehicles/interior/interactable/vehicle_locker.dm
index 5571995594..feeb533796 100644
--- a/code/modules/vehicles/interior/interactable/vehicle_locker.dm
+++ b/code/modules/vehicles/interior/interactable/vehicle_locker.dm
@@ -15,8 +15,6 @@
 	unslashable = TRUE
 	indestructible = TRUE
 
-	var/list/role_restriction = list(JOB_CREWMAN, JOB_WO_CREWMAN, JOB_UPP_CREWMAN, JOB_PMC_CREWMAN)
-
 	var/obj/item/storage/internal/container
 
 /obj/structure/vehicle_locker/Initialize()
@@ -34,7 +32,8 @@
 									/obj/item/storage/pouch,
 									/obj/item/device/motiondetector,
 									/obj/item/ammo_magazine/hardpoint,
-									/obj/item/tool/weldpack
+									/obj/item/tool/weldpack,
+									/obj/item/ammo_box/magazine
 									)
 	flags_atom |= USES_HEARING
 
@@ -47,10 +46,6 @@
 	if (!ishuman(H) || H.is_mob_restrained())
 		return
 
-	if(!role_restriction.Find(H.job))
-		to_chat(H, SPAN_WARNING("You cannot access \the [name]."))
-		return
-
 	empty(get_turf(H), H)
 
 //regular storage's empty() proc doesn't work due to checks, so imitate it
@@ -80,10 +75,6 @@
 	if(user.get_active_hand())
 		return ..()
 
-	if(!role_restriction.Find(user.job))
-		to_chat(user, SPAN_WARNING("You cannot access \the [name]."))
-		return TRUE
-
 	if(Adjacent(user))
 		container.open(user)
 		return TRUE
@@ -98,9 +89,6 @@
 		return
 	if(user.is_mob_incapacitated())
 		return
-	if(!role_restriction.Find(user.job))
-		to_chat(user, SPAN_WARNING("You cannot access \the [name]."))
-		return
 	if (container.handle_mousedrop(user, over_object))
 		..(over_object)
 
@@ -111,9 +99,6 @@
 		return
 	if(!istype(user))
 		return
-	if(!role_restriction.Find(user.job))
-		to_chat(user, SPAN_WARNING("You cannot access \the [name]."))
-		return
 	return container.attackby(W, user)
 
 /obj/structure/vehicle_locker/emp_act(severity)
@@ -141,11 +126,16 @@
 	icon = 'icons/obj/vehicles/interiors/tank.dmi'
 	icon_state = "locker"
 
+/obj/structure/vehicle_locker/movie
+	name = "storage compartment"
+	desc = "A wide storage unit to allow it's users to store a wide variety of objects, from equipment to weapons and their ammo. Very versatile."
+	icon = 'icons/obj/vehicles/interiors/movie.dmi'
+	icon_state = "locker"
+
 /obj/structure/vehicle_locker/med
 	name = "wall-mounted surgery kit storage"
 	desc = "A small locker that securely stores a full surgical kit. ID-locked to surgeons."
 	icon_state = "locker_med"
-	role_restriction = list(JOB_CMO, JOB_DOCTOR, JOB_RESEARCHER, JOB_SYNTH, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_SEA, JOB_CLF_MEDIC, "Colonial Doctor", "Sorokyne Strata Doctor", JOB_SYNTH, JOB_WO_SYNTH)
 
 	var/has_tray = TRUE
 
@@ -197,9 +187,6 @@
 		return
 	if(!istype(user))
 		return
-	if(!role_restriction.Find(user.job))
-		to_chat(user, SPAN_WARNING("You cannot access \the [name]."))
-		return
 	if(istype(W, /obj/item/storage/surgical_tray))
 		add_tray(user, W)
 		return
@@ -215,10 +202,6 @@
 	if(user.get_active_hand())
 		return ..()
 
-	if(!role_restriction.Find(user.job))
-		to_chat(user, SPAN_WARNING("You cannot access \the [name]."))
-		return TRUE
-
 	if(!has_tray)
 		to_chat(user, SPAN_WARNING("\The [name] doesn't have a surgical tray installed!"))
 		return TRUE
@@ -233,9 +216,6 @@
 		return
 	if(user.is_mob_incapacitated())
 		return
-	if(!role_restriction.Find(user.job))
-		to_chat(user, SPAN_WARNING("You cannot access \the [name]."))
-		return
 	if(!has_tray)
 		to_chat(user, SPAN_WARNING("\The [name] doesn't have a surgical tray installed!"))
 		return
@@ -256,10 +236,6 @@
 	if(H.is_mob_incapacitated())
 		return
 
-	if(!role_restriction.Find(H.job))
-		to_chat(H, SPAN_WARNING("You cannot access \the [name]."))
-		return
-
 	remove_tray(H)
 
 /obj/structure/vehicle_locker/med/proc/remove_tray(mob/living/carbon/human/H)
@@ -303,4 +279,3 @@
 	has_tray = TRUE
 	update_icon()
 	H.visible_message(SPAN_NOTICE("[H] installs \the [tray] into \the [src]."), SPAN_NOTICE("You install \the [tray] into \the [src]."))
-
diff --git a/code/modules/vehicles/interior/interior_landmarks.dm b/code/modules/vehicles/interior/interior_landmarks.dm
index eb62e50243..bfb4ab58c7 100644
--- a/code/modules/vehicles/interior/interior_landmarks.dm
+++ b/code/modules/vehicles/interior/interior_landmarks.dm
@@ -146,6 +146,28 @@
 
 	qdel(src)
 
+/obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor/movie
+	name = "movie apc seat spawner"
+	var/buckling_y = 0
+
+/obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor/movie/on_load(datum/interior/I)
+	var/obj/structure/bed/chair/comfy/vehicle/driver/S = new(loc)
+
+	S.icon = icon
+	S.icon_state = icon_state
+	S.layer = layer
+	S.vehicle = I.exterior
+	S.required_skill = S.vehicle.required_skill
+	S.setDir(dir)
+	S.alpha = alpha
+	S.update_icon()
+	S.handle_rotation()
+	S.pixel_x = pixel_x
+	S.pixel_y = pixel_y
+	S.buckling_y = buckling_y
+
+	qdel(src)
+
 /obj/effect/landmark/interior/spawn/vehicle_support_gunner_seat
 	name = "1st support gunner's seat spawner"
 	icon = 'icons/obj/vehicles/interiors/general.dmi'
@@ -215,6 +237,10 @@
 	icon_state = "wall_phone"
 	color = "yellow"
 
+/obj/effect/landmark/interior/spawn/telephone/toc
+	icon = 'icons/obj/vehicles/interiors/movie.dmi'
+	icon_state = "wall_phone"
+
 /obj/effect/landmark/interior/spawn/telephone/on_load(datum/interior/I)
 	var/obj/structure/phone_base/phone = new(loc)
 
@@ -246,6 +272,7 @@
 	R.layer = layer
 	R.pixel_x = pixel_x
 	R.pixel_y = pixel_y
+	R.density = density
 	R.vehicle = I.exterior
 	R.setDir(dir)
 	R.update_icon()
@@ -268,6 +295,7 @@
 	V.pixel_x = pixel_x
 	V.pixel_y = pixel_y
 	V.alpha = alpha
+	V.layer = layer
 	V.update_icon()
 
 	qdel(src)
diff --git a/icons/obj/structures/gun_racks.dmi b/icons/obj/structures/gun_racks.dmi
index e452fa3c68..fb4e3c4b9c 100644
Binary files a/icons/obj/structures/gun_racks.dmi and b/icons/obj/structures/gun_racks.dmi differ
diff --git a/icons/obj/structures/machinery/computer.dmi b/icons/obj/structures/machinery/computer.dmi
index a3f60be487..4224992af2 100644
Binary files a/icons/obj/structures/machinery/computer.dmi and b/icons/obj/structures/machinery/computer.dmi differ
diff --git a/icons/obj/structures/machinery/toc.dmi b/icons/obj/structures/machinery/toc.dmi
new file mode 100644
index 0000000000..b2917b4790
Binary files /dev/null and b/icons/obj/structures/machinery/toc.dmi differ
diff --git a/icons/obj/structures/tables.dmi b/icons/obj/structures/tables.dmi
index bee6f34772..2528751b60 100644
Binary files a/icons/obj/structures/tables.dmi and b/icons/obj/structures/tables.dmi differ
diff --git a/icons/obj/vehicles/interiors/apc.dmi b/icons/obj/vehicles/interiors/apc.dmi
index e12c5f68ab..0d91ca9447 100644
Binary files a/icons/obj/vehicles/interiors/apc.dmi and b/icons/obj/vehicles/interiors/apc.dmi differ
diff --git a/icons/obj/vehicles/interiors/movie.dmi b/icons/obj/vehicles/interiors/movie.dmi
new file mode 100644
index 0000000000..1bacbe09b4
Binary files /dev/null and b/icons/obj/vehicles/interiors/movie.dmi differ
diff --git a/maps/interiors/apc_movie.dmm b/maps/interiors/apc_movie.dmm
index d32b9f49ec..d1f9258eef 100644
--- a/maps/interiors/apc_movie.dmm
+++ b/maps/interiors/apc_movie.dmm
@@ -6,34 +6,30 @@
 /turf/open/void/vehicle,
 /area/space)
 "b" = (
-/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{
-	name = "Alamo Remote Control Console";
-	shuttleId = "dropship_alamo";
-	pixel_x = 7;
-	pixel_y = 11
-	},
-/obj/structure/bed/chair/vehicle{
-	dir = 1;
-	pixel_x = -16;
-	layer = 3.21
+/obj/structure/interior_wall/apc{
+	icon_state = "wall";
+	pixel_y = -12;
+	opacity = 0
 	},
-/turf/open/shuttle/vehicle{
-	icon_state = "floor_1_4"
+/obj/structure/interior_wall/apc{
+	icon_state = "wheel_front_top_2";
+	pixel_x = -4;
+	pixel_y = -5;
+	layer = 2.01
 	},
-/area/vehicle/apc/movie)
+/turf/open/void/vehicle,
+/area/space)
 "c" = (
-/obj/structure/machinery/computer/overwatch/almayer{
-	layer = 3.2;
-	pixel_x = 16;
-	pixel_y = 23
-	},
-/obj/structure/machinery/prop/almayer/CICmap{
-	icon_state = "security_cam";
+/obj/structure/machinery/computer/overwatch/toc{
 	layer = 2.97;
-	name = "Tactical Map Display";
-	pixel_x = -7;
-	pixel_y = 11;
-	density = 0
+	pixel_y = 12
+	},
+/obj/structure/surface/table/reinforced/toc/west{
+	pixel_y = -7
+	},
+/obj/structure/machinery/computer/shuttle/dropship/flight/toc{
+	pixel_y = 12;
+	pixel_x = 7
 	},
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_3"
@@ -61,7 +57,8 @@
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_front_top_2";
 	pixel_x = 4;
-	pixel_y = -4
+	pixel_y = -5;
+	layer = 2.01
 	},
 /turf/open/void/vehicle,
 /area/space)
@@ -69,7 +66,8 @@
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_front_top_1";
 	pixel_x = 1;
-	pixel_y = -4
+	pixel_y = -5;
+	layer = 2.01
 	},
 /turf/open/void/vehicle,
 /area/space)
@@ -80,18 +78,14 @@
 /turf/open/void/vehicle,
 /area/space)
 "h" = (
-/obj/effect/landmark/interior/spawn/weapons_loader,
+/obj/effect/landmark/interior/spawn/weapons_loader{
+	pixel_y = -11;
+	layer = 4
+	},
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_2"
 	},
 /area/vehicle/apc/movie)
-"i" = (
-/obj/structure/interior_wall/apc{
-	icon_state = "corner_inverse_R";
-	opacity = 0
-	},
-/turf/open/space/basic,
-/area/space)
 "j" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 1;
@@ -103,7 +97,7 @@
 	},
 /obj/effect/landmark/interior/spawn/interior_viewport{
 	dir = 1;
-	pixel_x = 8;
+	pixel_x = -7;
 	pixel_y = -11
 	},
 /turf/open/shuttle/vehicle{
@@ -111,29 +105,31 @@
 	},
 /area/vehicle/apc/movie)
 "l" = (
-/obj/structure/interior_wall/apc{
-	icon_state = "wall";
-	opacity = 0
+/obj/structure/machinery/prop/almayer/CICmap{
+	density = 0;
+	icon_state = "toc_map";
+	layer = 2.97;
+	name = "Tactical Map Display";
+	pixel_y = 11;
+	pixel_x = -7
+	},
+/obj/structure/surface/table/reinforced/toc/east{
+	pixel_y = -7
+	},
+/obj/effect/landmark/interior/spawn/telephone/toc{
+	pixel_y = 11;
+	pixel_x = 11
 	},
-/turf/open/space/basic,
-/area/space)
-"m" = (
 /turf/open/shuttle/vehicle{
-	icon_state = "floor_1_5"
+	icon_state = "floor_1_4"
 	},
 /area/vehicle/apc/movie)
 "n" = (
 /obj/structure/interior_wall/apc{
-	icon_state = "intersection_2";
+	icon_state = "corner_inverse_L";
 	opacity = 0
 	},
-/obj/structure/interior_wall/apc{
-	icon_state = "wheel_front_top_2";
-	pixel_x = 2;
-	pixel_y = 8;
-	layer = 2
-	},
-/turf/open/shuttle/vehicle,
+/turf/open/space/basic,
 /area/space)
 "o" = (
 /obj/structure/interior_wall/apc{
@@ -143,9 +139,10 @@
 /area/space)
 "p" = (
 /obj/structure/interior_wall/apc{
-	icon_state = "front_4"
+	icon_state = "wall_2";
+	opacity = 0
 	},
-/turf/open/void/vehicle,
+/turf/open/space/basic,
 /area/space)
 "q" = (
 /obj/structure/interior_wall/apc{
@@ -160,23 +157,11 @@
 	},
 /turf/open/space/basic,
 /area/space)
-"s" = (
-/obj/structure/interior_wall/apc{
-	icon_state = "wall_2";
-	opacity = 0
-	},
-/turf/open/space/basic,
-/area/space)
 "t" = (
-/turf/open/shuttle/vehicle{
-	icon_state = "floor_0_10"
-	},
-/area/vehicle/apc/movie)
-"u" = (
-/obj/effect/landmark/interior/spawn/interior_camera{
-	dir = 10;
-	pixel_x = -14;
-	pixel_y = 38
+/obj/structure/bed/chair/vehicle/toc{
+	dir = 1;
+	pixel_y = 19;
+	pixel_x = 16
 	},
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_3"
@@ -184,33 +169,65 @@
 /area/vehicle/apc/movie)
 "v" = (
 /obj/structure/bed/chair/vehicle{
-	pixel_x = 8
+	pixel_x = 8;
+	pixel_y = 14
 	},
 /obj/structure/bed/chair/vehicle{
-	pixel_x = -8
+	pixel_x = -8;
+	pixel_y = 14
 	},
-/obj/effect/landmark/interior/spawn/interior_viewport{
-	pixel_x = -7;
-	pixel_y = 23
+/obj/structure/vehicle_locker/movie{
+	pixel_y = 31;
+	layer = 2.9
 	},
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_2"
 	},
 /area/vehicle/apc/movie)
 "w" = (
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med/vehicle{
-	pixel_x = 6;
-	pixel_y = 28
+/obj/effect/landmark/interior/spawn/interior_camera{
+	dir = 5;
+	pixel_x = -18;
+	pixel_y = 38
+	},
+/obj/structure/vehicle_locker/movie{
+	pixel_y = 11;
+	layer = 2.9
 	},
-/obj/structure/extinguisher_cabinet/lifeboat{
-	icon = 'icons/obj/vehicles/interiors/general.dmi';
+/obj/structure/gun_rack/apc/boyars{
+	pixel_x = 8;
+	pixel_y = 1;
+	density = 0
+	},
+/obj/structure/gun_rack/apc/frontal{
+	pixel_y = 1;
 	pixel_x = -8;
-	pixel_y = 28
+	density = 0
 	},
 /turf/open/shuttle/vehicle{
-	icon_state = "floor_1_5"
+	icon_state = "floor_2"
 	},
 /area/vehicle/apc/movie)
+"x" = (
+/obj/structure/interior_wall/apc{
+	icon_state = "wall";
+	opacity = 0;
+	pixel_y = -12
+	},
+/obj/structure/interior_wall/apc{
+	icon_state = "wheel_front_top_2";
+	pixel_x = 10;
+	pixel_y = -5;
+	layer = 2.01
+	},
+/obj/structure/interior_wall/apc{
+	icon_state = "wheel_front_top_2";
+	pixel_x = -18;
+	pixel_y = -5;
+	layer = 2.01
+	},
+/turf/open/void/vehicle,
+/area/space)
 "y" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_5"
@@ -265,27 +282,31 @@
 /turf/open/void/vehicle,
 /area/space)
 "F" = (
+/obj/effect/landmark/interior/spawn/interior_viewport{
+	pixel_x = 8;
+	pixel_y = 26;
+	layer = 3
+	},
 /obj/structure/bed/chair/vehicle{
-	pixel_x = 8
+	pixel_x = -8;
+	pixel_y = 14
 	},
 /obj/structure/bed/chair/vehicle{
-	pixel_x = -8
+	pixel_x = 8;
+	pixel_y = 14
 	},
-/obj/structure/vehicle_locker{
-	pixel_y = 28
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med/vehicle{
+	pixel_y = 30;
+	pixel_x = -8
 	},
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_2"
 	},
 /area/vehicle/apc/movie)
 "G" = (
-/obj/structure/machinery/cm_vending/sorted/vehicle_supply{
-	pixel_y = 16
-	},
-/obj/effect/landmark/interior/spawn/interior_viewport{
-	dir = 8;
-	pixel_x = 5;
-	pixel_y = 8
+/obj/structure/gun_rack/m41{
+	pixel_y = 22;
+	density = 0
 	},
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_2"
@@ -293,7 +314,7 @@
 /area/vehicle/apc/movie)
 "H" = (
 /obj/structure/interior_wall/apc{
-	icon_state = "corner_inverse_L";
+	icon_state = "corner_inverse_R";
 	opacity = 0
 	},
 /turf/open/space/basic,
@@ -303,26 +324,39 @@
 	icon_state = "front_3"
 	},
 /obj/structure/interior_wall/apc{
-	icon_state = "front_4"
+	icon_state = "front_4";
+	pixel_y = 12
 	},
 /turf/open/void/vehicle,
 /area/space)
 "J" = (
-/obj/structure/interior_wall/apc{
-	icon_state = "intersection_1";
-	opacity = 0
-	},
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_front_top_2";
 	pixel_x = 4;
 	pixel_y = 1;
-	layer = 2.01
+	layer = 2.01;
+	opacity = 0
+	},
+/obj/structure/interior_wall/apc{
+	icon_state = "corner_smaller_R";
+	opacity = 0;
+	pixel_y = 12
+	},
+/obj/structure/interior_wall/apc{
+	icon_state = "corner_smaller_L";
+	opacity = 0;
+	pixel_y = 12
+	},
+/obj/structure/interior_wall/apc{
+	icon_state = "intersection_2";
+	opacity = 0;
+	pixel_y = -20
 	},
 /turf/open/shuttle/vehicle,
 /area/space)
 "K" = (
 /obj/structure/interior_wall/apc{
-	icon_state = "corner_small_L";
+	icon_state = "corner_smaller_L";
 	opacity = 0
 	},
 /obj/structure/interior_wall/apc{
@@ -351,15 +385,16 @@
 /area/vehicle/apc/movie)
 "O" = (
 /obj/structure/interior_wall/apc{
-	icon_state = "front_2"
+	icon_state = "front_2";
+	pixel_y = 7
+	},
+/obj/structure/interior_wall/apc{
+	icon_state = "front_2";
+	pixel_y = -2;
+	layer = 2.01
 	},
 /turf/open/void/vehicle,
 /area/space)
-"P" = (
-/turf/open/shuttle/vehicle{
-	icon_state = "floor_0_9"
-	},
-/area/vehicle/apc/movie)
 "Q" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "door_big_left";
@@ -377,7 +412,8 @@
 /area/space)
 "S" = (
 /obj/structure/interior_wall/apc{
-	icon_state = "front_6"
+	icon_state = "front_6";
+	pixel_y = -1
 	},
 /turf/open/void/vehicle,
 /area/space)
@@ -394,7 +430,8 @@
 /area/vehicle/apc/movie)
 "U" = (
 /obj/structure/interior_wall/apc{
-	icon_state = "front_wheel_R"
+	icon_state = "front_wheel_R";
+	layer = 4.1
 	},
 /turf/open/space/basic,
 /area/space)
@@ -407,27 +444,20 @@
 /turf/open/void/vehicle,
 /area/space)
 "W" = (
-/obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor{
-	dir = 4
-	},
 /obj/effect/landmark/interior/spawn/interior_viewport{
 	dir = 8;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 18
+	},
+/obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor/movie{
+	dir = 4;
+	buckling_y = 16;
+	pixel_y = 16
 	},
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_2"
 	},
 /area/vehicle/apc/movie)
-"X" = (
-/obj/structure/interior_wall/apc{
-	icon_state = "wall";
-	opacity = 0
-	},
-/obj/structure/surface/table/reinforced/almayer_B{
-	pixel_y = -18
-	},
-/turf/open/space/basic,
-/area/space)
 "Y" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_2"
@@ -436,19 +466,20 @@
 /area/space)
 "Z" = (
 /obj/structure/interior_wall/apc{
-	icon_state = "corner_small_R";
+	icon_state = "corner_smaller_R";
 	opacity = 0
 	},
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_front_top_2";
 	pixel_x = 4;
-	pixel_y = -4
+	pixel_y = -5;
+	layer = 2.01
 	},
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_front_top_2";
 	pixel_x = 8;
-	pixel_y = -4;
-	layer = 2.03
+	pixel_y = -5;
+	layer = 2.01
 	},
 /turf/open/void/vehicle,
 /area/space)
@@ -457,52 +488,46 @@
 a
 D
 M
-M
 Y
 o
 E
 "}
 (2,1,1) = {"
 V
-s
+p
 v
-m
-A
+j
 L
 E
 "}
 (3,1,1) = {"
 K
-H
+n
 F
-m
-j
+A
 r
 E
 "}
 (4,1,1) = {"
-X
+b
 c
-u
-P
+t
 B
 z
 Q
 "}
 (5,1,1) = {"
-X
-b
+x
+l
 N
-t
 N
 T
 C
 "}
 (6,1,1) = {"
 Z
-i
+H
 G
-m
 d
 R
 E
@@ -510,7 +535,6 @@ E
 (7,1,1) = {"
 e
 J
-n
 w
 A
 q
@@ -518,9 +542,8 @@ E
 "}
 (8,1,1) = {"
 f
-l
+p
 W
-m
 h
 U
 E
@@ -529,7 +552,6 @@ E
 S
 I
 O
-p
 y
 g
 E