From d6da5a38d0c7d748c65afa3e564ee09237d634fe Mon Sep 17 00:00:00 2001 From: WJohn Date: Sun, 4 Dec 2016 20:43:37 -0500 Subject: [PATCH] ACTUALLY FIXED THE CONFLICTS THIS TIME? --- _maps/map_files/MetaStation/MetaStation.dmm | 74 ++++++++----------- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 14 ++-- 2 files changed, 38 insertions(+), 50 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b683e1259a3..fb4320339e7 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -19600,11 +19600,6 @@ c_tag = "Auxillary Mining Base"; dir = 1 }, -/obj/machinery/camera{ - c_tag = "Auxillary Mining Base"; - dir = 1; - network = list("SS13","AuxBase") - }, /turf/open/floor/plating, /area/shuttle/auxillary_base) "aHG" = ( @@ -37725,11 +37720,7 @@ name = "\improper MiniSat Exterior" }) "bnq" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector{ - dir = 2; - icon_state = "inje_on"; - on = 1 - }, +/obj/machinery/atmospherics/components/unary/outlet_injector/on, /obj/structure/window/reinforced, /turf/open/floor/plating/airless, /area/construction/hallway{ @@ -58442,9 +58433,20 @@ }, /area/maintenance/starboard) "bWI" = ( -/mob/living/simple_animal/mouse, +/obj/machinery/door/airlock/external{ + name = "Engineering External Access"; + req_access = null; + req_access_txt = "10;13" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_y = 0 + }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/maintenance/starboard) +/area/engine/engineering) "bWJ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -70934,14 +70936,11 @@ /turf/open/space, /area/space) "crZ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector{ - dir = 8; - on = 1; - pixel_y = 0; - use_power = 0 +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8 }, /turf/open/floor/plating/airless, -/area/space) +/area/maintenance/incinerator) "csa" = ( /obj/structure/window/reinforced{ dir = 8 @@ -84813,9 +84812,6 @@ /turf/open/floor/plating/airless, /area/space) "cOH" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -84823,7 +84819,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/space) +/area/medical/virology) "cOI" = ( /obj/structure/grille, /obj/structure/window/reinforced/fulltile, @@ -85387,11 +85383,11 @@ /turf/open/floor/plating/airless, /area/space) "cPE" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 }, /turf/open/floor/plating/airless, -/area/space) +/area/medical/virology) "cPF" = ( /obj/structure/bodycontainer/morgue, /turf/open/floor/plasteel/black, @@ -85590,10 +85586,7 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/palebush, -/obj/structure/window/reinforced{ - dir = 5; - obj_integrity = 10000 - }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -86276,13 +86269,10 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/sunnybush, -/obj/structure/window/reinforced{ - dir = 5; - obj_integrity = 10000 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/hallway/secondary/exit{ name = "\improper Departure Lounge" @@ -87548,12 +87538,11 @@ /turf/open/floor/plasteel/black, /area/chapel/main) "cTE" = ( -/turf/closed/wall/shuttle{ - tag = "icon-wall3 (NORTHWEST)"; - icon_state = "wall3"; - dir = 9 +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8 }, -/area/shuttle/escape) +/turf/open/floor/plating/airless, +/area/toxins/xenobiology) "cTF" = ( /obj/machinery/door/window{ dir = 4; @@ -90629,10 +90618,7 @@ "cZs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 5; - obj_integrity = 10000 - }, +/obj/structure/window/reinforced/fulltile, /turf/open/floor/plating, /area/atmos) "cZt" = ( @@ -126184,7 +126170,7 @@ aaa aaa aaa aaf -crZ +cTE cTC cUq cUG @@ -136879,7 +136865,7 @@ ajh avN atw ayo -azn +bWI ayo ayo aDq @@ -136897,7 +136883,7 @@ aDq aDq ayo ayo -azn +bWI ayo ayo aKe diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 4edace553c8..8f06842440d 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -20571,6 +20571,7 @@ scrub_N2O = 0; scrub_Toxins = 0 }, +/obj/machinery/light/small, /turf/open/floor/plasteel, /area/storage/tools) "aUx" = ( @@ -45325,7 +45326,7 @@ dir = 2 }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/maintenance/aft) "bVy" = ( /obj/structure/grille, /obj/structure/disposalpipe/segment{ @@ -47411,7 +47412,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/maintenance/aft) "cag" = ( /obj/machinery/power/terminal{ dir = 4 @@ -48005,7 +48006,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/maintenance/aft) "cbk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48016,7 +48017,7 @@ on = 1 }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/maintenance/aft) "cbl" = ( /obj/machinery/camera{ c_tag = "Telecoms Server Room"; @@ -55920,7 +55921,7 @@ /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/space, -/area/space/nearstation) +/area/maintenance/asmaint) "csd" = ( /turf/open/floor/plating/airless/warnplate{ dir = 4 @@ -55992,7 +55993,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/space/nearstation) +/area/maintenance/asmaint) "csn" = ( /obj/structure/transit_tube/horizontal, /turf/open/space, @@ -59268,6 +59269,7 @@ req_access = null; req_access_txt = "10;13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/engine/engineering) "czi" = (