From ac2324fde87f9e75287579006ee4a51a42bf2c7b Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 20 Nov 2017 22:50:19 -0500 Subject: [PATCH] fixes merge conflicts --- _maps/map_files/MetaStation/MetaStation.dmm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 614bedb415..c9f2706f2b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -80679,19 +80679,6 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/atmos) -<<<<<<< HEAD -======= -"EDv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/rnd/protolathe/department/engineering, -/turf/open/floor/plasteel, -/area/engine/engineering) -"EDw" = ( -/obj/machinery/rnd/protolathe/department/service, -/turf/closed/wall, -/area/hydroponics) "EDx" = ( /turf/open/space, /turf/closed/wall/mineral/plastitanium{ @@ -80706,7 +80693,6 @@ icon_state = "diagonalWall3" }, /area/hallway/secondary/entry) ->>>>>>> a394a18... Various Meta area fixes (#32856) (1,1,1) = {" aaa