From 633e62f3585caa6d679c8a8a6322ed11f1fb6c52 Mon Sep 17 00:00:00 2001
From: SgtDavidson <cm120942st@gmail.com>
Date: Wed, 13 Dec 2023 13:14:48 +0300
Subject: [PATCH 1/5] ai_upload apc fix

By https://github.com/TauCetiStation/TauCetiClassic/issues/12506
---
 maps/boxstation/boxstation.dmm | 4 ++++
 tools/dmm-merge-tool/README.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/maps/boxstation/boxstation.dmm b/maps/boxstation/boxstation.dmm
index 87d422da1187..22e55728de80 100644
--- a/maps/boxstation/boxstation.dmm
+++ b/maps/boxstation/boxstation.dmm
@@ -33567,6 +33567,10 @@
 "bhF" = (
 /obj/structure/cable,
 /obj/machinery/computer/smartlight,
+/obj/machinery/power/apc{
+	name = "apc down";
+	pixel_y = -28
+	},
 /turf/simulated/floor/whitegreed,
 /area/station/bridge/ai_upload)
 "bhG" = (
diff --git a/tools/dmm-merge-tool/README.md b/tools/dmm-merge-tool/README.md
index 675a5abde923..0f609d8b7e18 100644
--- a/tools/dmm-merge-tool/README.md
+++ b/tools/dmm-merge-tool/README.md
@@ -1,4 +1,4 @@
-# JTGMerge
+r# JTGMerge
 
 **JTGMerge** развитие оригинального [JMerge](https://github.com/Baystation12/JMerge), добавляющее ряд фич и поддержку TGM формата.
 

From 678e78cead9e2ab3afebe5b77965543a23f098d7 Mon Sep 17 00:00:00 2001
From: SgtDavidson <cm120942st@gmail.com>
Date: Wed, 13 Dec 2023 13:54:58 +0300
Subject: [PATCH 2/5] fix upload_apc, toilets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Пофиксил смещение у унитазов на боксе и добавил забытый апц в аплоуд.
https://github.com/TauCetiStation/TauCetiClassic/issues/12506
---
 maps/boxstation/boxstation.dmm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/maps/boxstation/boxstation.dmm b/maps/boxstation/boxstation.dmm
index 22e55728de80..ac860bb8a9ca 100644
--- a/maps/boxstation/boxstation.dmm
+++ b/maps/boxstation/boxstation.dmm
@@ -21106,8 +21106,7 @@
 	dir = 4
 	},
 /obj/structure/toilet{
-	dir = 8;
-	pixel_y = 8
+	dir = 8
 	},
 /turf/simulated/floor{
 	icon_state = "freezerfloor"

From 0675b63eddbd99a38a05b5602c01164c6849539c Mon Sep 17 00:00:00 2001
From: SgtDavidson <cm120942st@gmail.com>
Date: Wed, 13 Dec 2023 18:55:34 +0300
Subject: [PATCH 3/5] apc gateway and upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Пропустил АПЦ в гейте... Надеюсь, эти изменения прибавятся к ПРу, а не обнулят предыдущие.
---
 maps/boxstation/boxstation.dmm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/maps/boxstation/boxstation.dmm b/maps/boxstation/boxstation.dmm
index ac860bb8a9ca..0df35ccf86de 100644
--- a/maps/boxstation/boxstation.dmm
+++ b/maps/boxstation/boxstation.dmm
@@ -21106,7 +21106,8 @@
 	dir = 4
 	},
 /obj/structure/toilet{
-	dir = 8
+	dir = 8;
+	pixel_y = 8
 	},
 /turf/simulated/floor{
 	icon_state = "freezerfloor"
@@ -30471,6 +30472,10 @@
 /obj/effect/decal/turf_decal/alpha/gray{
 	icon_state = "bot"
 	},
+/obj/machinery/power/apc{
+	name = "apc down";
+	pixel_y = -28
+	},
 /turf/simulated/floor{
 	icon_state = "dark"
 	},

From 051ff10939279fdebe405765f013e128b28ae5bd Mon Sep 17 00:00:00 2001
From: LudwigVonChesterfield
 <17705613+LudwigVonChesterfield@users.noreply.github.com>
Date: Wed, 13 Dec 2023 12:25:25 -0500
Subject: [PATCH 4/5] Update tools/dmm-merge-tool/README.md

---
 tools/dmm-merge-tool/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/dmm-merge-tool/README.md b/tools/dmm-merge-tool/README.md
index 0f609d8b7e18..675a5abde923 100644
--- a/tools/dmm-merge-tool/README.md
+++ b/tools/dmm-merge-tool/README.md
@@ -1,4 +1,4 @@
-r# JTGMerge
+# JTGMerge
 
 **JTGMerge** развитие оригинального [JMerge](https://github.com/Baystation12/JMerge), добавляющее ряд фич и поддержку TGM формата.
 

From c0c0414cab94fd663925118559d82bcca552b63a Mon Sep 17 00:00:00 2001
From: SgtDavidson <cm120942st@gmail.com>
Date: Fri, 15 Dec 2023 13:55:54 +0300
Subject: [PATCH 5/5] toilet go down

pixel_y = 0
---
 maps/boxstation/boxstation.dmm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/maps/boxstation/boxstation.dmm b/maps/boxstation/boxstation.dmm
index 0df35ccf86de..35c81fd6423a 100644
--- a/maps/boxstation/boxstation.dmm
+++ b/maps/boxstation/boxstation.dmm
@@ -21106,8 +21106,7 @@
 	dir = 4
 	},
 /obj/structure/toilet{
-	dir = 8;
-	pixel_y = 8
+	dir = 8
 	},
 /turf/simulated/floor{
 	icon_state = "freezerfloor"