diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm
index 6f00ae1798e9..1bc41b881129 100644
--- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm
+++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm
@@ -113,7 +113,7 @@
 		to_chat(user, SPAN_XENOWARNING("[src] can only be planted on [lowertext(hive.prefix)]hive weeds."))
 		return
 
-	if(istype(get_area(T), /area/vehicle))
+	if(istype(get_area(T), /area/interior))
 		to_chat(user, SPAN_XENOWARNING("[src] cannot be planted inside a vehicle."))
 		return
 
diff --git a/code/modules/vehicles/interior/areas.dm b/code/modules/vehicles/interior/areas.dm
index 605b32079fcc..254bcb6b26ea 100644
--- a/code/modules/vehicles/interior/areas.dm
+++ b/code/modules/vehicles/interior/areas.dm
@@ -1,29 +1,33 @@
-/area/vehicle
+/area/interior
 	ceiling = CEILING_METAL
 	requires_power = 0
 	unlimited_power = 1
 	icon = 'icons/turf/areas_interiors.dmi'
+	icon_state = "interior"
 	base_lighting_alpha = 255
 
 	ambience_exterior = 'sound/ambience/vehicle_interior1.ogg'
 	sound_environment = SOUND_ENVIRONMENT_ROOM
 
-/area/vehicle/tank
+/area/interior/vehicle/tank
 	name = "tank interior"
 	icon_state = "tank"
 
-/area/vehicle/apc
+/area/interior/vehicle/apc
 	name = "\improper APC interior"
 	icon_state = "apc"
 
-/area/vehicle/apc/med
+/area/interior/vehicle/apc/med
 	name = "\improper MED APC interior"
 	icon_state = "apc_med"
 
-/area/vehicle/apc/command
+/area/interior/vehicle/apc/command
 	name = "\improper CMD APC interior"
 	icon_state = "apc_cmd"
 
-/area/vehicle/van
+/area/interior/vehicle/van
 	name = "van interior"
 	icon_state = "van"
+
+/area/interior/fancylocker
+	name = "closet interior"
diff --git a/code/modules/vehicles/interior/objects/fancy_locker.dm b/code/modules/vehicles/interior/objects/fancy_locker.dm
index f1068812a793..2cc7a02e548b 100644
--- a/code/modules/vehicles/interior/objects/fancy_locker.dm
+++ b/code/modules/vehicles/interior/objects/fancy_locker.dm
@@ -2,6 +2,13 @@
 	name = "fancy closet"
 	desc = "It's a fancy storage unit."
 
+	icon_state = "cabinet_closed"
+	icon_closed = "cabinet_closed"
+	icon_opened = "cabinet_open"
+
+	unacidable = TRUE
+
+	var/interior_map = /datum/map_template/interior/fancy_locker
 	var/datum/interior/interior = null
 	var/entrance_speed = 1 SECONDS
 	var/passengers_slots = 2
@@ -19,20 +26,52 @@
 	INVOKE_ASYNC(src, PROC_REF(do_create_interior))
 
 /obj/structure/closet/fancy/proc/do_create_interior()
-	interior.create_interior("fancylocker")
+	interior.create_interior(interior_map)
 
 /obj/structure/closet/fancy/Destroy()
 	QDEL_NULL(interior)
 	return ..()
 
+/obj/structure/closet/fancy/can_close()
+	for(var/obj/structure/closet/closet in get_turf(src))
+		if(closet != src && !closet.wall_mounted)
+			return FALSE
+	return TRUE
+
 /obj/structure/closet/fancy/store_mobs(stored_units)
 	for(var/mob/M in loc)
-		var/succ = interior.enter(M, "default")
+		var/succ = interior.enter(M, "fancy")
 		if(!succ)
 			break
 
+/obj/structure/closet/fancy/ex_act(severity)
+	return
+
 /obj/structure/interior_exit/fancy
 	name = "fancy wooden door"
 	icon = 'icons/obj/structures/doors/mineral_doors.dmi'
 	icon_state = "wood"
 	density = TRUE
