diff --git a/maps/interiors/apc_aa.dmm b/maps/interiors/apc_aa.dmm
index 6404b3ce17..3b43ceee5a 100644
--- a/maps/interiors/apc_aa.dmm
+++ b/maps/interiors/apc_aa.dmm
@@ -46,9 +46,7 @@
 	pixel_x = 2;
 	pixel_y = -13
 	},
-/turf/open/shuttle/vehicle/floor_2{
-	icon_state = "floor_2"
-	},
+/turf/open/shuttle/vehicle/floor_2,
 /area/vehicle/apc/aa)
 "e" = (
 /obj/structure/interior_wall/apc{
@@ -79,9 +77,7 @@
 	pixel_y = -11;
 	layer = 4
 	},
-/turf/open/shuttle/vehicle/floor_2{
-	icon_state = "floor_2"
-	},
+/turf/open/shuttle/vehicle/floor_2,
 /area/vehicle/apc/aa)
 "j" = (
 /obj/structure/interior_wall/apc{
@@ -98,9 +94,7 @@
 /obj/structure/interior_viewport/terminal{
 	pixel_y = 12
 	},
-/turf/open/shuttle/vehicle/floor_1_4{
-	icon_state = "floor_1_4"
-	},
+/turf/open/shuttle/vehicle/floor_1_4,
 /area/vehicle/apc/aa)
 "o" = (
 /obj/structure/interior_wall/apc{
@@ -147,9 +141,7 @@
 	pixel_x = 4;
 	pixel_y = 16
 	},
-/turf/open/shuttle/vehicle/floor_1_4{
-	icon_state = "floor_1_4"
-	},
+/turf/open/shuttle/vehicle/floor_1_4,
 /area/vehicle/apc/aa)
 "w" = (
 /obj/effect/landmark/interior/spawn/interior_camera{
@@ -171,9 +163,7 @@
 	pixel_y = 1;
 	density = 0
 	},
-/turf/open/shuttle/vehicle/floor_2{
-	icon_state = "floor_2"
-	},
+/turf/open/shuttle/vehicle/floor_2,
 /area/vehicle/apc/aa)
 "x" = (
 /obj/structure/interior_wall/apc{
@@ -208,9 +198,7 @@
 	name = "Right APC door";
 	tag = "right rear"
 	},
-/turf/open/shuttle/vehicle/floor_1_3{
-	icon_state = "floor_1_3"
-	},
+/turf/open/shuttle/vehicle/floor_1_3,
 /area/vehicle/apc/aa)
 "A" = (
 /obj/structure/bed/chair/vehicle{
@@ -221,14 +209,10 @@
 	dir = 1;
 	pixel_x = -8
 	},
-/turf/open/shuttle/vehicle/floor_2{
-	icon_state = "floor_2"
-	},
+/turf/open/shuttle/vehicle/floor_2,
 /area/vehicle/apc/aa)
 "B" = (
-/turf/open/shuttle/vehicle/floor_1_3{
-	icon_state = "floor_1_3"
-	},
+/turf/open/shuttle/vehicle/floor_1_3,
 /area/vehicle/apc/aa)
 "C" = (
 /obj/structure/interior_wall/apc{
@@ -258,9 +242,7 @@
 	pixel_y = 30;
 	pixel_x = 8
 	},
-/turf/open/shuttle/vehicle/floor_2{
-	icon_state = "floor_2"
-	},
+/turf/open/shuttle/vehicle/floor_2,
 /area/vehicle/apc/aa)
 "H" = (
 /obj/structure/interior_wall/apc{
@@ -329,9 +311,7 @@
 /turf/open/void/vehicle,
 /area/space)
 "N" = (
-/turf/open/shuttle/vehicle/floor_1_4{
-	icon_state = "floor_1_4"
-	},
+/turf/open/shuttle/vehicle/floor_1_4,
 /area/vehicle/apc/aa)
 "O" = (
 /obj/structure/interior_wall/apc{
@@ -374,9 +354,7 @@
 	name = "Right APC door";
 	tag = "right front"
 	},
-/turf/open/shuttle/vehicle/floor_1_4{
-	icon_state = "floor_1_4"
-	},
+/turf/open/shuttle/vehicle/floor_1_4,
 /area/vehicle/apc/aa)
 "U" = (
 /obj/structure/interior_wall/apc{
@@ -404,9 +382,7 @@
 	buckling_y = 16;
 	pixel_y = 16
 	},
-/turf/open/shuttle/vehicle/floor_2{
-	icon_state = "floor_2"
-	},
+/turf/open/shuttle/vehicle/floor_2,
 /area/vehicle/apc/aa)
 "Y" = (
 /obj/structure/interior_wall/apc{