Fixup maps in TGM format

683afb6: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py

maps/map_files/USS_Almayer/USS_Almayer.dmm

@@ -132,41 +132,32 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/starboard)
 "aas" = (
-/obj/structure/machinery/keycard_auth,
-/obj/structure/surface/table/reinforced/black,
-/obj/item/clock{
-	pixel_y = 14;
-	pixel_x = 17
-	},
-/turf/open/floor/almayer,
-/area/almayer/command/cic)
-"aat" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
 	},
 /turf/open/floor/almayer/test_floor4,
 /area/almayer/hallways/hangar)
+"aat" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer/cargo,
+/area/almayer/hallways/hangar)
 "aau" = (
 /turf/closed/wall/almayer/reinforced/temphull,
 /area/almayer/living/pilotbunks)
 "aav" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer/cargo,
-/area/almayer/hallways/hangar)
-"aaw" = (
 /obj/effect/decal/cleanable/blood,
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
 	},
 /turf/open/floor/almayer/test_floor4,
 /area/almayer/hallways/hangar)
-"aax" = (
+"aaw" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
 	},
 /turf/open/floor/almayer/test_floor4,
 /area/almayer/hallways/hangar)
-"aay" = (
+"aax" = (
 /obj/structure/filingcabinet{
 	pixel_x = 8
 	},
@@ -175,7 +166,7 @@
 	},
 /turf/open/floor/almayer/bluefull,
 /area/almayer/command/cichallway)
-"aaz" = (
+"aay" = (
 /obj/structure/filingcabinet{
 	pixel_x = -8
 	},
@@ -184,13 +175,22 @@
 	},
 /turf/open/floor/almayer/bluefull,
 /area/almayer/command/cichallway)
-"aaA" = (
+"aaz" = (
 /obj/structure/filingcabinet/documentation/military_police{
 	pixel_y = 24;
 	density = 0
 	},
 /turf/open/floor/almayer/red/north,
 /area/almayer/shipboard/brig/processing)
+"aaA" = (
+/obj/structure/machinery/keycard_auth,
+/obj/structure/surface/table/reinforced/black,
+/obj/item/clock{
+	pixel_y = 14;
+	pixel_x = 17
+	},
+/turf/open/floor/almayer,
+/area/almayer/command/cic)
 "aaC" = (
 /obj/structure/lattice,
 /turf/open/space/basic,
@@ -80579,7 +80579,7 @@ cmM
 tzd
 tzd
 sgi
-aaA
+aaz
 wSm
 kAL
 xkd
@@ -85251,7 +85251,7 @@ gwR
 sTm
 tdT
 qyo
-aay
+aax
 qwp
 ora
 laO
@@ -85657,7 +85657,7 @@ wjq
 wjq
 rHc
 qyo
-aaz
+aay
 qwp
 vGA
 uwN
@@ -89608,9 +89608,9 @@ oZp
 eXq
 vvp
 aYd
-aaw
+aav
 bqF
-aat
+aas
 pcl
 oRJ
 fTm
@@ -90014,8 +90014,8 @@ lkf
 eXq
 ooh
 pcl
-aax
-aav
+aaw
+aat
 aMY
 pcl
 xNb
@@ -90118,7 +90118,7 @@ ajm
 wVW
 arP
 alX
-aas
+aaA
 aAF
 azZ
 aIf