From 8065484b2cb500faeb6db0c9524ac26df8ae7440 Mon Sep 17 00:00:00 2001
From: forest2001 <41653574+realforest2001@users.noreply.github.com>
Date: Thu, 18 Jan 2024 15:17:05 +0000
Subject: [PATCH] Fixes Narnia again. (#5471)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request
Fixes the Narnia closet again.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Runtimes bad. Funny closet good.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding, and may discourage maintainers from reviewing or merging
your PR. This section is not strictly required for (non-controversial)
fix PRs or backend PRs. -->


# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
fix: Fancy closet now works as desired and runtime free.
add: Added an area for the closet to use instead of APC interior.
code: Repathed /area/vehicle to /area/interior/vehicle.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->
---
 .../mob/living/carbon/xenomorph/egg_item.dm   |   2 +-
 code/modules/vehicles/interior/areas.dm       |  16 +++--
 .../vehicles/interior/objects/fancy_locker.dm |  43 ++++++++++++-
 icons/turf/areas_interiors.dmi                | Bin 757 -> 867 bytes
 maps/interiors/apc.dmm                        |  42 ++++++-------
 maps/interiors/apc_command.dmm                |  42 ++++++-------
 maps/interiors/apc_med.dmm                    |  42 ++++++-------
 maps/interiors/apc_no_fpw.dmm                 |  42 ++++++-------
 maps/interiors/fancylocker.dmm                |  59 +++++++++---------
 maps/interiors/tank.dmm                       |  18 +++---
 maps/interiors/van.dmm                        |  16 ++---
 11 files changed, 183 insertions(+), 139 deletions(-)

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 4da1109803a89b2b60e708948a7eea0e41539086..47a95da322ea763e5bc0ca78666a5de59cb4781f 100644
GIT binary patch
delta 824
zcmV-81IPUJ1>**gB!7&0R9JLGWpiV4X>fFDZ*Bkpc$|&Oy$ZrG6o%nB=PEwhUHn_K
zNQz`=Z$UzHGzUpql2C8oq2MO%_P+46xOI0s!1R_D&PApKjqBk^>Lb1eXk5;u0?RAZ
zbxL)Wq0v;A-VG@)xj^GY>X}{SwSUOX;~w*f?02~_Zo9>$O@AY)a+WFogDtwj!1R{B
z*|bnZ=hQ1)0007#Nkl<Zc%1E<J#OPL5JrbVx*Q-)iao#<3q*Y`BhY7(;LD_!fh}@?
zEz;xwsg))~7@D+ZWKv(e{vKdNe-?##Gn8mCPQ3I2WEf^-^D;tP7r6nqfAvrR7zzMG
z0bnQq3<ZFp0FxL37=Pv#eE}AB&K<ox8s>SwRr`lb`;TX~zh1!j`6kWFCIQ$v*N0%o
z%Uf}9t`EVEm(RtmdL=n3zM~YQeI=R8{_OdTfziH_%w>NLs~CF)jM5(kH@B@KmW*#v
z9i@!VZMRm3t^za}A7hZAsem~9OTi7t4D-CVNYGS3oc(b(6n}3E>tR_dVYve0>`pVi
zwBDd1PWAuk{h?;NfwcdR1D)O<Ea%mCL1}PL{cTLEAZv+(Yz=tIMRY+T-@BMK`%74F
z!lkZdX@7}zPeB#o#4G}Z0>DrJ7zzMG0bnQq%&i|L=mk8E4%)u=*vDX202m4YLjhnY
z01O3yp#U%x0DtD9rltH8UOL^_<@dBa#-IQrFP)R82a)Gjk*A09anG;1^HG3-5d4^5
z_s7Tmd()qj_W&hv=BM2K`TAI)00pOle=ZaNh62D)0GKKQM%O{7wp=o%$Ix7${XA_t
zP5ggDEnswAAA+4Or`xWL_rL4EySf5$)zDf(w_BdYH-8P={KH7VGU&>o5?~2zD+%3B
z`laA%1l6R*xWLo}iIn^Nct5H;ng-bi39Tw249GM;v}sU31^Ic}hv26BLcmM=YZ7O9
zn(>+{IfvT87g_mZ9OAJvWOth7v4nKJHnoE<q7)Ekwx$cJcX{85C5Rkne9H=G5quF5
z=jRDJh%NGChiqOBoS1dpPyiST07C&_C;$uvfcXI2JXR5!3$y|N0000<MNUMnLSTX@
CtAQH;

delta 682
zcmV;b0#*Iv2K5DyB!7i^R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;
z&r`5fFwryM;w;ZhDalZ<RWLT<;><|ROwTBRaEeP3OHvhV6_iR6^Rkt=I8!o<iWO`X
z47oVdiV|~EA#Av!#DZjE)WqkerVynrIhU}yvcx=GYLpdR{Zw2OTzoyb0JmO5I?WSI
zz5oCMD@jB_RCt{2n^A6qFbsyBsW&P|LU1M`jzrIty)2TKCdH<}U)2A5DTS^^{%kWX
zS&%_`0WwVq8D1hZy2uYW{@0Tj0V02f0>DrJm>c>AJd7bcEgnrN&1c1bRN~*?jK5t#
z{98#I<dg)AA@n)f`uHp!A@n)f`uJVKrX|T}_!*-Z>yl)x`m5jPOpJ9&vR3^yykh(v
z5T$=gZtdKTcq;yg?r2qf?Yy@;Y#m^!c#T7br2};Jx00JbGo>_pBv?8?SHFKAL;75P
zpO38));mB~cUkGJ_Xl*utNC9(ANGu!Dd)dVboqSne6M{3mC1eedN4;N*@{lGH{m6h
z7(pWcN6eP%ExZrm)@WI~-eTKtK|8{YSp*6NfS~{|6aa<-z)%2~+b}KA8@R^+jsF<W
z`D<<qb^sU(07C&_C;$uvfT5Ei0U3X07XdMJ(5)?3#<e-OmgpfZ&;^aFWA1<$x_(H@
zoD-gpvlMp0Ha2%aE#X<x9yeB_8`pR7EfaQ$(ThodC$UFK=tk++l4}w4X}Ctvt1*+W
z>#=k;%OrC*N`EC0W&!2Q*XZZN(aG1zEfa0&l22pPKj|SVJXd#q)#u93oP9=b?_d(3
zE4ww{*RJn@mLT$6@mK7CFr)=qF+=Q-;icootnY>bz)%1f3IIa^U?>30FD$<+>^A~A
Q4*&oF07*qoM6N<$g6<4C3IG5A

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)