From 2de33c073d208c2d50a984c130642b5fbe435939 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 20 Nov 2017 17:56:47 -0500
Subject: [PATCH 1/2] Corrects Pubby roundstart AT issues

---
 _maps/map_files/PubbyStation/PubbyStation.dmm | 94 ++++++++++++++++---
 1 file changed, 82 insertions(+), 12 deletions(-)

diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 4876b95adb..d732f3d5bd 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -51261,6 +51261,76 @@
 "cCA" = (
 /turf/closed/wall,
 /area/science/lab)
+<<<<<<< HEAD
+=======
+"cCB" = (
+/obj/machinery/rnd/protolathe/department/security,
+/turf/open/floor/plasteel,
+/area/security/main)
+"cCC" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/rnd/protolathe/department/cargo,
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"cCD" = (
+/obj/machinery/rnd/protolathe/department/service,
+/turf/closed/wall,
+/area/crew_quarters/kitchen)
+"cCE" = (
+/obj/machinery/rnd/protolathe/department/medical,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
+"cCF" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/maintenance/department/chapel/monastery)
+"cCG" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/tcommsat/computer)
+"cCH" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCI" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCJ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCK" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+"cCM" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/engine/engineering)
+>>>>>>> 569a326... Merge pull request #32919 from ShizCalev/Corrects-pubby-AT-issues
 
 (1,1,1) = {"
 aaa
@@ -80989,8 +81059,8 @@ cam
 cam
 cdQ
 cet
-ceY
-cbX
+cCH
+cfV
 cfU
 cgu
 cgU
@@ -81246,8 +81316,8 @@ cam
 cam
 cdQ
 cet
-ceY
-cbX
+cCI
+cfV
 cfV
 cgv
 cfV
@@ -81503,8 +81573,8 @@ ccc
 ccV
 cdR
 cet
-ceY
-cbX
+cCJ
+cfV
 cfU
 cgv
 cgV
@@ -83559,8 +83629,8 @@ cch
 cdc
 cdX
 cet
-ceY
-cbX
+cCK
+cfV
 cfU
 cgv
 cgV
@@ -83816,8 +83886,8 @@ cam
 cam
 cdQ
 cet
-ceY
-cbX
+cCL
+cfV
 cfV
 cgv
 cfV
@@ -84073,8 +84143,8 @@ cci
 cam
 cdQ
 cet
-ceY
-cbX
+cCM
+cfV
 cfU
 cgx
 cgU

From 8429bf5448ac6ec7da1dddb604c038a6b0a15bf3 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 20 Nov 2017 22:53:39 -0500
Subject: [PATCH 2/2] fixes merge conflicts

---
 _maps/map_files/PubbyStation/PubbyStation.dmm | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index d732f3d5bd..43f5d69bee 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -51261,39 +51261,6 @@
 "cCA" = (
 /turf/closed/wall,
 /area/science/lab)
-<<<<<<< HEAD
-=======
-"cCB" = (
-/obj/machinery/rnd/protolathe/department/security,
-/turf/open/floor/plasteel,
-/area/security/main)
-"cCC" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/rnd/protolathe/department/cargo,
-/turf/open/floor/plasteel,
-/area/quartermaster/storage)
-"cCD" = (
-/obj/machinery/rnd/protolathe/department/service,
-/turf/closed/wall,
-/area/crew_quarters/kitchen)
-"cCE" = (
-/obj/machinery/rnd/protolathe/department/medical,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"cCF" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
-	dir = 1
-	},
-/turf/open/floor/plating/airless,
-/area/maintenance/department/chapel/monastery)
-"cCG" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/tcommsat/computer)
 "cCH" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -51330,7 +51297,6 @@
 	},
 /turf/open/floor/plating/airless,
 /area/engine/engineering)
->>>>>>> 569a326... Merge pull request #32919 from ShizCalev/Corrects-pubby-AT-issues
 
 (1,1,1) = {"
 aaa