+
+/obj/structure/interior_exit/fancy/attackby(obj/item/O, mob/M)
+	attack_hand(M)
+
+/obj/structure/interior_exit/fancy/attack_hand(mob/escapee)
+	var/obj/structure/closet/fancy/closet = find_closet()
+	if(istype(closet) && !closet.can_open())
+		to_chat(escapee, SPAN_WARNING("Something is blocking the exit!"))
+		return
+	..()
+
+/obj/structure/interior_exit/fancy/attack_alien(mob/living/carbon/xenomorph/escapee, dam_bonus)
+	var/obj/structure/closet/fancy/closet = find_closet()
+	if(istype(closet) && !closet.can_open())
+		to_chat(escapee, SPAN_XENOWARNING("Something is blocking the exit!"))
+		return
+	..()
+
+/obj/structure/interior_exit/fancy/proc/find_closet()
+	var/obj/structure/closet/fancy/possible_closet = interior.exterior
+	if(istype(possible_closet))
+		return possible_closet
+	return
diff --git a/icons/turf/areas_interiors.dmi b/icons/turf/areas_interiors.dmi
index 4da1109803a8..47a95da322ea 100644
Binary files a/icons/turf/areas_interiors.dmi and b/icons/turf/areas_interiors.dmi differ
diff --git a/maps/interiors/apc.dmm b/maps/interiors/apc.dmm
index 82ca4649acd6..2684ad8f0f75 100644
--- a/maps/interiors/apc.dmm
+++ b/maps/interiors/apc.dmm
@@ -17,7 +17,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "c" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 1;
@@ -35,7 +35,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_5"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "d" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 1;
@@ -48,7 +48,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_8_1"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "e" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_1"
@@ -65,7 +65,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_12"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "g" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "corner_small_R"
@@ -86,7 +86,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_0_1_15"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "j" = (
 /turf/open/void/vehicle,
 /area/space)
