From bcc360d0d9da04910984ac08aa420bf68963f84d Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Mon, 26 Mar 2018 04:31:41 -0500
Subject: [PATCH] [MIRROR] Fixes omega detective office + prepare_maps change
 (#6110)

* Fixes omega detective office + prepare_maps change (#36691)

* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge

* Fixes omega detective office + prepare_maps change
---
 _maps/map_files/OmegaStation/OmegaStation.dmm | 8 +++++---
 tools/mapmerge2/Prepare Maps.bat              | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index bc39f6fc00..660e629272 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -3284,11 +3284,12 @@
 /area/security/detectives_office)
 "agK" = (
 /obj/structure/table/wood,
-/obj/item/folder/red,
-/obj/item/hand_labeler,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 8
 	},
+/obj/machinery/computer/security/wooden_tv{
+	pixel_x = 2
+	},
 /turf/open/floor/plasteel/grimy,
 /area/security/detectives_office)
 "agL" = (
@@ -3820,7 +3821,6 @@
 /turf/open/floor/plasteel/grimy,
 /area/security/detectives_office)
 "ahE" = (
-/obj/machinery/computer/security/wooden_tv,
 /obj/structure/table/wood,
 /obj/machinery/button/door{
 	id = "detectivewindows";
@@ -3836,6 +3836,8 @@
 /obj/structure/cable/white{
 	icon_state = "2-8"
 	},
+/obj/item/folder/red,
+/obj/item/hand_labeler,
 /turf/open/floor/plasteel/grimy,
 /area/security/detectives_office)
 "ahF" = (
diff --git a/tools/mapmerge2/Prepare Maps.bat b/tools/mapmerge2/Prepare Maps.bat
index c781a8e0f7..6955e9c877 100644
--- a/tools/mapmerge2/Prepare Maps.bat	
+++ b/tools/mapmerge2/Prepare Maps.bat	
@@ -7,6 +7,6 @@ cls
 echo All dmm files in _maps directories have been backed up
 echo Now you can make your changes...
 echo ---
-echo Remember to run Run_Map_Merge.bat just before you commit your changes!
+echo Remember to run mapmerge.bat just before you commit your changes!
 echo ---
 pause