From 3b665e6af16d380647a6513f46b7ceb94af65c6a Mon Sep 17 00:00:00 2001
From: coiax <yellowbounder@gmail.com>
Date: Tue, 5 Dec 2017 23:45:03 +0000
Subject: [PATCH 1/2] [Metastation] Moves drone dispenser to Robotics maint

---
 _maps/map_files/MetaStation/MetaStation.dmm | 62 ++++++++++++++++++---
 1 file changed, 53 insertions(+), 9 deletions(-)

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index d2d6386ef9..927fd2eb8c 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -43906,8 +43906,9 @@
 /obj/structure/sign/kiddieplaque/perfect_drone{
 	pixel_y = 32
 	},
-/obj/machinery/droneDispenser,
-/obj/machinery/door/window/southleft,
+/obj/structure/table/wood,
+/obj/item/storage/backpack/duffelbag/drone,
+/obj/structure/window/reinforced,
 /turf/open/floor/carpet,
 /area/bridge/showroom/corporate)
 "bNc" = (
@@ -69220,8 +69221,12 @@
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "cMl" = (
-/obj/machinery/space_heater,
-/obj/effect/landmark/blobstart,
+/obj/structure/table,
+/obj/item/stack/sheet/glass/fifty{
+	pixel_x = 3;
+	pixel_y = -4
+	},
+/obj/item/stack/sheet/metal/fifty,
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "cMm" = (
@@ -80767,6 +80772,45 @@
 "EDC" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/engine/break_room)
+<<<<<<< HEAD
+=======
+"EDD" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/landmark/start/security_officer,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/red/side{
+	dir = 8
+	},
+/area/security/main)
+"EDE" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/plating,
+/area/engine/engineering)
+"EDF" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/maintenance/aft)
+"EDG" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/effect/landmark/blobstart,
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"EDH" = (
+/obj/machinery/droneDispenser,
+/turf/open/floor/plating,
+/area/maintenance/aft)
+>>>>>>> d784e2d... [Metastation] Moves drone dispenser to Robotics maint (#33267)
 
 (1,1,1) = {"
 aaa
@@ -110246,6 +110290,7 @@ cIN
 cJM
 cCq
 cgM
+EDF
 cwc
 cNe
 cNT
@@ -110254,7 +110299,6 @@ ack
 ack
 aaf
 aaf
-aaf
 aaa
 aaf
 aaa
@@ -110503,11 +110547,11 @@ cFh
 cFh
 cKH
 cLz
+EDG
 cMk
 bTs
 bTs
 bTs
-aaf
 aaa
 aaa
 aaa
@@ -110761,11 +110805,11 @@ cJN
 cCq
 cgN
 cMl
+EDH
 bTs
 aaf
 aaf
 aaf
-aaf
 aaa
 aaa
 aaa
@@ -111019,7 +111063,7 @@ cCq
 cLA
 bTs
 bTs
-aaa
+bTs
 aaf
 aaa
 aaa
@@ -111276,7 +111320,7 @@ cKI
 cQr
 cQR
 cRa
-cRe
+cSd
 cRe
 cRe
 cRe

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

---
 _maps/map_files/MetaStation/MetaStation.dmm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 927fd2eb8c..46dc883625 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -80772,8 +80772,6 @@
 "EDC" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/engine/break_room)
-<<<<<<< HEAD
-=======
 "EDD" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -80810,7 +80808,6 @@
 /obj/machinery/droneDispenser,
 /turf/open/floor/plating,
 /area/maintenance/aft)
->>>>>>> d784e2d... [Metastation] Moves drone dispenser to Robotics maint (#33267)
 
 (1,1,1) = {"
 aaa