From 48adeffc57a735bdcd12ed4df412482b2b7dd415 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 20 Nov 2017 22:47:08 -0500 Subject: [PATCH] Fixes merge conflict --- _maps/map_files/PubbyStation/PubbyStation.dmm | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e48df13356..f516821775 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -51261,27 +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 @@ -51294,7 +51273,6 @@ }, /turf/open/floor/plating/airless, /area/tcommsat/computer) ->>>>>>> e3d0468... Fixes unpowered air injectors on pubby (#32846) (1,1,1) = {" aaa