From dc2ecefe90ad3918282c380092ff7d6974bc9f6a Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@users.noreply.github.com>
Date: Mon, 20 Nov 2017 03:38:19 -0500
Subject: [PATCH] Fixes unpowered air injectors on pubby

---
 _maps/map_files/PubbyStation/PubbyStation.dmm | 128 +++++++++++-------
 1 file changed, 81 insertions(+), 47 deletions(-)

diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 4876b95adb..e48df13356 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -372,7 +372,7 @@
 "acF" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on,
 /turf/open/floor/plating/airless,
-/area/space)
+/area/ai_monitored/turret_protected/AIsatextAS)
 "acG" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -35505,7 +35505,7 @@
 	layer = 2.9
 	},
 /turf/open/floor/plating/airless,
-/area/space/nearstation)
+/area/chapel/dock)
 "bGH" = (
 /obj/structure/window/reinforced,
 /turf/open/space,
@@ -43497,7 +43497,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/airless,
-/area/space)
+/area/engine/atmos)
 "bZL" = (
 /obj/machinery/atmospherics/pipe/simple,
 /obj/structure/grille,
@@ -45214,7 +45214,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating/airless,
-/area/space/nearstation)
+/area/maintenance/disposal/incinerator)
 "ceB" = (
 /obj/structure/window/reinforced/fulltile,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -47303,7 +47303,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
-/area/space)
+/area/science/mixing)
 "cly" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -51261,6 +51261,40 @@
 "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)
+>>>>>>> e3d0468... Fixes unpowered air injectors on pubby (#32846)
 
 (1,1,1) = {"
 aaa
@@ -66359,7 +66393,7 @@ cvX
 cke
 cky
 cld
-ceA
+cCF
 aaa
 aaa
 aaa
@@ -67394,10 +67428,10 @@ cfN
 cfN
 cfN
 aaa
-cxG
-cxG
-cxG
-cxG
+aaa
+aaa
+aaa
+aaa
 cjp
 cyU
 cjp
@@ -67650,10 +67684,10 @@ caS
 caS
 caS
 caS
-cxF
-cxF
-cxF
-cxF
+aht
+aht
+aht
+aht
 cjp
 cjp
 ckH
@@ -67907,10 +67941,10 @@ cfN
 caS
 cfN
 aaa
-cxG
-cxG
-cxG
-cxG
+aaa
+aaa
+aaa
+aaa
 cjp
 ckW
 ckH
@@ -68164,10 +68198,10 @@ cfN
 caS
 caS
 aht
-cxF
-cxF
-cxF
-cxF
+aht
+aht
+aht
+aht
 cjp
 ckW
 ckH
@@ -68421,10 +68455,10 @@ cwe
 cwe
 cfN
 aaa
-cxG
-cxG
-cxG
-cxG
+aaa
+aaa
+aaa
+aaa
 cjp
 cyP
 ckH
@@ -69706,10 +69740,10 @@ cln
 cwe
 cfN
 aaa
-cxG
-cxG
-cxG
-cxG
+aaa
+aaa
+aaa
+aaa
 cjp
 cyS
 ckH
@@ -69963,10 +69997,10 @@ cln
 cwe
 caS
 aht
-cxF
-cxF
-cxF
-cxF
+aht
+aht
+aht
+aht
 cjp
 cko
 ckH
@@ -70220,10 +70254,10 @@ cln
 cwe
 cfN
 cfN
-cxG
-cxG
-cxG
-cxG
+aaa
+aaa
+aaa
+aaa
 cjp
 cyT
 ckH
@@ -70477,10 +70511,10 @@ cwe
 cwe
 caS
 caS
-cxF
-cxF
-cxF
-cxF
+aht
+aht
+aht
+aht
 cjp
 cjp
 ckH
@@ -70735,10 +70769,10 @@ cfN
 cfN
 cfN
 aaa
-cxG
-cxG
-cxG
-cxF
+aaa
+aaa
+aaa
+aht
 cjp
 cyU
 cjp
@@ -80246,7 +80280,7 @@ aaa
 aaa
 aaa
 aaa
-clx
+cCG
 clw
 clw
 clw