From 04dc992f974eba2c58e803a44fd204e69df3f7a2 Mon Sep 17 00:00:00 2001
From: coiax <yellowbounder@gmail.com>
Date: Thu, 7 Dec 2017 18:36:09 +0000
Subject: [PATCH 1/2] [Box] Moves drone dispenser to Robotics maintenance

---
 _maps/map_files/BoxStation/BoxStation.dmm | 34 +++++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 9b5e5bf265..e2160a0dd6 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -60319,6 +60319,7 @@
 /turf/open/floor/plasteel/dark/side{
 	dir = 8
 	},
+<<<<<<< HEAD
 /area/ai_monitored/storage/eva)
 "QvZ" = (
 /turf/open/floor/plasteel/dark/side{
@@ -60344,6 +60345,27 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
+=======
+/area/medical/sleeper)
+"QoV" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance{
+	lootcount = 2;
+	name = "2maintenance loot spawner"
+	},
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
+"QoW" = (
+/obj/machinery/droneDispenser,
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
+"QoX" = (
+/obj/structure/table,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/turf/open/floor/plating,
+/area/maintenance/department/medical/morgue)
+>>>>>>> 2b49bb7... [Box] Moves drone dispenser to Robotics maintenance (#33342)
 
 (1,1,1) = {"
 aaa
@@ -100825,7 +100847,7 @@ aYV
 aYV
 bfO
 bfS
-biC
+biD
 bkd
 bfS
 cTO
@@ -101596,8 +101618,8 @@ aYV
 bez
 bfP
 bfS
-biD
-bke
+bfS
+bfS
 bfS
 cTO
 bmZ
@@ -101853,9 +101875,9 @@ bci
 beB
 bfS
 bfS
-bfS
-bfS
-bfS
+QoV
+QoW
+QoX
 cTO
 bmZ
 bon

From add4b774e58549da30a2653ce0d1d2a9724d9660 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 10 Dec 2017 19:00:08 -0500
Subject: [PATCH 2/2] fixes map conflicts

---
 _maps/map_files/BoxStation/BoxStation.dmm | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index e2160a0dd6..6157bb4fa4 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -60319,7 +60319,6 @@
 /turf/open/floor/plasteel/dark/side{
 	dir = 8
 	},
-<<<<<<< HEAD
 /area/ai_monitored/storage/eva)
 "QvZ" = (
 /turf/open/floor/plasteel/dark/side{
@@ -60345,9 +60344,7 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
-=======
-/area/medical/sleeper)
-"QoV" = (
+"Qwd" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance{
 	lootcount = 2;
@@ -60355,17 +60352,16 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/medical/morgue)
-"QoW" = (
+"Qwe" = (
 /obj/machinery/droneDispenser,
 /turf/open/floor/plating,
 /area/maintenance/department/medical/morgue)
-"QoX" = (
+"Qwf" = (
 /obj/structure/table,
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/stack/sheet/glass/fifty,
 /turf/open/floor/plating,
 /area/maintenance/department/medical/morgue)
->>>>>>> 2b49bb7... [Box] Moves drone dispenser to Robotics maintenance (#33342)
 
 (1,1,1) = {"
 aaa
@@ -101875,9 +101871,9 @@ bci
 beB
 bfS
 bfS
-QoV
-QoW
-QoX
+Qwd
+Qwe
+Qwf
 cTO
 bmZ
 bon