From 5d5d4451a93ddd93c14742f274fff73e407c7d91 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 21 Nov 2017 14:35:43 -0500 Subject: [PATCH] fixes merge conflicts --- _maps/map_files/BoxStation/BoxStation.dmm | 164 +++--------------- _maps/map_files/OmegaStation/OmegaStation.dmm | 15 -- 2 files changed, 28 insertions(+), 151 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index b8aabe0645..5e36e72d0d 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -10466,7 +10466,6 @@ /turf/closed/wall, /area/maintenance/port/fore) "azH" = ( -<<<<<<< HEAD /obj/machinery/power/apc{ areastring = "/area/maintenance/bar/cafe"; dir = 1; @@ -10490,17 +10489,6 @@ icon_state = "wood-broken5" }, /area/maintenance/bar/cafe) -======= -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/space, -/area/space/nearstation) -"azI" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/space, -/area/space/nearstation) ->>>>>>> e7197ec... Nearstation fixes (#32931) "azJ" = ( /obj/machinery/gateway{ dir = 9 @@ -57468,89 +57456,89 @@ /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoe" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qof" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qog" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoh" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoi" = ( /obj/structure/lattice, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoj" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qok" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qol" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "Qom" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qon" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoo" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qop" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qoq" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qor" = ( /obj/structure/lattice, /obj/structure/grille/broken, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qos" = ( /obj/structure/grille, /turf/open/floor/plating/airless, -/area/space) +/area/space/nearstation) "Qot" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qou" = ( /obj/structure/lattice, /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "Qov" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -57659,39 +57647,39 @@ "QoM" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoN" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoO" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoP" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoQ" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoR" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoS" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoT" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoU" = ( /obj/structure/grille, /turf/open/space/basic, -/area/space) +/area/space/nearstation) "QoV" = ( /obj/structure/window/reinforced, /obj/vehicle/secway, @@ -58686,7 +58674,7 @@ /area/maintenance/bar/cafe) "Qri" = ( /obj/machinery/power/apc{ - areastring = "/area/crew_quarters/theatre/mime"; + areastring = "/area/crew_quarters/theatre/clown"; dir = 2; name = "Clown's Office APC"; pixel_x = 1; @@ -60122,104 +60110,8 @@ /obj/structure/chair/office/light{ dir = 1 }, -<<<<<<< HEAD /obj/structure/cable{ icon_state = "0-4" -======= -/turf/open/floor/mineral/titanium, -/area/shuttle/abandoned) -"Qod" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoe" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qof" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qog" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoh" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qoi" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) -"Qoj" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qok" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qol" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"Qom" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qon" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoo" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qop" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qoq" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qor" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) -"Qos" = ( -/obj/structure/grille, -/turf/open/floor/plating/airless, -/area/space/nearstation) -"Qot" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qou" = ( -/obj/structure/lattice, -/obj/structure/grille, -/turf/open/space/basic, -/area/space/nearstation) -"Qov" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 ->>>>>>> e7197ec... Nearstation fixes (#32931) }, /turf/open/floor/plasteel, /area/engine/gravity_generator) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index d449da13dc..1eb515a49b 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -34047,22 +34047,7 @@ width = 18 }, /turf/open/space, -<<<<<<< HEAD -/area/space) -======= /area/space/nearstation) -"swt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/rnd/protolathe/department/service, -/turf/open/floor/plasteel/redyellow, -/area/crew_quarters/bar/atrium) -"swu" = ( -/obj/machinery/rnd/protolathe/department/medical, -/turf/closed/wall, -/area/medical/medbay/zone3) ->>>>>>> e7197ec... Nearstation fixes (#32931) (1,1,1) = {" aaa