From 7c0ec1f6931ce8ef12283081799999305da70830 Mon Sep 17 00:00:00 2001
From: Detective-Google <48196179+Detective-Google@users.noreply.github.com>
Date: Wed, 5 Feb 2025 19:30:42 -0600
Subject: [PATCH] Fixup maps in TGM format

5a37fc70ee1e: maps/map_files/BigRed/BigRed.dmm
5a37fc70ee1e: maps/map_files/LV624/LV624.dmm
5a37fc70ee1e: maps/map_files/LV624/standalone/clfship.dmm

Automatically commited by: tools\mapmerge2\fixup.py
---
 maps/map_files/BigRed/BigRed.dmm            | 18 +++++++++---------
 maps/map_files/LV624/LV624.dmm              | 10 +++++-----
 maps/map_files/LV624/standalone/clfship.dmm | 10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index 4ae8f3ef342a..ce49a4473bbd 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -719,6 +719,14 @@
 /obj/structure/surface/table,
 /turf/open/floor/white,
 /area/bigredv2/outside/marshal_office)
+"acN" = (
+/obj/structure/bed,
+/obj/item/bedsheet/brown{
+	layer = 3.1
+	},
+/obj/effect/landmark/corpsespawner/security/liaison,
+/turf/open/floor/wood,
+/area/bigredv2/outside/admin_building)
 "acP" = (
 /turf/open/mars,
 /area/bigredv2/outside/n)
@@ -22680,14 +22688,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/asphalt/cement_sunbleached/cement_sunbleached15,
 /area/bigredv2/outside/nw)
-"hqC" = (
-/obj/structure/bed,
-/obj/item/bedsheet/brown{
-	layer = 3.1
-	},
-/obj/effect/landmark/corpsespawner/security/liaison,
-/turf/open/floor/wood,
-/area/bigredv2/outside/admin_building)
 "hqD" = (
 /turf/open/floor/asteroidwarning/southwest,
 /area/bigredv2/outside/lz2_south_cas)
@@ -61431,7 +61431,7 @@ aNQ
 aOO
 aUg
 aof
-hqC
+acN
 aOO
 aXn
 aof
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index 7dac4cba9c1f..df382645116c 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -457,6 +457,10 @@
 /obj/structure/window/framed/colony,
 /turf/open/floor/plating/platebotc,
 /area/lv624/lazarus/quartstorage)
+"acc" = (
+/obj/item/explosive/grenade/high_explosive,
+/turf/closed/wall/strata_ice/jungle,
+/area/lv624/ground/jungle/north_east_jungle)
 "acd" = (
 /obj/structure/pipes/standard/manifold/hidden/cyan{
 	dir = 8
@@ -16423,10 +16427,6 @@
 /obj/item/stack/sheet/wood,
 /turf/open/gm/dirt,
 /area/lv624/lazarus/crashed_ship_containers)
-"ovV" = (
-/obj/item/explosive/grenade/high_explosive,
-/turf/closed/wall/strata_ice/jungle,
-/area/lv624/ground/jungle/north_east_jungle)
 "owe" = (
 /obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
 	pixel_x = 8
@@ -46905,7 +46905,7 @@ lSs
 vjH
 vSG
 fuY
-ovV
+acc
 tyG
 iwh
 jRm
diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm
index 462a780ca644..fe82d917fbd9 100644
--- a/maps/map_files/LV624/standalone/clfship.dmm
+++ b/maps/map_files/LV624/standalone/clfship.dmm
@@ -1,4 +1,8 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/item/ammo_magazine/rifle/boltaction,
+/turf/open/floor/damaged3/west,
+/area/lv624/lazarus/crashed_ship)
 "ag" = (
 /obj/structure/surface/table/reinforced/prison,
 /obj/item/ammo_magazine/rifle/mar40,
@@ -732,10 +736,6 @@
 	},
 /turf/open/floor/wood,
 /area/lv624/lazarus/crashed_ship)
-"yK" = (
-/obj/item/ammo_magazine/rifle/boltaction,
-/turf/open/floor/damaged3/west,
-/area/lv624/lazarus/crashed_ship)
 "yT" = (
 /obj/structure/barricade/metal/wired{
 	icon_state = "metal_2"
@@ -2692,7 +2692,7 @@ dN
 ok
 Pu
 qU
-yK
+aa
 Xx
 xk
 dN