From ab4eaceab25516cadc5e8a45f110c47a7732d560 Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Thu, 4 Jul 2024 21:53:41 -0400 Subject: [PATCH] [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] --- _maps/map_files/Birdshot/birdshot.dmm | 684 +++++++++++++++++- .../map_files/Deltastation/DeltaStation2.dmm | 47 +- .../map_files/IceBoxStation/IceBoxStation.dmm | 60 +- _maps/map_files/MetaStation/MetaStation.dmm | 64 +- _maps/map_files/NSVBlueshift/Blueshift.dmm | 11 +- _maps/map_files/NorthStar/north_star.dmm | 24 +- _maps/map_files/Ouroboros/Ouroboros.dmm | 4 + _maps/map_files/VoidRaptor/VoidRaptor.dmm | 16 +- _maps/map_files/wawastation/wawastation.dmm | 99 +-- 9 files changed, 892 insertions(+), 117 deletions(-) diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index e26e6340033..964e1222c1f 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -546,6 +546,28 @@ }, /turf/open/floor/wood/tile, /area/station/command/bridge) +<<<<<<< HEAD +======= +"ani" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/station/service/chapel) +"anD" = ( +/mob/living/basic/goat/pete, +/obj/effect/turf_decal/weather/snow, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "anJ" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -1595,6 +1617,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +"aIi" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/textured_half, +/area/station/service/library) "aIk" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -2058,12 +2087,14 @@ /obj/structure/toilet{ dir = 4 }, +/obj/machinery/light/small/directional/west, +/obj/structure/sign/poster/official/random/directional/west, /obj/machinery/button/door/directional/north{ + id = "Toilet1"; + specialfunctions = 4; name = "Lock Control"; - id = "Toilet1" + normaldoorcontrol = 1 }, -/obj/machinery/light/small/directional/west, -/obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron/white/small, /area/station/commons/toilet/restrooms) "aTc" = ( @@ -3456,6 +3487,33 @@ /obj/effect/gibspawner, /turf/open/floor/wood, /area/station/maintenance/starboard/greater) +<<<<<<< HEAD +======= +"bzj" = ( +/obj/machinery/rnd/production/techfab/department/service, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/small, +/area/station/hallway/secondary/service) +"bzJ" = ( +/obj/structure/table/wood, +/obj/machinery/barsign{ + chosen_sign = "thecavern"; + icon_state = "thecavern"; + pixel_y = 32 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/chem_dispenser/drinks/beer, +/turf/open/floor/iron/dark/textured, +/area/station/service/bar) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "bzZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, @@ -5168,7 +5226,9 @@ }, /obj/machinery/button/door/directional/north{ id = "CabinS"; - name = "Bolt Control" + name = "Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 }, /turf/open/floor/carpet/green, /area/station/commons/dorms) @@ -5712,6 +5772,37 @@ "ctH" = ( /turf/open/floor/iron/herringbone, /area/station/commons/dorms) +<<<<<<< HEAD +======= +"ctN" = ( +/obj/structure/closet/secure_closet/freezer/empty, +/obj/item/food/grown/tomato{ + pixel_y = 2; + pixel_x = 2 + }, +/obj/item/food/grown/tomato{ + pixel_y = 2; + pixel_x = 2 + }, +/obj/item/food/grown/eggplant{ + pixel_y = 5; + pixel_x = 5 + }, +/obj/item/food/grown/eggplant{ + pixel_y = 5; + pixel_x = 5 + }, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/turf/open/floor/iron/kitchen/small, +/area/station/service/kitchen) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "cua" = ( /obj/effect/spawner/random/maintenance, /obj/effect/spawner/random/structure/crate, @@ -5781,6 +5872,21 @@ dir = 1 }, /area/station/cargo/bitrunning/den) +<<<<<<< HEAD +======= +"cvX" = ( +/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/airalarm/directional/east, +/obj/item/kirbyplants/random, +/turf/open/floor/stone, +/area/station/service/bar) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "cwb" = ( /obj/effect/turf_decal/stripes/white/end{ dir = 1 @@ -6430,6 +6536,25 @@ }, /turf/open/space/basic, /area/station/engineering/atmos/space_catwalk) +<<<<<<< HEAD +======= +"cJv" = ( +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/obj/machinery/door/airlock/hydroponics/glass{ + name = "Hydroponics" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/textured_half{ + dir = 8 + }, +/area/station/service/hydroponics) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "cJz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6490,6 +6615,16 @@ "cKk" = ( /turf/closed/mineral/random/stationside, /area/station/ai_monitored/turret_protected/aisat/maint) +<<<<<<< HEAD +======= +"cKt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "cKv" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -7075,9 +7210,15 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +<<<<<<< HEAD /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/greater) +======= +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "cXu" = ( /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/open/floor/plating, @@ -9715,6 +9856,10 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/camera/autoname/directional/east, /obj/machinery/light/cold/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "ebB" = ( @@ -9996,6 +10141,19 @@ /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron/smooth, /area/station/engineering/atmos/office) +<<<<<<< HEAD +======= +"ehT" = ( +/obj/machinery/door/airlock{ + id_tag = "commiss2"; + name = "Commissary" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/textured_half, +/area/station/commons/vacant_room/commissary) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "ehV" = ( /obj/structure/cable, /obj/structure/chair/sofa/right{ @@ -10134,6 +10292,14 @@ }, /turf/open/floor/catwalk_floor, /area/station/engineering/main) +"ejX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/vending/cigarette, +/turf/open/floor/stone, +/area/station/service/bar) "ekf" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -10478,6 +10644,19 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/engineering/atmos/storage/gas) +<<<<<<< HEAD +======= +"erf" = ( +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/obj/machinery/door/airlock/hydroponics/glass{ + name = "Hydroponics" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/textured_half{ + dir = 8 + }, +/area/station/service/hydroponics) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "erg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -13237,6 +13416,32 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/engine, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"fvK" = ( +/obj/item/holosign_creator/robot_seat/restaurant, +/obj/item/book/manual/chef_recipes, +/obj/item/stack/package_wrap{ + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/machinery/light_switch/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/turf/open/floor/iron/kitchen/small, +/area/station/service/kitchen) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "fvL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -13907,7 +14112,9 @@ }, /obj/machinery/button/door/directional/north{ name = "Lock Control"; - id = "Toilet2" + id = "Toilet2"; + specialfunctions = 4; + normaldoorcontrol = 1 }, /obj/machinery/light/small/directional/west, /obj/structure/sign/poster/contraband/random/directional/west, @@ -17307,6 +17514,14 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/freezer, /area/station/command/heads_quarters/captain/private) +"gRH" = ( +/obj/machinery/button/door/directional/north{ + id = "Cabin4"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1 + }, +/turf/closed/wall, +/area/station/service/abandoned_gambling_den) "gRL" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -19976,6 +20191,35 @@ /obj/structure/sign/departments/telecomms/directional/south, /turf/open/floor/iron, /area/station/science/lobby) +<<<<<<< HEAD +======= +"hHj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/service/bar, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +"hHn" = ( +/obj/effect/turf_decal/weather/snow, +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/effect/turf_decal/weather/snow/corner, +/obj/item/food/meat/bacon, +/obj/item/food/meat/bacon, +/obj/item/food/meat/slab/monkey, +/obj/item/food/meat/slab/monkey, +/obj/item/food/meat/slab/monkey, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +"hHy" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/chapel) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "hHE" = ( /obj/effect/turf_decal/bot_white, /turf/open/floor/engine, @@ -22444,7 +22688,7 @@ name = "Cabin Bolt Control"; normaldoorcontrol = 1; specialfunctions = 4; - id = "Cabin4" + id = "Cabin1" }, /turf/open/floor/carpet/orange, /area/station/commons/dorms) @@ -25201,6 +25445,29 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/tile, /area/station/command/corporate_showroom) +<<<<<<< HEAD +======= +"jwl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/dark_red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security) +"jwt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table, +/turf/open/floor/iron/kitchen/small, +/area/station/service/kitchen) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "jwC" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ dir = 5 @@ -31781,6 +32048,23 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron/dark, /area/station/cargo/office) +<<<<<<< HEAD +======= +"lEs" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/machinery/computer/order_console/cook{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/small, +/area/station/hallway/secondary/service) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "lEJ" = ( /obj/machinery/door/poddoor{ id = "QMLoaddoor"; @@ -33308,12 +33592,26 @@ pixel_x = -16; pixel_y = 3 }, +<<<<<<< HEAD /obj/item/flashlight/lamp/green{ pixel_x = 8; pixel_y = 3 }, /turf/open/floor/wood/parquet, /area/station/service/library) +======= +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +"mae" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/chem_dispenser/drinks, +/turf/open/floor/iron/dark/textured, +/area/station/service/bar) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "maf" = ( /turf/closed/wall/rust, /area/station/hallway/primary/fore) @@ -37293,6 +37591,21 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/storage) +<<<<<<< HEAD +======= +"nxy" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/obj/effect/turf_decal/weather/snow, +/obj/structure/closet/secure_closet/freezer/meat, +/obj/effect/turf_decal/weather/snow/corner, +/obj/item/food/meat/slab/monkey, +/obj/item/food/meat/slab/monkey, +/obj/item/food/meat/slab/monkey, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "nxD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40713,10 +41026,15 @@ /obj/item/circuitboard/machine/biogenerator, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) +<<<<<<< HEAD "oJl" = ( /obj/machinery/door/airlock/engineering{ name = "Main Engineering" }, +======= +"oIY" = ( +/obj/effect/turf_decal/delivery, +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41391,7 +41709,21 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/security/evidence) +<<<<<<< HEAD "oUO" = ( +======= +"oUV" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/right/directional/east, +/turf/open/floor/iron/textured_half{ + dir = 8 + }, +/area/station/service/hydroponics) +"oVl" = ( +/obj/machinery/vending/wardrobe/bar_wardrobe, +/obj/machinery/power/apc/auto_name/directional/north, +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 @@ -43859,6 +44191,7 @@ /area/station/service/chapel) "pHS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "pId" = ( @@ -44817,6 +45150,16 @@ }, /turf/open/floor/iron/dark/side, /area/station/science/xenobiology) +<<<<<<< HEAD +======= +"pWj" = ( +/obj/machinery/door/airlock{ + name = "Kitchen" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "pWl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44976,6 +45319,17 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) +<<<<<<< HEAD +======= +"pXH" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/table, +/turf/open/floor/iron/kitchen/small, +/area/station/service/kitchen) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "pXL" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -48699,9 +49053,16 @@ /obj/effect/turf_decal/trimline/neutral/line{ dir = 1 }, +<<<<<<< HEAD /obj/effect/turf_decal/trimline/neutral/line, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +======= +/obj/effect/mapping_helpers/airlock/access/any/security/general, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/central/lesser) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "rce" = ( /obj/machinery/camera{ c_tag = "Xenobiology - Cell 3"; @@ -49373,8 +49734,10 @@ dir = 4 }, /obj/machinery/button/door/directional/north{ - id = "Cabin4"; - name = "Cabin Bolt Control" + id = "Cabin3"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 }, /turf/open/floor/carpet/blue, /area/station/commons/dorms) @@ -53525,6 +53888,7 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) +<<<<<<< HEAD "sxd" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -53542,6 +53906,22 @@ pixel_x = 7 }, /turf/open/floor/iron/cafeteria, +======= +"swW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/stone, +/area/station/service/bar) +"sxl" = ( +/obj/machinery/oven/range, +/obj/machinery/airalarm/directional/north, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/kitchen/small, +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) /area/station/service/kitchen) "sxm" = ( /turf/closed/wall, @@ -58075,6 +58455,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +<<<<<<< HEAD +======= +"tQC" = ( +/obj/machinery/door/firedoor, +/obj/machinery/seed_extractor, +/obj/machinery/door/window/right/directional/east, +/turf/open/floor/iron/textured_half{ + dir = 8 + }, +/area/station/service/hydroponics) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "tQQ" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -60793,6 +61184,10 @@ "uDE" = ( /obj/structure/window/spawner/directional/north, /obj/structure/flora/bush/flowers_yw/style_random, +/obj/machinery/door/airlock{ + id_tag = "Toilet1"; + name = "Unit 1" + }, /turf/open/misc/sandy_dirt, /area/station/commons/fitness/locker_room) "uDF" = ( @@ -61512,10 +61907,13 @@ /obj/machinery/shower/directional/east, /turf/open/floor/iron/dark/small, /area/station/engineering/break_room) +<<<<<<< HEAD "uNn" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/spacebridge) +======= +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "uNz" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark_red{ @@ -62233,6 +62631,18 @@ }, /turf/open/floor/iron, /area/station/security/brig/entrance) +<<<<<<< HEAD +======= +"uZy" = ( +/obj/effect/turf_decal/weather/snow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "uZA" = ( /obj/structure/chair{ dir = 1; @@ -63915,7 +64325,9 @@ }, /obj/machinery/button/door/directional/south{ id = "Cabin4"; - name = "Cabin Bolt Control" + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 }, /turf/open/floor/carpet, /area/station/commons/dorms) @@ -67138,7 +67550,9 @@ "wrx" = ( /obj/machinery/button/door/directional/north{ name = "Lock Control"; - id = "Toilet3" + id = "Toilet3"; + specialfunctions = 4; + normaldoorcontrol = 1 }, /obj/machinery/recharge_station, /obj/structure/sign/poster/official/random/directional/east, @@ -69004,6 +69418,23 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +<<<<<<< HEAD +======= +"wRO" = ( +/obj/machinery/door/airlock{ + name = "Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/central/greater) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "wRP" = ( /obj/machinery/camera/directional/south{ c_tag = "Atmospherics - South" @@ -69302,6 +69733,27 @@ dir = 1 }, /area/station/hallway/secondary/construction) +<<<<<<< HEAD +======= +"wWC" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/obj/effect/landmark/start/librarian, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/grimy, +/area/station/service/library) +"wWD" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "wWP" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ @@ -72150,6 +72602,10 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"xHb" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "xHc" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -95047,6 +95503,7 @@ paV wLJ ojl jVM +<<<<<<< HEAD vwg ycS tEI @@ -95067,6 +95524,32 @@ kev qtl qtl qtl +======= +hIm +azq +iTv +wMg +wKr +vtr +mcV +iGq +uTE +eKD +oCi +wFd +wFd +wFd +nEq +qie +oCV +kuk +iuR +iuR +dDB +dDB +dDB +dDB +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) dDB dDB dDB @@ -95559,6 +96042,7 @@ ntY jVM uPd jVM +<<<<<<< HEAD lxK rnw sON @@ -95581,6 +96065,32 @@ hyl wlf qTM qtl +======= +hdI +kRA +paJ +wMg +iZM +fEX +fkF +jLS +jkT +oxn +saL +iLh +hEJ +hEJ +aIi +qWV +eZi +kHX +tYX +dDB +dDB +dDB +dDB +dDB +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) dDB dDB dDB @@ -99670,6 +100180,7 @@ jVM qhp rpy jVM +<<<<<<< HEAD gTV oXt xCu @@ -99685,6 +100196,26 @@ vVw lJc wEp tIL +======= +ruS +sem +bxl +uZy +tGq +fvK +aTg +pXH +wKX +nDm +tOK +aTg +aTg +xUp +bIN +bVJ +sTb +kUL +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) tYX dDB dDB @@ -101978,6 +102509,7 @@ tgl iSi fLn mLU +<<<<<<< HEAD jVM jVM jVM @@ -102006,6 +102538,36 @@ mVY sDT wHX mVY +======= +tgl +tgl +tgl +vkh +kXC +omk +hsx +pJc +bKO +eGU +xQE +vkI +cIX +ofU +omb +ycS +lJm +vkh +elN +dPp +sFs +fZZ +tYX +dDB +dDB +dDB +dDB +dDB +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) dDB dDB qIf @@ -102237,6 +102799,7 @@ pbd wtv hxp qhs +<<<<<<< HEAD qIg jVM jVM @@ -102263,6 +102826,34 @@ npY qTM qTM qtl +======= +oRv +vkh +cWB +ccv +tVp +ioa +fBB +eGU +eTJ +wAa +oDX +bFd +iBa +grI +ejX +ove +nUd +dPp +jjZ +bje +tYX +dDB +dDB +dDB +dDB +dDB +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) dDB dDB qIf @@ -102492,6 +103083,7 @@ tgl lvA nyy diK +<<<<<<< HEAD rTt xkW nAO @@ -102520,6 +103112,36 @@ vOh qTM qTM qtl +======= +xvK +jgb +hRc +vkh +mkD +mpB +dxV +bKO +bKO +eGU +eTJ +wAa +cQN +bXR +cmB +ycS +swW +ove +nUd +eXZ +qBn +sMt +tYX +dDB +dDB +dDB +dDB +dDB +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) dDB dDB qIf @@ -103006,6 +103628,7 @@ tgl tgl tgl tgl +<<<<<<< HEAD wRD hRc hoU @@ -103029,6 +103652,31 @@ mpO ubf oEr yeh +======= +uIP +dsK +pHY +vkh +blB +wKH +lso +wOt +wOt +gGx +xtD +gIv +cAl +wOt +wOt +wOt +cvX +vkh +aWf +vip +duE +aOh +xli +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) blb blb blb @@ -108671,10 +109319,18 @@ kAJ qUt umM tNs +<<<<<<< HEAD umM qNz umM rSj +======= +tNs +tNs +tNs +tNs +rbW +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) spP bRt wsb @@ -116100,7 +116756,7 @@ aJq aJq aJq wOp -wOp +gRH wOp wOp nWk @@ -124369,9 +125025,9 @@ oZz xZJ aVT enG -enG -enG -enG +xHb +xHb +xHb pHS xpR kQt diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 6fdf7439474..b381118d2ae 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -6678,6 +6678,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/herringbone, /area/station/cargo/miningoffice) +"bFD" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "bFS" = ( /obj/effect/turf_decal/trimline/blue/filled/warning, /obj/structure/cable, @@ -14686,6 +14697,10 @@ }, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"dDB" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "dDT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/trinary/filter{ @@ -20770,7 +20785,9 @@ /turf/open/floor/iron/white, /area/station/science/research) "fff" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/station/science/ordnance/burnchamber" + }, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{ @@ -27904,6 +27921,7 @@ dir = 6 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "gQH" = ( @@ -33619,6 +33637,7 @@ /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/full, /obj/machinery/holopad, +/obj/structure/cable, /turf/open/floor/iron/dark/smooth_large, /area/station/science/ordnance) "iqj" = ( @@ -34764,6 +34783,11 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"iFt" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "iFD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -44616,6 +44640,8 @@ "lcP" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "lcT" = ( @@ -47686,6 +47712,7 @@ /obj/machinery/meter/layer2, /obj/structure/sign/warning/no_smoking/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "lOA" = ( @@ -62131,6 +62158,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"pDx" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "pDz" = ( /obj/machinery/quantum_server, /obj/effect/turf_decal/bot/left, @@ -129322,7 +129359,7 @@ nJK yex iML tgI -uUG +iFt djT kzc kzc @@ -129836,7 +129873,7 @@ hGI esH owX asW -nSb +bFD nSb jHm ucu @@ -130093,7 +130130,7 @@ hNW hNW hNW hNW -hNW +dDB hNW nLP hNW @@ -130350,7 +130387,7 @@ lzo vbO uXN eqB -eyH +pDx eyH pwD eyH diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 984cf0ca129..de16d87a9fa 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1938,7 +1938,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "aEM" = ( /obj/structure/sign/departments/cargo, /turf/closed/wall/r_wall, @@ -2627,6 +2627,7 @@ /obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance) "aQy" = ( @@ -4470,7 +4471,7 @@ "bqX" = ( /obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "bqY" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance/two, @@ -5743,6 +5744,10 @@ }, /obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "bIl" = ( @@ -8443,7 +8448,7 @@ "cuB" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "cuJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -15282,7 +15287,7 @@ "evc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "evk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17163,10 +17168,8 @@ /turf/open/floor/iron, /area/station/engineering/main) "fcj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/science/ordnance) +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) "fco" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/effect/turf_decal/siding/wood{ @@ -18752,7 +18755,7 @@ "fCS" = ( /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "fCW" = ( /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark/textured, @@ -20348,6 +20351,7 @@ /obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "gcB" = ( @@ -28088,7 +28092,7 @@ /area/station/maintenance/port/fore) "iwq" = ( /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "iwx" = ( /obj/machinery/door/airlock/maintenance{ name = "Xenobiology Maintenance" @@ -28490,7 +28494,7 @@ "iCe" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "iCg" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -37310,7 +37314,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "lgW" = ( /obj/machinery/meter/monitored/distro_loop, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, @@ -46933,7 +46937,7 @@ "ocd" = ( /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "ocp" = ( /obj/effect/landmark/start/hangover, /obj/effect/decal/cleanable/dirt, @@ -58081,7 +58085,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "rmM" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -58237,7 +58241,7 @@ "roW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "roX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -58860,7 +58864,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "rzj" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty{ @@ -59327,6 +59331,7 @@ "rEj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance) "rEn" = ( @@ -61706,7 +61711,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "sqN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75855,7 +75860,7 @@ "wKh" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "wKv" = ( /obj/structure/table, /obj/item/radio/off, @@ -79003,6 +79008,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance) "xEW" = ( @@ -194477,7 +194483,7 @@ opD mxc hFb hFb -fcj +qRO mEL vqv fkN @@ -194991,7 +194997,7 @@ opD jGR hFb hFb -fcj +qRO rRl vfI vUY @@ -195246,9 +195252,9 @@ odm odm nqy jGR -fcj -fcj -fcj +qRO +qRO +qRO rRl ndb bnZ @@ -195496,10 +195502,10 @@ thA thA rcY iDt -uIf -uIf -uIf -uIf +fcj +fcj +fcj +fcj roW roW bId diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 25448696a60..94a6a0c4bcb 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1722,7 +1722,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/machinery/firealarm/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "aHM" = ( @@ -4507,7 +4510,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "bEA" = ( /obj/structure/cable, /obj/machinery/camera/directional/south{ @@ -5986,7 +5989,7 @@ "cgP" = ( /obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "cgZ" = ( /obj/machinery/light_switch/directional/east, /obj/structure/cable, @@ -7759,7 +7762,7 @@ dir = 1 }, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "cOX" = ( /obj/structure/sign/warning/radiation/rad_area/directional/north, /obj/effect/turf_decal/stripes/line{ @@ -9860,7 +9863,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "dEH" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -10734,7 +10737,7 @@ "dTN" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "dTQ" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 4 @@ -10995,7 +10998,7 @@ /area/station/security/execution/education) "dXU" = ( /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "dYa" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, @@ -13557,7 +13560,7 @@ "eRn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "eRR" = ( /obj/structure/table, /obj/item/screwdriver{ @@ -17137,7 +17140,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "giA" = ( /turf/closed/wall/r_wall, /area/station/tcommsat/computer) @@ -26666,6 +26669,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "jvr" = ( @@ -28888,7 +28893,7 @@ "kgC" = ( /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "kgV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -38830,7 +38835,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "nJG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -39632,7 +39637,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "oac" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -39965,7 +39970,7 @@ dir = 1 }, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "oew" = ( /turf/open/floor/iron, /area/station/commons/fitness/recreation) @@ -49235,7 +49240,25 @@ "rtj" = ( /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, +<<<<<<< HEAD /area/station/science/ordnance) +======= +/area/station/science/ordnance/burnchamber) +"rtz" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/pdapainter/supply, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "rtD" = ( /obj/effect/turf_decal/tile/purple, /obj/machinery/light/directional/east, @@ -51060,6 +51083,9 @@ }, /turf/open/floor/iron, /area/station/security/prison/visit) +"rXT" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) "rXW" = ( /obj/item/radio/intercom/directional/west, /obj/structure/table/glass, @@ -68559,7 +68585,7 @@ "xYZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "xZb" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, @@ -100563,12 +100589,12 @@ fhi fhi uEo fiS -gyQ +rXT eRn -gyQ -gyQ -gyQ -gyQ +rXT +rXT +rXT +rXT lMJ uGg nFa diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index cf4a1aa0b9d..4ae3542bfeb 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -39335,6 +39335,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance) "hBq" = ( @@ -45410,6 +45411,10 @@ dir = 4 }, /area/station/commons/fitness) +"iJc" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/science/ordnance) "iJe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -111058,6 +111063,10 @@ /area/station/common/wrestling/lobby) "viz" = ( /obj/machinery/light/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance) "viC" = ( @@ -230709,7 +230718,7 @@ lDr kUp lDr obm -lDr +iJc xbd deB nQB diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 6a5baa0fdf1..3bb14b18a12 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -72,6 +72,13 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/toilet) +"aaN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "aaO" = ( /obj/machinery/computer/atmos_alert{ dir = 4 @@ -6950,6 +6957,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) "bJQ" = ( @@ -14495,6 +14503,7 @@ /area/station/maintenance/floor1/starboard/fore) "dIJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "dIO" = ( @@ -24670,6 +24679,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "gwl" = ( @@ -35243,6 +35253,7 @@ /obj/effect/turf_decal/stripes{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "jjo" = ( @@ -59558,6 +59569,10 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/north{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) "pqO" = ( @@ -60792,6 +60807,10 @@ dir = 8 }, /area/station/security/office) +"pGz" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "pGG" = ( /obj/structure/ladder, /obj/structure/lattice/catwalk, @@ -91279,6 +91298,7 @@ /area/station/commons/vacant_room/office) "xxA" = ( /obj/machinery/holopad, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "xxC" = ( @@ -315694,8 +315714,8 @@ dWz lYx unQ wMU -oUW -rDL +aaN +pGz jjj dIJ oTq diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index f9799d9c467..da5bf0f84be 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -36563,6 +36563,10 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, /turf/open/floor/iron/half, /area/station/science/ordnance) "kBT" = ( diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 374f4b5e3cc..1912a32386d 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -11116,7 +11116,6 @@ /turf/open/floor/pod/dark, /area/station/service/chapel/funeral) "dou" = ( -/obj/machinery/airalarm/directional/south, /obj/structure/rack, /obj/effect/turf_decal/trimline/dark_red/filled/line, /obj/item/pipe_dispenser, @@ -21710,9 +21709,6 @@ /obj/structure/closet/crate/solarpanel_small, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/solars/starboard/fore) -"got" = ( -/turf/closed/wall/r_wall, -/area/station/maintenance/eva_shed/port) "gou" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28121,6 +28117,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_red/filled/corner, +/obj/structure/cable, /turf/open/floor/iron/smooth_corner, /area/station/science/ordnance) "idO" = ( @@ -31294,6 +31291,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/station/science/ordnance) "iXk" = ( @@ -44134,6 +44132,7 @@ dir = 5 }, /obj/effect/turf_decal/bot, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/smooth, /area/station/science/ordnance) "mvb" = ( @@ -46569,7 +46568,6 @@ /area/station/command/bridge) "ncR" = ( /obj/structure/closet/bombcloset, -/obj/structure/cable, /obj/effect/turf_decal/trimline/dark_red/filled/line{ dir = 1 }, @@ -83607,6 +83605,10 @@ name = "science camera"; network = list("ss13","rd") }, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, /turf/open/floor/iron/smooth_edge{ dir = 8 }, @@ -119019,7 +119021,7 @@ ttw xMq xMq xMq -got +xxv lbj jSB ska @@ -119792,7 +119794,7 @@ ttw ttw xxv ska -got +xxv nxj cut cut diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 637da6f7c06..cfd0cb1fd3c 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -1356,7 +1356,7 @@ "awf" = ( /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "awi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, @@ -6150,9 +6150,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ckb" = ( -/obj/effect/turf_decal/siding/dark_blue{ - dir = 2 - }, +/obj/effect/turf_decal/siding/dark_blue, /obj/machinery/holopad, /turf/open/floor/iron/textured_large, /area/station/command/bridge) @@ -6897,7 +6895,7 @@ network = list("ss13","rd") }, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "cAQ" = ( /obj/vehicle/sealed/mecha/ripley/cargo, /obj/effect/decal/cleanable/dirt, @@ -7715,7 +7713,7 @@ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "cQK" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -9338,7 +9336,6 @@ dir = 4 }, /obj/structure/chair{ - dir = 2; name = "Defense" }, /obj/structure/cable, @@ -9656,7 +9653,7 @@ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "dyV" = ( /obj/structure/railing{ dir = 1 @@ -11429,9 +11426,7 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "ebE" = ( -/obj/effect/spawner/structure/window/hollow/end{ - dir = 2 - }, +/obj/effect/spawner/structure/window/hollow/end, /turf/open/floor/plating, /area/station/security/courtroom) "ebN" = ( @@ -11514,6 +11509,7 @@ pixel_x = 3; pixel_y = -2 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "edv" = ( @@ -11610,7 +11606,7 @@ "efL" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "efQ" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -11658,7 +11654,7 @@ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "egY" = ( /obj/machinery/light_switch/directional/west, /turf/open/openspace, @@ -13284,6 +13280,10 @@ pixel_y = 7 }, /obj/item/pipe_dispenser, +/obj/machinery/power/apc/auto_name/directional/south{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "eLe" = ( @@ -25122,9 +25122,7 @@ /area/station/medical/medbay/central) "jbL" = ( /obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 2 - }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/white, /area/station/science/lobby) "jbM" = ( @@ -27158,7 +27156,6 @@ /area/station/maintenance/central/greater) "jIY" = ( /obj/structure/chair{ - dir = 2; name = "Defense" }, /obj/machinery/power/apc/auto_name/directional/north, @@ -31395,7 +31392,7 @@ dir = 8 }, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "lfu" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/effect/landmark/start/bartender, @@ -32591,9 +32588,7 @@ /turf/open/floor/iron/white, /area/station/medical/chemistry/minisat) "lCK" = ( -/obj/effect/turf_decal/siding/dark_blue{ - dir = 2 - }, +/obj/effect/turf_decal/siding/dark_blue, /turf/open/floor/iron/textured_large, /area/station/command/bridge) "lCO" = ( @@ -34275,7 +34270,7 @@ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "miR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35450,7 +35445,7 @@ "mDx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "mDF" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -36715,7 +36710,7 @@ /area/station/medical/medbay/central) "nbS" = ( /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "ncc" = ( /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/window/spawner/directional/north, @@ -37305,6 +37300,23 @@ dir = 1 }, /area/station/engineering/atmos) +<<<<<<< HEAD +======= +"nkM" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) +"nli" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnanceburn" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) "nlu" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -44900,7 +44912,7 @@ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "pZP" = ( /obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, @@ -52963,7 +52975,7 @@ pixel_y = -24 }, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "sLt" = ( /obj/machinery/camera/autoname/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57479,9 +57491,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "uoP" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ - dir = 2 - }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/catwalk_floor/flat_white, /area/station/medical/treatment_center) @@ -59890,7 +59900,7 @@ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "viK" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -60634,7 +60644,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "vyj" = ( /obj/structure/stairs/east, /obj/structure/railing, @@ -61446,7 +61456,7 @@ "vMR" = ( /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "vNc" = ( /obj/machinery/modular_computer/preset/id{ dir = 1 @@ -62567,7 +62577,7 @@ "wgI" = ( /obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "wgK" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -65370,7 +65380,7 @@ "xfQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "xfS" = ( /obj/structure/sign/departments/aisat/directional/east, /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ @@ -67611,7 +67621,7 @@ "xXF" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix, /turf/open/floor/engine, -/area/station/science/ordnance) +/area/station/science/ordnance/burnchamber) "xXY" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/siding/wideplating/dark/end{ @@ -110687,8 +110697,13 @@ gOY aks tTK tvB +<<<<<<< HEAD nSZ gOY +======= +cSI +nkM +>>>>>>> 5f138ff4297... [MIRROR] Uses ancient dark-mapper knowledge to correctly fix all science burn chambers' power [MDB IGNORE] (#3398) vxZ dyS lfq @@ -111202,11 +111217,11 @@ gKe lcd ecM eKT -gOY +nkM vxZ pZK lfq -gOY +nkM cxg cxg vxX @@ -112230,11 +112245,11 @@ gOY gOY pTx gOY -gOY -gOY -gOY -gOY -gOY +nkM +nkM +nkM +nkM +nkM bwC cLf bwC