@@ -112,7 +112,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_9_1"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "n" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_2"
@@ -155,7 +155,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "t" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_3"
@@ -167,7 +167,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_6"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "v" = (
 /obj/structure/bed/chair/vehicle{
 	pixel_x = 8
@@ -183,7 +183,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_9_1"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "w" = (
 /obj/effect/landmark/interior/spawn/entrance{
 	alpha = 50;
@@ -201,7 +201,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_11"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "y" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_6"
@@ -212,12 +212,12 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_5"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "A" = (
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_6"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "B" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "corner_inverse_R";
@@ -236,7 +236,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_11"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "D" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wall";
@@ -274,7 +274,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "H" = (
 /obj/structure/bed/chair/vehicle{
 	pixel_x = -8
@@ -294,7 +294,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "I" = (
 /obj/effect/landmark/interior/spawn/vehicle_support_gunner_seat{
 	dir = 1
@@ -307,7 +307,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_11"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "J" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "corner_small_L";
@@ -324,7 +324,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_14"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "L" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "corner_small_L"
@@ -364,7 +364,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_1_3"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "S" = (
 /obj/structure/interior_wall/apc{
 	alpha = 100;
@@ -402,7 +402,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "V" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wall"
@@ -420,7 +420,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_8_1"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "X" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_wheel_R"
@@ -442,7 +442,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_12"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "Z" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_4"
diff --git a/maps/interiors/apc_command.dmm b/maps/interiors/apc_command.dmm
index 0da5353a6d6a..d6f7485339fc 100644
--- a/maps/interiors/apc_command.dmm
+++ b/maps/interiors/apc_command.dmm
@@ -10,7 +10,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_10_1"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "c" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 1;
@@ -23,7 +23,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_5"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "d" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 1;
@@ -36,7 +36,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_8_1"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "e" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_1"
@@ -56,7 +56,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_12"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "h" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_wheel_R";
@@ -79,7 +79,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "k" = (
 /turf/open/void/vehicle,
 /area/space)
@@ -123,7 +123,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_7_1"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "p" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_6"
@@ -140,12 +140,12 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_8_1"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "r" = (
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_6"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "s" = (
 /obj/structure/machinery/prop/almayer/CICmap{
 	indestructible = 1;
@@ -155,7 +155,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_6"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "t" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_back_top_1";
@@ -168,7 +168,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_5"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "v" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_3"
@@ -194,7 +194,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_5"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "x" = (
 /obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor{
 	dir = 4
@@ -202,12 +202,12 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_9_1"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "y" = (
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_14"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "z" = (
 /obj/structure/interior_wall/apc{
 	alpha = 100;
@@ -234,7 +234,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_11"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "C" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_1"
@@ -252,7 +252,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_0_1_15"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "F" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 4
@@ -260,7 +260,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_11"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "G" = (
 /obj/effect/landmark/interior/spawn/entrance{
 	alpha = 50;
@@ -276,17 +276,17 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_12"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "H" = (
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_13"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "I" = (
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "J" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wall"
@@ -314,7 +314,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_9_1"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 "M" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "corner_small_R";
@@ -415,7 +415,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_6"
 	},
-/area/vehicle/apc/command)
+/area/interior/vehicle/apc/command)
 
 (1,1,1) = {"
 p
diff --git a/maps/interiors/apc_med.dmm b/maps/interiors/apc_med.dmm
index f4da99a6fe50..0f47b029c20f 100644
--- a/maps/interiors/apc_med.dmm
+++ b/maps/interiors/apc_med.dmm
@@ -14,7 +14,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "dark_sterile_green_11"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "c" = (
 /obj/effect/decal/medical_decals/permanent{
 	icon_state = "docdecal2";
@@ -27,7 +27,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "dark_sterile_green_5"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "d" = (
 /obj/effect/decal/medical_decals/permanent{
 	icon_state = "triagedecalbottom"
@@ -38,7 +38,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "dark_sterile_green_14"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "e" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_1"
@@ -70,7 +70,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "j" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_6"
@@ -105,7 +105,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "dark_sterile_green_7"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "n" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_back_top_1";
@@ -179,7 +179,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "dark_sterile_green_8"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "x" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wall";
@@ -204,7 +204,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_11"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "z" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_front_top_1";
@@ -223,7 +223,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "B" = (
 /obj/structure/machinery/iv_drip{
 	anchored = 1
@@ -236,7 +236,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "dark_sterile_green_12"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "C" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_wheel_L";
@@ -253,7 +253,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "dark_sterile"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "E" = (
 /obj/structure/vehicle_locker{
 	pixel_y = 28
@@ -264,7 +264,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_8_1"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "F" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_2"
@@ -293,7 +293,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_9_1"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "J" = (
 /obj/structure/bed/chair/comfy{
 	dir = 4
@@ -301,7 +301,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "dark_sterile_green_6"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "K" = (
 /obj/effect/landmark/interior/spawn/entrance{
 	alpha = 50;
@@ -317,12 +317,12 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_12"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "L" = (
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_14"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "M" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "corner_inverse_L";
@@ -355,7 +355,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "dark_sterile_green_13"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "P" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "door_back"
@@ -366,13 +366,13 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_6"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "R" = (
 /obj/effect/landmark/interior/spawn/weapons_loader,
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_6"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "S" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_4"
@@ -383,7 +383,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_3_3"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "U" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_1"
@@ -402,7 +402,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "W" = (
 /obj/structure/bed/chair/vehicle{
 	pixel_x = -8
@@ -422,7 +422,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc/med)
+/area/interior/vehicle/apc/med)
 "Y" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_4"
diff --git a/maps/interiors/apc_no_fpw.dmm b/maps/interiors/apc_no_fpw.dmm
index 6a08e69959ec..e463b7a5ff1e 100644
--- a/maps/interiors/apc_no_fpw.dmm
+++ b/maps/interiors/apc_no_fpw.dmm
@@ -6,7 +6,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_6"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "c" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 4
@@ -14,7 +14,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_12"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "d" = (
 /obj/effect/landmark/interior/spawn/entrance{
 	alpha = 50;
@@ -29,7 +29,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_12"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "e" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 1;
@@ -47,7 +47,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_5"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "f" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_2"
@@ -70,7 +70,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_1_3"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "j" = (
 /obj/effect/landmark/interior/spawn/entrance{
 	dir = 8;
@@ -89,7 +89,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "k" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wall";
@@ -108,7 +108,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_8_1"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "m" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_1"
@@ -139,7 +139,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_8_1"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "r" = (
 /obj/effect/landmark/interior/spawn/interior_viewport{
 	dir = 8;
@@ -157,7 +157,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_11"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "s" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_2"
@@ -179,7 +179,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_9_1"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "u" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_front_top_1";
@@ -208,7 +208,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_6"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "z" = (
 /obj/effect/landmark/interior/spawn/entrance{
 	dir = 8;
@@ -219,7 +219,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "A" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wheel_back_top_1";
@@ -240,7 +240,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "C" = (
 /obj/structure/bed/chair/vehicle{
 	dir = 4
@@ -248,7 +248,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_11"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "D" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_wheel_L"
@@ -259,7 +259,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_5"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "F" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "corner_small_R";
@@ -298,7 +298,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_11"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "J" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "corner_inverse_R";
@@ -322,7 +322,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_0_1_15"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "M" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "front_wheel_L";
@@ -343,7 +343,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_9_1"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "P" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "corner_small_L"
@@ -385,7 +385,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_14"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "V" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "rear_1"
@@ -411,7 +411,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 "X" = (
 /obj/structure/interior_wall/apc{
 	icon_state = "wall_2";
@@ -446,7 +446,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/apc)
+/area/interior/vehicle/apc)
 
 (1,1,1) = {"
 G
diff --git a/maps/interiors/fancylocker.dmm b/maps/interiors/fancylocker.dmm
index a6ecb6155e72..1b97bc73be62 100644
--- a/maps/interiors/fancylocker.dmm
+++ b/maps/interiors/fancylocker.dmm
@@ -1,96 +1,97 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /turf/closed/wall/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "b" = (
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "c" = (
 /obj/effect/landmark/interior/spawn/entrance/step_toward{
 	dir = 8;
-	exit_type = /obj/structure/interior_exit/fancy
+	exit_type = /obj/structure/interior_exit/fancy;
+	tag = "fancy"
 	},
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "d" = (
 /turf/open/floor/carpet/edge{
 	dir = 9
 	},
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "e" = (
 /turf/open/floor/carpet/edge{
 	dir = 1
 	},
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "f" = (
 /turf/open/floor/carpet/edge{
 	dir = 5
 	},
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "g" = (
 /turf/open/floor/carpet/edge{
 	dir = 8
 	},
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "h" = (
 /obj/structure/bed/sofa/south/white/left,
 /turf/open/floor/carpet,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "i" = (
 /obj/structure/bed/sofa/south/white,
 /turf/open/floor/carpet,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "j" = (
 /obj/structure/bed/sofa/south/white/right,
 /turf/open/floor/carpet,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "k" = (
 /turf/open/floor/carpet/edge{
 	dir = 4
 	},
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "l" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/device/flashlight/lamp/green,
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "m" = (
 /turf/open/floor/carpet/edge{
 	dir = 10
 	},
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "n" = (
 /turf/open/floor/carpet/edge,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "o" = (
 /turf/open/floor/carpet/edge{
 	dir = 6
 	},
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "p" = (
 /obj/structure/surface/table/woodentable/fancy,
 /turf/open/floor/carpet,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "q" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_10"
 	},
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "r" = (
 /obj/structure/coatrack,
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "s" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/structure/machinery/chem_dispenser/soda,
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "t" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/structure/machinery/chem_dispenser/soda/beer,
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "u" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/reagent_container/food/snacks/milosoup{
@@ -103,12 +104,12 @@
 	dir = 1
 	},
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "v" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/reagent_container/food/snacks/appletart,
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "w" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/reagent_container/food/snacks/popcorn{
@@ -124,33 +125,33 @@
 	pixel_x = 5
 	},
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "x" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/ashtray/bronze,
 /turf/open/floor/carpet,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "y" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/item/clothing/mask/cigarette/cigar/cohiba,
 /obj/item/tool/lighter/zippo,
 /turf/open/floor/carpet,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "z" = (
 /obj/structure/bed/chair/wood/wings{
 	icon_state = "wooden_chair_wings";
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "A" = (
 /obj/structure/machinery/disposal,
 /turf/open/floor/wood,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 "B" = (
 /obj/structure/machinery/light,
 /turf/open/floor/carpet/edge,
-/area/vehicle/apc)
+/area/interior/fancylocker)
 
 (1,1,1) = {"
 a
diff --git a/maps/interiors/tank.dmm b/maps/interiors/tank.dmm
index 75da1e24f72d..f2714401a03d 100644
--- a/maps/interiors/tank.dmm
+++ b/maps/interiors/tank.dmm
@@ -18,7 +18,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_12"
 	},
-/area/vehicle/tank)
+/area/interior/vehicle/tank)
 "c" = (
 /obj/structure/prop/tank{
 	icon_state = "prop2";
@@ -39,7 +39,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_3"
 	},
-/area/vehicle/tank)
+/area/interior/vehicle/tank)
 "e" = (
 /obj/effect/landmark/interior/spawn/vehicle_gunner_seat/armor{
 	dir = 4
@@ -47,7 +47,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_13"
 	},
-/area/vehicle/tank)
+/area/interior/vehicle/tank)
 "f" = (
 /obj/structure/prop/tank{
 	pixel_x = 0
@@ -55,7 +55,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_1_1"
 	},
-/area/vehicle/tank)
+/area/interior/vehicle/tank)
 "g" = (
 /obj/structure/interior_wall/tank{
 	alpha = 50;
@@ -102,7 +102,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_8"
 	},
-/area/vehicle/tank)
+/area/interior/vehicle/tank)
 "v" = (
 /obj/structure/interior_wall/tank{
 	layer = 2
@@ -158,7 +158,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_7"
 	},
-/area/vehicle/tank)
+/area/interior/vehicle/tank)
 "H" = (
 /obj/structure/interior_wall/tank{
 	icon_state = "exterior_3";
@@ -175,7 +175,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_4"
 	},
-/area/vehicle/tank)
+/area/interior/vehicle/tank)
 "T" = (
 /obj/structure/prop/tank{
 	icon_state = "prop1";
@@ -184,7 +184,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_9"
 	},
-/area/vehicle/tank)
+/area/interior/vehicle/tank)
 "Z" = (
 /obj/structure/vehicle_locker/tank{
 	pixel_y = 11
@@ -201,7 +201,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_11"
 	},
-/area/vehicle/tank)
+/area/interior/vehicle/tank)
 
 (1,1,1) = {"
 j
diff --git a/maps/interiors/van.dmm b/maps/interiors/van.dmm
index 27a42dd93fd7..309160f38c1d 100644
--- a/maps/interiors/van.dmm
+++ b/maps/interiors/van.dmm
@@ -13,7 +13,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_10"
 	},
-/area/vehicle/van)
+/area/interior/vehicle/van)
 "e" = (
 /obj/structure/interior_wall/van{
 	icon_state = "background_1"
@@ -38,7 +38,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_1"
 	},
-/area/vehicle/van)
+/area/interior/vehicle/van)
 "i" = (
 /obj/structure/interior_wall/van{
 	icon_state = "front_1"
@@ -71,7 +71,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_8"
 	},
-/area/vehicle/van)
+/area/interior/vehicle/van)
 "r" = (
 /obj/structure/interior_wall/van{
 	icon_state = "background_3"
@@ -94,7 +94,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_7"
 	},
-/area/vehicle/van)
+/area/interior/vehicle/van)
 "t" = (
 /obj/effect/landmark/interior/spawn/entrance{
 	dir = 1;
@@ -115,7 +115,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_11"
 	},
-/area/vehicle/van)
+/area/interior/vehicle/van)
 "v" = (
 /obj/structure/interior_wall/van{
 	icon_state = "interior_door"
@@ -152,7 +152,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_3_12"
 	},
-/area/vehicle/van)
+/area/interior/vehicle/van)
 "z" = (
 /obj/structure/interior_wall/van{
 	icon_state = "back_1"
@@ -181,7 +181,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_9"
 	},
-/area/vehicle/van)
+/area/interior/vehicle/van)
 "J" = (
 /obj/structure/interior_wall/van{
 	alpha = 50;
@@ -202,7 +202,7 @@
 /turf/open/shuttle/vehicle{
 	icon_state = "floor_1_2"
 	},
-/area/vehicle/van)
+/area/interior/vehicle/van)
 "O" = (
 /turf/open/void/vehicle,
 /area/space)