diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 96912d6f9db..63727270ae3 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -588,7 +588,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "agH" = ( /obj/machinery/conveyor{ dir = 1; @@ -849,7 +849,7 @@ /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "akn" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -1160,7 +1160,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "aoJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2159,7 +2159,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "aBc" = ( /obj/structure/chair/sofa/right, /turf/open/floor/carpet, @@ -3277,7 +3277,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "aSO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -3320,7 +3320,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "aTH" = ( /obj/structure/table/wood, /obj/item/folder/blue{ @@ -3641,7 +3641,7 @@ /area/station/maintenance/solars/port/fore) "aYP" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "aYR" = ( /obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -3704,7 +3704,7 @@ "bab" = ( /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "bag" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -3959,7 +3959,7 @@ "bdd" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "bdt" = ( /obj/structure/cable, /obj/structure/window/reinforced/plasma/spawner/west{ @@ -4081,7 +4081,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "bfy" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -6661,7 +6661,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "bMe" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7355,7 +7355,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "bTu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/grimy, @@ -7441,7 +7441,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "bUQ" = ( /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, @@ -8344,7 +8344,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "chY" = ( /obj/machinery/door/poddoor/shutters/radiation/preopen{ id = "engsm"; @@ -8403,7 +8403,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ciD" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/effect/turf_decal/tile/yellow{ @@ -8900,7 +8900,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "cqr" = ( /obj/machinery/door/airlock/command/glass{ name = "Server Access" @@ -8979,7 +8979,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "crR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -9015,7 +9015,7 @@ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "csw" = ( /turf/closed/wall, /area/station/service/hydroponics) @@ -9247,7 +9247,7 @@ /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "cwV" = ( /obj/effect/landmark/start/hangover, /obj/structure/disposalpipe/segment{ @@ -9969,7 +9969,7 @@ "cEV" = ( /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cFe" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -10007,7 +10007,7 @@ "cFC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "cFF" = ( /turf/open/floor/engine{ name = "Holodeck Projector Floor" @@ -10258,7 +10258,7 @@ /obj/machinery/firealarm/directional/east, /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "cJp" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -10813,7 +10813,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "cSr" = ( /obj/machinery/atmospherics/components/trinary/mixer{ color = "#FFFF00" @@ -10860,7 +10860,7 @@ "cSQ" = ( /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cTi" = ( /obj/machinery/camera/directional/south{ c_tag = "Holodeck - Aft 1"; @@ -10975,7 +10975,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "cUQ" = ( /obj/structure/closet/emcloset, /obj/structure/cable, @@ -11341,7 +11341,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "dbK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/hangover, @@ -13788,7 +13788,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "dOC" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/purple/fourcorners, @@ -13868,7 +13868,7 @@ }, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "dPp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -14593,7 +14593,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "edB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14856,7 +14856,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "ehD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/iron, @@ -16158,7 +16158,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "eze" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, @@ -16182,7 +16182,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "ezn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -16759,7 +16759,7 @@ "eJk" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "eJq" = ( /obj/machinery/portable_atmospherics/pump, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -16873,12 +16873,11 @@ /turf/open/floor/iron, /area/station/engineering/supermatter/room) "eLa" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas1"; +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "eLb" = ( /obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, @@ -17159,7 +17158,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "eOy" = ( /obj/structure/closet/secure_closet/brig{ name = "Prisoner Locker" @@ -18025,7 +18024,7 @@ /obj/structure/table/reinforced, /obj/item/controller, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "fbm" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -18220,7 +18219,7 @@ "fdr" = ( /obj/structure/sign/poster/random/directional/east, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "fdz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18711,7 +18710,7 @@ /obj/machinery/light/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "fiL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18746,7 +18745,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "fje" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/delivery, @@ -18945,7 +18944,7 @@ "fml" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "fms" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -20285,7 +20284,7 @@ dir = 6 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "fDm" = ( /obj/machinery/door/airlock/public/glass{ id_tag = "permabolt2"; @@ -20366,7 +20365,7 @@ /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "fEI" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 9 @@ -20491,7 +20490,7 @@ pixel_y = -3 }, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "fGt" = ( /obj/machinery/light/directional/north, /obj/structure/tank_holder/extinguisher, @@ -21329,7 +21328,7 @@ /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "fTz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21429,7 +21428,7 @@ pixel_y = 3 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "fVQ" = ( /obj/structure/chair/office/light{ dir = 1 @@ -21694,7 +21693,7 @@ dir = 6 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "fZK" = ( /obj/structure/rack, /obj/item/gun/ballistic/shotgun/riot{ @@ -23794,7 +23793,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "gCp" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -23832,7 +23831,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "gCP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -24062,7 +24061,7 @@ }, /obj/item/pipe_dispenser, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "gEP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24099,7 +24098,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "gFb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24619,7 +24618,7 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "gMy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, @@ -24867,7 +24866,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "gPG" = ( /obj/structure/weightmachine/weightlifter, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -25354,7 +25353,7 @@ /obj/effect/turf_decal/loading_area, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "gYj" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch" @@ -25630,7 +25629,7 @@ }, /obj/structure/table/reinforced, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "hct" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, @@ -26721,7 +26720,7 @@ "hvz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hvK" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -26741,7 +26740,7 @@ req_access = list("rd") }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "hvQ" = ( /obj/structure/disposalpipe/segment, /obj/item/kirbyplants/dead, @@ -27070,7 +27069,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hAN" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -27174,7 +27173,7 @@ /obj/structure/training_machine, /obj/item/target/syndicate, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "hCX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -27260,7 +27259,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hEr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -28509,7 +28508,7 @@ /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "hUB" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/effect/turf_decal/tile/yellow{ @@ -28594,7 +28593,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hVj" = ( /turf/open/floor/plating, /area/station/security/detectives_office/private_investigators_office) @@ -28822,7 +28821,7 @@ dir = 9 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "hYJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29163,7 +29162,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "icS" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -29522,7 +29521,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "ihD" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -30131,7 +30130,7 @@ }, /obj/machinery/meter/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ipz" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -30538,7 +30537,7 @@ /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ivR" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ dir = 4 @@ -30996,7 +30995,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "iBp" = ( /obj/machinery/door/window/left/directional/north{ name = "Engineering Delivery"; @@ -31084,7 +31083,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "iCZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -32109,7 +32108,7 @@ /area/station/cargo/storage) "iRS" = ( /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "iSb" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral, @@ -32487,7 +32486,7 @@ "iXL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "iXM" = ( /obj/structure/cable, /obj/item/kirbyplants/random, @@ -33223,7 +33222,7 @@ dir = 5 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "jgZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -33513,7 +33512,7 @@ "jjV" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "jjX" = ( /obj/item/storage/medkit/fire, /obj/effect/turf_decal/bot, @@ -33803,7 +33802,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "jox" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -33983,7 +33982,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "jsr" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -34167,7 +34166,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "jvF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34197,7 +34196,7 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "jvQ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -34675,7 +34674,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "jCa" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -35563,7 +35562,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "jNS" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/turf_decal/stripes/corner{ @@ -35589,7 +35588,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "jOg" = ( /obj/structure/cable, /obj/structure/rack, @@ -35841,7 +35840,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jQI" = ( /obj/structure/window/reinforced{ dir = 1 @@ -36789,7 +36788,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "kdy" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -37248,7 +37247,7 @@ pixel_y = 24 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "kim" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, @@ -37403,7 +37402,7 @@ pixel_y = 2 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "kkC" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -37654,7 +37653,7 @@ /area/station/maintenance/starboard) "knV" = ( /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "knY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -37958,7 +37957,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "ksH" = ( /obj/machinery/duct, /obj/effect/decal/cleanable/dirt, @@ -38071,7 +38070,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/remains/human, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "kub" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit/green, @@ -38315,7 +38314,7 @@ }, /obj/machinery/light/directional/east, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "kyx" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -38772,7 +38771,7 @@ piping_layer = 2 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "kFr" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -39454,7 +39453,7 @@ /obj/machinery/door/poddoor/massdriver_ordnance, /obj/structure/fans/tiny, /turf/open/floor/plating/airless, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "kPQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -39564,7 +39563,7 @@ /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "kRf" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -39572,7 +39571,7 @@ /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/box/red, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "kRi" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -39684,7 +39683,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "kSQ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/kirbyplants/random, @@ -39951,7 +39950,7 @@ "kWf" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "kWg" = ( /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -40288,7 +40287,7 @@ dir = 9 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "lav" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, @@ -40487,7 +40486,7 @@ /obj/structure/window/reinforced/spawner/west, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "lcA" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 @@ -40512,7 +40511,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "lcO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/corner{ @@ -40629,7 +40628,7 @@ dir = 10 }, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "ldM" = ( /obj/structure/window/reinforced{ dir = 1 @@ -40836,7 +40835,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/science/genetics, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "lgN" = ( /obj/machinery/door/window/brigdoor/left/directional/west{ name = "Captain's Bedroom"; @@ -41063,7 +41062,7 @@ /obj/item/transfer_valve, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "ljZ" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, @@ -41148,7 +41147,7 @@ dir = 10 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "lkG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -41285,7 +41284,7 @@ /area/station/ai_monitored/command/storage/eva) "lmq" = ( /turf/closed/wall/r_wall, -/area/station/science/misc_lab) +/area/station/science/explab) "lmM" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8 @@ -41295,7 +41294,7 @@ }, /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "lmP" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 4 @@ -41448,7 +41447,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "loA" = ( /obj/effect/turf_decal/tile/purple, /obj/machinery/firealarm/directional/south, @@ -41630,7 +41629,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "lrM" = ( /obj/machinery/firealarm/directional/west, /obj/structure/disposalpipe/segment, @@ -42037,7 +42036,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "lxF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -42152,7 +42151,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "lAd" = ( /obj/effect/turf_decal/bot, /obj/structure/tank_holder/extinguisher, @@ -42360,7 +42359,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "lCy" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -42426,7 +42425,7 @@ /area/station/maintenance/port/greater) "lDr" = ( /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "lDV" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall, @@ -43217,7 +43216,7 @@ /obj/item/raw_anomaly_core/random, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "lNL" = ( /turf/closed/wall, /area/station/tcommsat/server) @@ -43309,7 +43308,7 @@ /obj/item/compact_remote, /obj/item/compact_remote, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "lPm" = ( /obj/machinery/telecomms/server/presets/service, /obj/effect/turf_decal/tile/green/anticorner/contrasted, @@ -43623,7 +43622,7 @@ /area/station/medical/medbay/central) "lSP" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "lTg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red{ @@ -44216,7 +44215,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "mcp" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ @@ -44502,7 +44501,7 @@ "meY" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "meZ" = ( /obj/machinery/light/small/directional/east, /obj/structure/toilet{ @@ -45608,7 +45607,7 @@ }, /obj/machinery/meter, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "mtL" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/decal/cleanable/dirt, @@ -45827,7 +45826,7 @@ /area/station/medical/medbay/lobby) "mwm" = ( /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "mwo" = ( /obj/structure/sign/warning/no_smoking{ pixel_x = -32 @@ -46296,11 +46295,9 @@ /turf/open/floor/iron, /area/station/commons/lounge) "mDv" = ( -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas1" - }, +/obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "mDw" = ( /obj/structure/chair{ dir = 4 @@ -46447,7 +46444,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "mGm" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, @@ -46457,12 +46454,10 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "mGn" = ( -/obj/machinery/computer/atmos_control/noreconnect{ - atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber") - }, /obj/machinery/light/directional/north, +/obj/machinery/computer/atmos_control/ordnancemix, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "mGo" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/effect/decal/cleanable/dirt, @@ -46891,7 +46886,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "mMr" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -48090,7 +48085,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "ndz" = ( /obj/machinery/shieldgen, /obj/effect/decal/cleanable/dirt, @@ -48268,11 +48263,9 @@ /area/station/science/lobby) "nhi" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas2" - }, +/obj/machinery/air_sensor/ordnance_freezer_chamber, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "nhj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -48671,7 +48664,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "nnv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48699,7 +48692,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "nnR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -48978,7 +48971,7 @@ "nrA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "nrI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor_switch/oneway{ @@ -49401,7 +49394,7 @@ /obj/structure/cable, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "nyv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49665,7 +49658,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "nBF" = ( /obj/structure/cable, /obj/machinery/computer/rdconsole, @@ -50911,7 +50904,7 @@ "nRl" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/misc_lab) +/area/station/science/explab) "nRm" = ( /obj/machinery/light/small/directional/west, /obj/item/clothing/suit/caution, @@ -50955,7 +50948,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "nRZ" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -51602,7 +51595,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "nZW" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -52424,7 +52417,7 @@ dir = 6 }, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "okx" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red, @@ -53055,7 +53048,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/loading_area, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "ovH" = ( /obj/structure/rack, /obj/item/crowbar, @@ -53140,7 +53133,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "owj" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency, @@ -53154,7 +53147,7 @@ /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "owu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53253,7 +53246,7 @@ /obj/effect/turf_decal/box, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "oxD" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue, @@ -53362,7 +53355,7 @@ /area/station/service/chapel) "oyG" = ( /turf/closed/wall, -/area/station/science/misc_lab) +/area/station/science/explab) "oyQ" = ( /turf/open/floor/plating, /area/station/maintenance/port/greater) @@ -53668,7 +53661,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "oCs" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -54436,7 +54429,7 @@ }, /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "oNA" = ( /obj/structure/disposalpipe/segment, /obj/structure/chair/office{ @@ -54514,7 +54507,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "oOw" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -55423,7 +55416,7 @@ pixel_x = 25 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "pbF" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -55472,7 +55465,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "pbU" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -55555,7 +55548,7 @@ /obj/machinery/atmospherics/components/binary/valve/digital, /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "pdl" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -55740,7 +55733,7 @@ }, /obj/machinery/disposal/bin, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "pfq" = ( /obj/structure/chair/office/light{ dir = 4 @@ -56096,7 +56089,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/module_duplicator, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "pjN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56549,7 +56542,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "pqF" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/purple{ @@ -58291,7 +58284,7 @@ "pMV" = ( /obj/machinery/atmospherics/components/binary/valve/digital, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "pMW" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/status_display/evac/directional/south, @@ -59076,7 +59069,7 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "pYl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -59313,7 +59306,7 @@ "qbU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "qbW" = ( /obj/effect/landmark/start/hangover, /obj/structure/railing{ @@ -59446,6 +59439,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +"qeb" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/freezerchamber) "qee" = ( /obj/structure/chair/office{ dir = 8 @@ -59495,7 +59491,7 @@ /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "qep" = ( /obj/machinery/shower{ dir = 4 @@ -60348,7 +60344,7 @@ /obj/machinery/research/anomaly_refinery, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "qqO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -60477,7 +60473,7 @@ name = "Ordnance Lab Shutters" }, /turf/open/floor/plating, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "qsA" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -60540,7 +60536,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "qtg" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, @@ -60549,7 +60545,7 @@ "qtk" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "qts" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -60690,7 +60686,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "qvh" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/bot, @@ -61644,7 +61640,7 @@ /area/station/engineering/supermatter/room) "qJK" = ( /turf/closed/wall/r_wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "qJN" = ( /obj/machinery/button/door{ id = "brigwindows"; @@ -62437,7 +62433,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "qWU" = ( /obj/machinery/holopad, /obj/effect/turf_decal/tile/purple/fourcorners, @@ -62557,7 +62553,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "qYL" = ( /turf/closed/wall, /area/station/medical/morgue) @@ -62593,7 +62589,7 @@ dir = 4 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "qZM" = ( /obj/machinery/light/directional/north, /obj/structure/sign/nanotrasen{ @@ -63757,7 +63753,7 @@ /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "rqm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -63792,7 +63788,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "rqx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65476,7 +65472,7 @@ "rOk" = ( /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "rOn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65949,7 +65945,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "rUp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65987,7 +65983,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "rUB" = ( /obj/machinery/suit_storage_unit/cmo, /obj/effect/turf_decal/stripes/line{ @@ -66035,7 +66031,7 @@ /area/station/service/library/abandoned) "rVi" = ( /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "rVq" = ( /obj/structure/sink{ dir = 4; @@ -66481,7 +66477,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "sbh" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66610,7 +66606,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "scp" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/stripes/line{ @@ -67798,7 +67794,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "stN" = ( /obj/structure/railing{ dir = 10 @@ -69207,7 +69203,7 @@ "sKJ" = ( /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "sKP" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -70167,7 +70163,7 @@ "sXZ" = ( /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "sYk" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -70484,12 +70480,11 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 6 }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas2"; +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{ dir = 8 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "tcp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -70574,7 +70569,7 @@ /obj/item/integrated_circuit/loaded/speech_relay, /obj/item/integrated_circuit/loaded/hello_world, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "tdf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, @@ -70646,7 +70641,7 @@ dir = 9 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "teH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71045,7 +71040,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "tlJ" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 @@ -71317,7 +71312,7 @@ /obj/structure/closet/bombcloset, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "tpe" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -71853,7 +71848,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "tun" = ( /obj/structure/chair{ dir = 4 @@ -72311,7 +72306,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "tAM" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -72348,7 +72343,7 @@ /obj/item/stock_parts/cell/high, /obj/structure/table/reinforced, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "tBd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/wood{ @@ -72512,7 +72507,7 @@ }, /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, -/area/station/science/storage) +/area/station/science/ordnance/storage) "tDs" = ( /turf/closed/wall, /area/station/service/electronic_marketing_den) @@ -73619,7 +73614,7 @@ /obj/item/gun/energy/laser/practice, /obj/item/gun/energy/laser/practice, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "tQP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74239,7 +74234,7 @@ dir = 5 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "tYX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74601,7 +74596,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ucW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74684,7 +74679,7 @@ "udI" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "uec" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -75012,7 +75007,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "uif" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -75034,7 +75029,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "uil" = ( /obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/delivery, @@ -75062,7 +75057,7 @@ /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/box/red, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "uiP" = ( /obj/machinery/atmospherics/pipe/smart/manifold/dark/visible, /obj/effect/turf_decal/stripes/line{ @@ -75136,7 +75131,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ulb" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -75175,7 +75170,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ulQ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -75421,7 +75416,7 @@ "uoK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, -/area/station/science/storage) +/area/station/science/ordnance/burnchamber) "uoO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -75669,7 +75664,7 @@ /area/station/maintenance/port/aft) "usu" = ( /turf/closed/wall/r_wall, -/area/station/science/storage) +/area/station/science/ordnance/storage) "usB" = ( /obj/machinery/hydroponics/soil, /obj/effect/decal/cleanable/dirt, @@ -76126,7 +76121,7 @@ /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/misc_lab/range) +/area/station/science/auxlab) "uyf" = ( /obj/structure/table/reinforced, /obj/item/stock_parts/matter_bin{ @@ -76737,7 +76732,7 @@ /area/station/commons/fitness/recreation) "uIO" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "uIR" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -76796,7 +76791,7 @@ network = list("ss13","rd") }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "uKa" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 @@ -76902,7 +76897,7 @@ dir = 8 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "uLj" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -77830,7 +77825,7 @@ /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "uWu" = ( /obj/machinery/door/window{ base_state = "rightsecure"; @@ -77897,7 +77892,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "uXB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron{ @@ -78091,7 +78086,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "uZY" = ( /obj/structure/cable, /obj/machinery/door/airlock/external{ @@ -78518,7 +78513,7 @@ /obj/machinery/firealarm/directional/west, /obj/machinery/light/directional/west, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "vfP" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Access" @@ -78754,7 +78749,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "viO" = ( /obj/structure/cable, /obj/effect/turf_decal/delivery, @@ -79118,7 +79113,7 @@ }, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "voE" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -79134,7 +79129,7 @@ dir = 5 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "vpi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -79237,7 +79232,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor/heavy, /turf/open/floor/plating, -/area/station/science/storage) +/area/station/science/ordnance/storage) "vqr" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -79282,7 +79277,7 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/white, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "vqJ" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -79609,7 +79604,7 @@ dir = 10 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "vvJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -79827,7 +79822,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "vxL" = ( /obj/structure/barricade/wooden, /obj/effect/spawner/structure/window/reinforced, @@ -79953,7 +79948,7 @@ "vzF" = ( /obj/machinery/rnd/experimentor, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "vzK" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -80122,7 +80117,7 @@ "vBN" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "vBR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/chair/office{ @@ -80240,7 +80235,7 @@ }, /obj/item/multitool/circuit, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "vCM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -80381,7 +80376,7 @@ /obj/structure/window/reinforced, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "vEy" = ( /obj/machinery/telecomms/server/presets/medical, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -80410,7 +80405,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "vER" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -80896,7 +80891,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "vLP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -81052,7 +81047,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "vNB" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/blood/old, @@ -81070,7 +81065,7 @@ }, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "vNU" = ( /obj/structure/cable, /obj/machinery/firealarm/directional/south{ @@ -81743,7 +81738,7 @@ /area/station/hallway/secondary/service) "vWw" = ( /turf/closed/indestructible/opshuttle, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "vWA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/girder, @@ -81936,7 +81931,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "vZo" = ( /obj/machinery/smartfridge, /obj/effect/turf_decal/bot, @@ -83475,7 +83470,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "wsD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -83486,7 +83481,7 @@ "wsO" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "wte" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -83603,7 +83598,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "wuZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -84126,7 +84121,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "wAW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -84785,7 +84780,7 @@ dir = 5 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "wKV" = ( /obj/structure/table/reinforced, /obj/item/crowbar, @@ -84819,7 +84814,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "wLK" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -84885,7 +84880,7 @@ dir = 10 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "wNk" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, @@ -85357,7 +85352,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "wUE" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -85527,7 +85522,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "wXq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -86035,7 +86030,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "xee" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -86587,7 +86582,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "xna" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -87398,7 +87393,7 @@ /area/station/ai_monitored/command/storage/eva) "xwI" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing) +/area/station/science/ordnance) "xwK" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -87520,8 +87515,12 @@ }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, +/obj/item/computer_hardware/hard_drive/portable/scipaper_program{ + pixel_x = 4; + pixel_y = 1 + }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "xxH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/moisture_trap, @@ -87749,10 +87748,10 @@ /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "xAl" = ( /turf/closed/wall/r_wall, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "xAo" = ( /turf/closed/wall, /area/station/security/detectives_office/private_investigators_office) @@ -87913,7 +87912,7 @@ /obj/machinery/component_printer, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "xCC" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -87936,7 +87935,7 @@ /obj/structure/cable, /obj/machinery/light/directional/south, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "xDc" = ( /obj/effect/landmark/start/hangover, /obj/effect/decal/cleanable/dirt, @@ -87966,7 +87965,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "xDi" = ( /obj/machinery/status_display/evac/directional/south, /obj/machinery/camera/directional/south{ @@ -88945,7 +88944,7 @@ /area/station/security/prison) "xPA" = ( /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "xPM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -89304,7 +89303,7 @@ /obj/structure/table/reinforced, /obj/item/mmi, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "xVa" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral{ @@ -89477,7 +89476,7 @@ dir = 9 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "xXm" = ( /obj/machinery/light/small/directional/south, /obj/machinery/camera/directional/south{ @@ -89835,7 +89834,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "ydL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -90109,7 +90108,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "yhJ" = ( /turf/open/floor/plating/airless, /area/space/nearstation) @@ -90143,7 +90142,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/misc_lab/range) +/area/station/science/auxlab) "yie" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -90405,7 +90404,7 @@ }, /obj/item/analyzer, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "ymi" = ( /obj/machinery/light/directional/south, /obj/item/kirbyplants/random, @@ -121434,7 +121433,7 @@ swT sXZ sXZ sXZ -uIO +swT kzc wLE kzc @@ -121687,7 +121686,7 @@ cSQ vfK cEV cEV -usu +uIO iRS rOk iRS @@ -121944,7 +121943,7 @@ cSQ rUa cEV cEV -usu +uIO eLa mDv cso @@ -122201,7 +122200,7 @@ cSQ rUa udI udI -usu +uIO qYH rqo jBU @@ -122715,7 +122714,7 @@ vNK rUa vBN gMx -usu +uIO qYH cUL jBU @@ -122972,7 +122971,7 @@ uXw fjb uXw lcM -usu +xwI kil rVi uiL @@ -123748,11 +123747,11 @@ vZf vZf kWf lat -uIO +qeb agG -uIO +qeb bUb -uIO +qeb iCT xAf kzc @@ -124005,11 +124004,11 @@ sIX sIX lcy voK -uIO +qeb tcn nhi uLh -uIO +qeb gCj hUw kzc @@ -124266,7 +124265,7 @@ wXl qZv wsO teF -uIO +qeb gCj wAB kzc diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index b6ce71bc6cb..693204e59b0 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -180,7 +180,7 @@ dir = 1 }, /turf/open/openspace, -/area/station/science/mixing) +/area/station/science/ordnance/office) "aen" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 5 @@ -236,7 +236,7 @@ "afu" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "afz" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -557,7 +557,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "alT" = ( /turf/open/floor/carpet, /area/station/cargo/qm) @@ -882,7 +882,7 @@ pixel_y = 8 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "aqy" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -1299,7 +1299,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "axi" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/atmos{ @@ -1485,7 +1485,7 @@ dir = 10 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "aAc" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -1927,7 +1927,7 @@ /turf/open/floor/iron/cafeteria{ dir = 8 }, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "aIK" = ( /obj/structure/closet/toolcloset, /obj/machinery/status_display/evac/directional/south, @@ -2252,7 +2252,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "aMO" = ( /obj/structure/sign/poster/random/directional/east, /turf/closed/wall, @@ -2828,7 +2828,7 @@ pixel_x = 5 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "aVH" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/blue, @@ -3480,7 +3480,7 @@ dir = 1 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "bfL" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -3553,7 +3553,7 @@ dir = 5 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "bgZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3888,7 +3888,7 @@ /turf/open/floor/iron/white/side{ dir = 8 }, -/area/station/science/misc_lab) +/area/station/science/explab) "bmM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -4011,7 +4011,7 @@ /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "bnW" = ( /obj/item/paper_bin{ pixel_x = 1; @@ -4086,7 +4086,7 @@ "bpz" = ( /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "bpD" = ( /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/cafeteria{ @@ -4181,7 +4181,7 @@ /area/station/security/checkpoint/engineering) "brD" = ( /turf/open/floor/glass/reinforced, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "brL" = ( /obj/structure/railing/corner{ dir = 8 @@ -4688,7 +4688,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "bzJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/camera/directional/north{ @@ -4889,7 +4889,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "bCp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -5188,7 +5188,7 @@ }, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "bHl" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; @@ -5284,7 +5284,7 @@ "bJm" = ( /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "bJq" = ( /obj/docking_port/stationary/random/icemoon{ dir = 4; @@ -5534,7 +5534,7 @@ network = list("ss13","rd") }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "bNj" = ( /obj/structure/table, /obj/machinery/microwave, @@ -5701,7 +5701,7 @@ "bQf" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "bQh" = ( /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark/corner{ @@ -5999,7 +5999,7 @@ pixel_y = -2 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "bVJ" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -6294,7 +6294,7 @@ /area/station/hallway/primary/fore) "bZF" = ( /turf/closed/wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "bZG" = ( /obj/machinery/modular_computer/console/preset/civilian{ dir = 1 @@ -6781,7 +6781,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "chO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -7081,7 +7081,7 @@ "cmu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "cmv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7139,7 +7139,7 @@ /obj/item/compact_remote, /obj/item/compact_remote, /turf/open/floor/iron/white/corner, -/area/station/science/misc_lab) +/area/station/science/explab) "cnx" = ( /obj/machinery/power/tracker, /obj/structure/cable, @@ -7728,7 +7728,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "cya" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -7997,7 +7997,7 @@ pixel_y = 32 }, /turf/open/floor/glass/reinforced, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "cBh" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -8241,7 +8241,7 @@ pixel_y = 9 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "cFE" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -8252,7 +8252,7 @@ /turf/open/floor/iron/cafeteria{ dir = 8 }, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "cFT" = ( /obj/structure/rack, /obj/item/crowbar/red, @@ -8547,7 +8547,7 @@ dir = 6 }, /turf/open/openspace, -/area/station/science/mixing) +/area/station/science/ordnance/office) "cLo" = ( /obj/machinery/recharge_station, /turf/open/floor/iron, @@ -9316,7 +9316,7 @@ /area/station/science/xenobiology) "cXY" = ( /turf/closed/wall/r_wall, -/area/station/science/misc_lab) +/area/station/science/explab) "cXZ" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, @@ -9822,7 +9822,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "dgk" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/stripes/line{ @@ -9860,7 +9860,7 @@ /turf/open/floor/iron/white/side{ dir = 4 }, -/area/station/science/misc_lab) +/area/station/science/explab) "dhk" = ( /obj/structure/table/reinforced, /obj/machinery/camera{ @@ -9919,7 +9919,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "dip" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10714,7 +10714,7 @@ "dtV" = ( /obj/structure/cable, /turf/open/floor/iron/white/side, -/area/station/science/misc_lab) +/area/station/science/explab) "dtY" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -11500,7 +11500,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "dGi" = ( /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) @@ -11725,7 +11725,7 @@ "dJH" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "dJX" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow{ @@ -11834,11 +11834,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 8 }, -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas2" - }, +/obj/machinery/air_sensor/ordnance_freezer_chamber, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "dLH" = ( /obj/structure/fence{ dir = 1 @@ -11920,7 +11918,7 @@ "dMT" = ( /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "dMX" = ( /obj/structure/chair{ dir = 1; @@ -12382,7 +12380,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "dUG" = ( /obj/machinery/door/airlock/public/glass{ name = "Showers" @@ -13819,7 +13817,7 @@ network = list("ss13","rd") }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "euF" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Maintenance" @@ -14079,7 +14077,7 @@ /obj/machinery/light/directional/north, /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "eAw" = ( /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating/snowed/icemoon, @@ -14442,7 +14440,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "eFS" = ( /obj/machinery/door/airlock/maintenance{ name = "Mech Bay Maintenance" @@ -14986,7 +14984,7 @@ "ePj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "ePl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/tile/green{ @@ -15209,7 +15207,7 @@ "eTg" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "eTi" = ( /obj/machinery/telecomms/broadcaster/preset_left, /turf/open/floor/iron/dark/telecomms, @@ -15900,7 +15898,7 @@ /turf/open/floor/iron/white/side{ dir = 1 }, -/area/station/science/misc_lab) +/area/station/science/explab) "fcz" = ( /obj/machinery/vending/cigarette, /obj/machinery/light/small/directional/south, @@ -15952,7 +15950,7 @@ }, /obj/machinery/light/directional/south, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "fcY" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -16337,7 +16335,7 @@ "fju" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "fjw" = ( /obj/machinery/smartfridge, /turf/closed/wall, @@ -16611,7 +16609,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "fob" = ( /obj/structure/sink{ dir = 8; @@ -16669,7 +16667,7 @@ /obj/item/stack/sheet/mineral/plasma, /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "fps" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 @@ -16726,7 +16724,7 @@ "fpG" = ( /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "fpJ" = ( /obj/structure/fireaxecabinet/directional/west, /obj/machinery/suit_storage_unit/atmos, @@ -16745,7 +16743,7 @@ /area/station/hallway/secondary/service) "fqc" = ( /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "fqn" = ( /obj/machinery/light/small/directional/east, /obj/machinery/light_switch/directional/east, @@ -16828,7 +16826,7 @@ pixel_x = 24 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "frO" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/light/directional/south, @@ -17627,7 +17625,7 @@ pixel_y = -2 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "fGq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/toilet{ @@ -17658,7 +17656,7 @@ dir = 1 }, /turf/open/floor/iron/white/side, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "fGO" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -17747,7 +17745,7 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/plating, -/area/station/science/mixing) +/area/station/science/ordnance) "fIs" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -18349,7 +18347,7 @@ dir = 6 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "fSj" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, @@ -18787,7 +18785,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "fZR" = ( /obj/machinery/door/window/right/directional/east{ base_state = "left"; @@ -19315,7 +19313,7 @@ /turf/open/floor/iron/cafeteria{ dir = 8 }, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "giM" = ( /obj/structure/sign/warning/secure_area{ pixel_x = 32 @@ -19394,7 +19392,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "gjq" = ( /turf/open/openspace/icemoon/keep_below, /area/icemoon/underground/explored) @@ -19490,7 +19488,7 @@ pixel_y = -32 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "glc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -19670,7 +19668,7 @@ "gof" = ( /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "goi" = ( /obj/machinery/light/directional/east, /obj/machinery/newscaster/directional/east, @@ -19772,7 +19770,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "gqj" = ( /obj/structure/railing/corner{ dir = 1 @@ -20335,7 +20333,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "gAe" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -20743,7 +20741,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "gGo" = ( /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/east, @@ -21112,7 +21110,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "gMe" = ( /obj/effect/turf_decal/tile/purple, /obj/machinery/light/directional/east, @@ -21585,7 +21583,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "gTK" = ( /turf/closed/wall, /area/station/engineering/engine_smes) @@ -21752,7 +21750,7 @@ "gWR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "gWX" = ( /obj/structure/chair{ dir = 4 @@ -22057,7 +22055,7 @@ dir = 6 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "hbp" = ( /obj/machinery/photocopier, /turf/open/floor/wood, @@ -22385,7 +22383,7 @@ /obj/machinery/door/poddoor/massdriver_ordnance, /obj/structure/fans/tiny, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hgg" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -22534,7 +22532,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "hic" = ( /obj/structure/window/reinforced{ dir = 8 @@ -22687,7 +22685,7 @@ dir = 6 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "hkt" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -22698,7 +22696,7 @@ "hkw" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "hkU" = ( /obj/effect/landmark/start/cargo_technician, /obj/structure/chair/office{ @@ -22924,7 +22922,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "hpi" = ( /obj/effect/turf_decal/trimline, /obj/machinery/shower{ @@ -23232,7 +23230,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "huo" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, @@ -23474,7 +23472,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hxX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23525,7 +23523,7 @@ "hyP" = ( /obj/structure/stairs/west, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "hyW" = ( /obj/item/toy/snowball{ pixel_x = -6; @@ -23632,7 +23630,7 @@ /obj/machinery/light_switch/directional/north, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "hAm" = ( /turf/open/floor/iron/white/side{ dir = 4 @@ -24347,7 +24345,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "hNF" = ( /obj/structure/fence{ dir = 4 @@ -24451,7 +24449,7 @@ "hPp" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "hPs" = ( /turf/closed/wall/r_wall, /area/station/security/prison/work) @@ -24629,7 +24627,7 @@ /area/station/service/kitchen) "hSe" = ( /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hSi" = ( /obj/item/shard{ icon_state = "medium" @@ -24682,7 +24680,7 @@ "hSL" = ( /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "hSN" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -24753,7 +24751,7 @@ dir = 6 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "hTB" = ( /obj/structure/table, /obj/item/clothing/suit/jacket/leather{ @@ -24965,7 +24963,7 @@ /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "hXC" = ( /obj/machinery/vending/tool, /turf/open/floor/iron, @@ -25303,7 +25301,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "ibT" = ( /obj/structure/rack, /obj/machinery/light/directional/west, @@ -25733,7 +25731,7 @@ /area/station/security/prison/garden) "ijK" = ( /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "ijY" = ( /obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, @@ -25888,7 +25886,7 @@ "imT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "imV" = ( /obj/structure/stairs/east, /obj/structure/railing{ @@ -25970,7 +25968,7 @@ /obj/structure/railing, /obj/structure/lattice/catwalk, /turf/open/openspace, -/area/station/science/mixing) +/area/station/science/ordnance/office) "ipa" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ color = "#ff0000"; @@ -26056,7 +26054,7 @@ /area/station/maintenance/aft/greater) "iqt" = ( /turf/open/openspace, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "iqC" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -26217,7 +26215,7 @@ /turf/open/floor/iron/white/side{ dir = 4 }, -/area/station/science/misc_lab) +/area/station/science/explab) "isP" = ( /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, @@ -26558,7 +26556,7 @@ "iyG" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "iyI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26914,7 +26912,7 @@ /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/mixing) +/area/station/science/ordnance) "iFX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26927,7 +26925,7 @@ dir = 4 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "iGH" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -27099,7 +27097,7 @@ "iJf" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "iJh" = ( /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/yellow{ @@ -27277,7 +27275,7 @@ /area/station/medical/virology) "iLW" = ( /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "iLY" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -27442,7 +27440,7 @@ name = "BOMB RANGE" }, /turf/closed/wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "iOc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27529,7 +27527,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "iPr" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/secure_area{ @@ -28234,7 +28232,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "jau" = ( /obj/machinery/door/poddoor/shutters/window{ id = "drone_bay"; @@ -28759,7 +28757,7 @@ }, /obj/structure/lattice/catwalk, /turf/open/openspace, -/area/station/science/mixing) +/area/station/science/ordnance/office) "jjG" = ( /obj/item/instrument/harmonica, /obj/item/instrument/guitar, @@ -28771,7 +28769,7 @@ "jjI" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "jjQ" = ( /obj/structure/table/glass, /obj/structure/window/reinforced{ @@ -29498,7 +29496,7 @@ }, /obj/machinery/meter, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "jvm" = ( /obj/structure/closet/secure_closet/courtroom, /obj/item/gavelhammer, @@ -29782,7 +29780,7 @@ network = list("ss13","rd") }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jBe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -30774,7 +30772,7 @@ /area/station/command/heads_quarters/cmo) "jQg" = ( /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "jQh" = ( /obj/structure/ladder, /obj/machinery/light/small/directional/east, @@ -31247,7 +31245,7 @@ dir = 1 }, /turf/open/openspace, -/area/station/science/mixing) +/area/station/science/ordnance/office) "jXD" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, @@ -31626,7 +31624,7 @@ }, /obj/machinery/light/directional/south, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "kdc" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 @@ -31645,7 +31643,7 @@ "kdq" = ( /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "kdu" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -32261,7 +32259,7 @@ /turf/open/floor/iron/cafeteria{ dir = 8 }, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "knO" = ( /obj/machinery/door/firedoor/heavy, /obj/structure/sign/warning/test_chamber{ @@ -32402,7 +32400,7 @@ /obj/machinery/door/firedoor/heavy, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "kqw" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -32736,7 +32734,7 @@ "kuE" = ( /obj/structure/tank_dispenser, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "kuJ" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Entrance" @@ -32880,7 +32878,7 @@ req_access = list("ordnance") }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "kxt" = ( /obj/machinery/door/airlock/security/glass{ name = "Armory" @@ -33146,7 +33144,7 @@ "kAX" = ( /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/openspace, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "kAY" = ( /obj/structure/window/reinforced{ dir = 1 @@ -33262,7 +33260,7 @@ /area/station/maintenance/port/aft) "kCo" = ( /turf/open/floor/iron/white/side, -/area/station/science/misc_lab) +/area/station/science/explab) "kCr" = ( /obj/structure/window/reinforced{ dir = 1 @@ -33520,7 +33518,7 @@ pixel_y = 4 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "kGR" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -34284,7 +34282,7 @@ dir = 9 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "kSf" = ( /obj/machinery/camera/directional/east{ c_tag = "Locker Room Toilets" @@ -34359,7 +34357,7 @@ pixel_y = -32 }, /turf/open/floor/glass/reinforced, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "kSM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -34428,7 +34426,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "kTO" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/blue, @@ -34512,7 +34510,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "kUP" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/corner{ @@ -34534,7 +34532,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "kVk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34772,7 +34770,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "kZa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34971,7 +34969,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "ldc" = ( /obj/machinery/plate_press, /obj/structure/window/reinforced{ @@ -35789,7 +35787,7 @@ /obj/item/gun/energy/laser/practice, /obj/machinery/newscaster/directional/south, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "lnY" = ( /obj/structure/table/glass, /obj/structure/bedsheetbin, @@ -35889,7 +35887,7 @@ dir = 9 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "lpW" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -35972,7 +35970,7 @@ "lqR" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "lqU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -36041,7 +36039,7 @@ dir = 8 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "lrN" = ( /obj/effect/landmark/start/hangover, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -36328,7 +36326,7 @@ "lxM" = ( /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "lxU" = ( /obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 @@ -36655,7 +36653,7 @@ dir = 1 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "lDc" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -36681,7 +36679,7 @@ /turf/open/floor/iron/white/side{ dir = 8 }, -/area/station/science/misc_lab) +/area/station/science/explab) "lDo" = ( /obj/structure/sign/directions/medical{ dir = 4; @@ -37581,7 +37579,7 @@ "lUn" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "lUw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37745,7 +37743,7 @@ /obj/machinery/meter, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "lXJ" = ( /obj/structure/railing{ dir = 1 @@ -37928,7 +37926,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "mbG" = ( /obj/machinery/door/airlock/maintenance{ name = "Chapel Maintenance" @@ -38868,12 +38866,12 @@ /obj/effect/turf_decal/box/red, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "msE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "msG" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 1 @@ -38924,11 +38922,9 @@ /turf/open/floor/iron/cafeteria, /area/station/hallway/secondary/exit/departure_lounge) "mtQ" = ( -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas1" - }, +/obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "muh" = ( /obj/structure/sign/warning{ pixel_y = 32 @@ -39493,7 +39489,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "mFE" = ( /turf/closed/wall, /area/station/medical/surgery/aft) @@ -40345,11 +40341,11 @@ pixel_x = 32 }, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "mYx" = ( /obj/machinery/research/anomaly_refinery, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "mYG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -40497,7 +40493,7 @@ /turf/open/floor/iron/cafeteria{ dir = 8 }, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "naW" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white/side{ @@ -41355,7 +41351,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "noW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41925,7 +41921,7 @@ dir = 8 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "nzq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -42030,7 +42026,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "nAI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42610,7 +42606,7 @@ "nKs" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "nKK" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 @@ -42710,7 +42706,7 @@ "nMs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "nMu" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -42788,7 +42784,7 @@ /area/station/security/prison/rec) "nNo" = ( /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "nNq" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue{ @@ -43305,7 +43301,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "nTv" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/food_or_drink/cups, @@ -43344,7 +43340,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "nUg" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -44180,7 +44176,7 @@ network = list("ss13","rd") }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ohI" = ( /obj/structure/grille, /obj/structure/window{ @@ -44658,13 +44654,13 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "opj" = ( /obj/machinery/portable_atmospherics/pump{ name = "Lil Pump" }, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "opn" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/decal/cleanable/dirt, @@ -45065,7 +45061,7 @@ /obj/effect/mapping_helpers/airlock/unres, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "owS" = ( /obj/structure/table/glass, /obj/item/storage/box/beakers{ @@ -45664,7 +45660,7 @@ "oFq" = ( /obj/structure/chair/office/light, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "oFI" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -45968,7 +45964,7 @@ /area/station/hallway/secondary/exit/departure_lounge) "oLA" = ( /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "oLG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46013,7 +46009,7 @@ /area/station/hallway/primary/port) "oMm" = ( /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "oMs" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/iron/grimy, @@ -46147,7 +46143,7 @@ }, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "oOX" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -46331,12 +46327,11 @@ /area/station/medical/surgery/fore) "oRu" = ( /obj/structure/window/reinforced, -/obj/machinery/computer/atmos_control/noreconnect{ - atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber"); +/obj/machinery/computer/atmos_control/ordnancemix{ dir = 1 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "oRw" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -46352,7 +46347,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "oRX" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -47480,7 +47475,7 @@ dir = 9 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "plF" = ( /obj/machinery/light/directional/west, /obj/machinery/camera/motion/directional/south{ @@ -47742,7 +47737,7 @@ "ppB" = ( /obj/structure/stairs/east, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "ppD" = ( /obj/structure/chair/office{ dir = 8 @@ -48277,7 +48272,7 @@ /obj/machinery/light/directional/west, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "pxg" = ( /obj/structure/table, /obj/effect/landmark/event_spawn, @@ -48319,7 +48314,7 @@ }, /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "pxL" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -48612,7 +48607,7 @@ "pDq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "pDv" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -48691,7 +48686,7 @@ pixel_y = 32 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "pFi" = ( /obj/machinery/light/directional/east, /obj/structure/table, @@ -48820,7 +48815,7 @@ /obj/item/target/syndicate, /obj/machinery/light/directional/south, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "pHQ" = ( /obj/structure/cable, /obj/machinery/door/airlock/glass{ @@ -49038,7 +49033,7 @@ /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/mixing) +/area/station/science/ordnance) "pKJ" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -49105,7 +49100,7 @@ "pLL" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "pLO" = ( /obj/machinery/status_display/evac/directional/east, /obj/effect/turf_decal/tile/blue{ @@ -49282,7 +49277,7 @@ }, /obj/item/assembly/timer, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "pOf" = ( /obj/structure/table, /obj/item/stack/sheet/glass, @@ -49593,7 +49588,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "pST" = ( /obj/structure/sink{ dir = 8; @@ -49642,7 +49637,7 @@ }, /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "pTU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, @@ -49670,7 +49665,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "pUn" = ( /obj/structure/sink{ dir = 8; @@ -49952,7 +49947,7 @@ /turf/open/floor/iron/white/side{ dir = 9 }, -/area/station/science/misc_lab) +/area/station/science/explab) "pYF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50358,7 +50353,7 @@ }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "qfs" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/structure/cable, @@ -50879,7 +50874,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "qoY" = ( /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/plating, @@ -51046,7 +51041,7 @@ "qrD" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "qsk" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/red, @@ -51097,7 +51092,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "qsQ" = ( /obj/machinery/stasis, /obj/machinery/defibrillator_mount/directional/north, @@ -51368,7 +51363,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "qxQ" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -52073,7 +52068,7 @@ /area/station/service/library) "qLl" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/burnchamber) "qLm" = ( /obj/machinery/suit_storage_unit/mining, /obj/effect/turf_decal/bot, @@ -52307,7 +52302,7 @@ /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "qNn" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -52959,11 +52954,9 @@ /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) "qYu" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas1" - }, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "qYw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -53099,7 +53092,7 @@ /turf/open/floor/iron/white/corner{ dir = 8 }, -/area/station/science/misc_lab) +/area/station/science/explab) "qZT" = ( /obj/machinery/computer/mech_bay_power_console{ dir = 1 @@ -53451,7 +53444,7 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "rgh" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -53520,7 +53513,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "rhl" = ( /obj/machinery/computer/upload/borg{ dir = 1 @@ -53622,7 +53615,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "riL" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -53778,7 +53771,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "rlV" = ( /obj/structure/table/wood, /turf/open/floor/wood, @@ -53903,7 +53896,7 @@ dir = 5 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "roA" = ( /obj/machinery/door/window/left/directional/north{ dir = 4; @@ -53934,7 +53927,7 @@ pixel_y = 32 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "roR" = ( /obj/machinery/porta_turret/ai{ dir = 4; @@ -54135,7 +54128,7 @@ "rss" = ( /obj/machinery/requests_console/directional/north, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "rsC" = ( /obj/machinery/light/directional/west, /obj/machinery/camera/directional/west{ @@ -54404,7 +54397,7 @@ "rxf" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "rxz" = ( /obj/structure/girder, /turf/open/floor/plating/snowed/icemoon, @@ -55109,7 +55102,7 @@ receive_ore_updates = 1 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "rIF" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, @@ -55269,7 +55262,7 @@ /area/station/maintenance/starboard/fore) "rMj" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/launch) +/area/station/science/ordnance/office) "rMr" = ( /obj/structure/chair{ dir = 8 @@ -55399,7 +55392,7 @@ dir = 1 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "rOA" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55584,7 +55577,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "rRc" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -55762,7 +55755,7 @@ dir = 4 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "rUz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -55860,14 +55853,14 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "rWm" = ( /obj/machinery/mass_driver/ordnance{ dir = 4 }, /obj/machinery/door/window/left/directional/north, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "rWn" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, @@ -56195,7 +56188,7 @@ }, /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "sbt" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -56653,8 +56646,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "sie" = ( -/turf/open/openspace, -/area/station/science/mixing) +/turf/closed/wall/r_wall, +/area/station/science/ordnance/testlab) "sil" = ( /obj/machinery/door/airlock/public/glass{ name = "Art Gallery" @@ -56784,7 +56777,7 @@ /turf/open/floor/iron/white/corner{ dir = 1 }, -/area/station/science/misc_lab) +/area/station/science/explab) "skQ" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -58209,7 +58202,7 @@ /obj/machinery/module_duplicator, /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "sGf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet/directional/north, @@ -58242,6 +58235,9 @@ }, /turf/open/floor/iron/dark, /area/station/commons/storage/mining) +"sGy" = ( +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "sGE" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -58557,11 +58553,11 @@ "sLO" = ( /obj/machinery/door/firedoor/border_only, /turf/open/openspace, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "sLS" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "sMg" = ( /turf/open/floor/engine/air, /area/station/engineering/atmos) @@ -58656,7 +58652,7 @@ /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/mixing) +/area/station/science/ordnance) "sNQ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -58910,7 +58906,7 @@ dir = 6 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "sSy" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -58968,7 +58964,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "sTO" = ( /obj/machinery/door/airlock{ name = "Unisex Restroom" @@ -59005,7 +59001,7 @@ "sUr" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/station/science/misc_lab) +/area/station/science/explab) "sUB" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -59036,7 +59032,7 @@ /obj/structure/railing, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "sUN" = ( /obj/machinery/power/solar{ id = "starboardsolar"; @@ -59414,7 +59410,7 @@ id = "testigniter" }, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "taK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59892,7 +59888,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "tjC" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -60321,7 +60317,7 @@ /turf/open/floor/iron/white/side{ dir = 4 }, -/area/station/science/misc_lab) +/area/station/science/explab) "trG" = ( /obj/structure/window/reinforced{ dir = 8 @@ -61320,7 +61316,7 @@ sortType = 25 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "tFP" = ( /obj/structure/closet/crate, /obj/machinery/light/small/directional/east, @@ -61560,7 +61556,7 @@ pixel_y = 7 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "tJD" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -61695,7 +61691,7 @@ "tLA" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "tLF" = ( /turf/closed/wall, /area/station/hallway/primary/starboard) @@ -61756,7 +61752,7 @@ /turf/open/floor/iron/cafeteria{ dir = 8 }, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "tMO" = ( /turf/closed/wall, /area/station/medical/break_room) @@ -61887,7 +61883,7 @@ "tPV" = ( /obj/machinery/modular_computer/console/preset/civilian, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "tPW" = ( /obj/machinery/door/airlock/security/glass{ name = "Secure Walkway" @@ -62482,7 +62478,7 @@ }, /obj/machinery/door/firedoor/heavy, /turf/open/floor/plating, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "uaP" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -63522,7 +63518,7 @@ desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; name = "hyper-reinforced wall" }, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "uub" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Port to Fuel Pipe" @@ -63617,7 +63613,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "uwb" = ( /obj/effect/landmark/blobstart, /obj/effect/turf_decal/stripes/line{ @@ -63787,7 +63783,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "uyF" = ( /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/blue, @@ -64264,7 +64260,7 @@ dir = 10 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "uGo" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -64520,7 +64516,7 @@ pixel_x = 24 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "uKj" = ( /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -64639,7 +64635,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "uMq" = ( /obj/structure/sign/warning/cold_temp{ pixel_x = -29 @@ -65004,7 +65000,7 @@ dir = 1 }, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "uSU" = ( /obj/structure/closet/wardrobe/grey, /obj/effect/turf_decal/tile/yellow, @@ -65280,7 +65276,7 @@ }, /obj/machinery/meter, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "uYB" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/structure/cable, @@ -65604,7 +65600,7 @@ "vdS" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "vdX" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, @@ -65944,7 +65940,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "viW" = ( /obj/effect/turf_decal/tile/dark{ dir = 8 @@ -66247,7 +66243,7 @@ dir = 8 }, /turf/open/openspace, -/area/station/science/mixing) +/area/station/science/ordnance/office) "vnc" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -66429,7 +66425,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "vqx" = ( /obj/effect/turf_decal/tile/dark{ dir = 1 @@ -66941,8 +66937,12 @@ /obj/item/computer_hardware/hard_drive/portable{ pixel_x = -2 }, +/obj/item/computer_hardware/hard_drive/portable/scipaper_program{ + pixel_x = -5; + pixel_y = 6 + }, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "vyU" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/misc/asteroid/snow/icemoon, @@ -67096,7 +67096,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "vAO" = ( /obj/structure/table, /obj/item/stock_parts/cell/high, @@ -67106,7 +67106,7 @@ /turf/open/floor/iron/white/corner{ dir = 4 }, -/area/station/science/misc_lab) +/area/station/science/explab) "vAT" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -67544,12 +67544,11 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas2"; +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{ dir = 1 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "vHm" = ( /obj/structure/rack, /turf/open/floor/plating, @@ -67647,7 +67646,7 @@ "vIJ" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "vJk" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4 @@ -67853,7 +67852,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "vND" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -68135,7 +68134,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "vSi" = ( /turf/closed/wall, /area/mine/eva) @@ -68679,7 +68678,7 @@ /turf/open/floor/iron/white/side{ dir = 4 }, -/area/station/science/misc_lab) +/area/station/science/explab) "wba" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plating, @@ -68957,7 +68956,7 @@ /turf/open/floor/iron/cafeteria{ dir = 8 }, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "wfK" = ( /obj/item/folder/blue, /obj/structure/table/wood, @@ -69105,7 +69104,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "whm" = ( /obj/structure/closet/wardrobe/grey, /obj/effect/turf_decal/tile/neutral, @@ -69654,7 +69653,7 @@ /turf/open/floor/iron/cafeteria{ dir = 8 }, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "wqb" = ( /obj/structure/cable, /obj/machinery/camera/directional/east{ @@ -70100,7 +70099,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "wxg" = ( /turf/open/floor/iron/freezer, /area/mine/laborcamp) @@ -70272,7 +70271,7 @@ "wAp" = ( /obj/machinery/light/directional/east, /turf/open/floor/glass/reinforced, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "wAq" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -70343,10 +70342,10 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/tank/oxygen, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "wBh" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "wBk" = ( /obj/machinery/camera/directional/north{ c_tag = "Robotics Lab"; @@ -71372,7 +71371,7 @@ /obj/structure/training_machine, /obj/effect/landmark/blobstart, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "wPZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -71417,7 +71416,7 @@ /obj/structure/railing, /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "wQR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -72139,7 +72138,7 @@ "xcB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "xcC" = ( /obj/structure/fluff/tram_rail/end{ dir = 4; @@ -72191,7 +72190,7 @@ "xdH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "xdM" = ( /obj/structure/sign/warning/cold_temp, /turf/closed/wall, @@ -72253,7 +72252,7 @@ /area/station/hallway/primary/port) "xeZ" = ( /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "xfb" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -72316,7 +72315,7 @@ pixel_x = -32 }, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "xgm" = ( /obj/structure/sign/directions/evac{ dir = 4; @@ -72338,7 +72337,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "xgr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -72513,7 +72512,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/mixing) +/area/station/science/ordnance) "xiO" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -72808,7 +72807,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "xnp" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -73014,7 +73013,7 @@ /obj/structure/cable, /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "xqu" = ( /obj/machinery/door/window/left/directional/north{ dir = 4; @@ -73494,7 +73493,7 @@ dir = 5 }, /turf/open/floor/plating/icemoon, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "xxI" = ( /obj/structure/filingcabinet, /turf/open/floor/iron/grimy, @@ -73754,7 +73753,7 @@ /turf/open/floor/iron/white/side{ dir = 8 }, -/area/station/science/misc_lab) +/area/station/science/explab) "xDb" = ( /turf/closed/wall/r_wall, /area/station/medical/virology) @@ -73908,7 +73907,7 @@ /area/station/maintenance/department/electrical) "xFT" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing) +/area/station/science/ordnance) "xGp" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/left/directional/north{ @@ -74168,7 +74167,7 @@ }, /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "xKA" = ( /obj/machinery/conveyor{ dir = 4; @@ -74316,7 +74315,7 @@ }, /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "xMy" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron, @@ -74758,7 +74757,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/plating, -/area/station/science/mixing) +/area/station/science/ordnance) "xVx" = ( /obj/structure/window/reinforced{ dir = 4 @@ -75309,7 +75308,7 @@ dir = 9 }, /turf/open/openspace, -/area/station/science/mixing) +/area/station/science/ordnance/office) "ydD" = ( /obj/effect/spawner/random/structure/crate_abandoned, /obj/machinery/light/small/directional/south, @@ -75509,7 +75508,7 @@ pixel_x = 32 }, /turf/open/floor/engine, -/area/station/science/misc_lab) +/area/station/science/explab) "yhS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -75711,7 +75710,7 @@ }, /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ylx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -75720,7 +75719,7 @@ /turf/open/floor/iron/white/corner{ dir = 1 }, -/area/station/science/misc_lab) +/area/station/science/explab) "ylD" = ( /obj/machinery/computer/security/labor, /obj/structure/cable, @@ -75759,7 +75758,7 @@ }, /obj/effect/turf_decal/box/red, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance/office) "ymd" = ( /obj/structure/chair, /obj/effect/turf_decal/siding/white{ @@ -188744,12 +188743,12 @@ xMq xMq ebX kNC -qLl -qLl -qLl -qLl -qLl -qLl +xFT +xFT +xFT +xFT +xFT +xFT pxA sbn jar @@ -189001,7 +189000,7 @@ tjo tjo rcY iDt -qLl +xFT hyP hyP hyP @@ -189258,7 +189257,7 @@ tjo tjo rcY iDt -qLl +xFT fpG nNo nNo @@ -189515,7 +189514,7 @@ tjo tjo rcY iDt -qLl +xFT eAt nNo nNo @@ -189772,7 +189771,7 @@ tjo tjo rcY iDt -qLl +xFT rss nNo nNo @@ -190029,7 +190028,7 @@ tjo tjo rcY iDt -qLl +xFT ppB ppB ppB @@ -190286,10 +190285,10 @@ tjo tjo rcY iDt -wBh -wBh -wBh -wBh +qLl +qLl +qLl +qLl pDq pDq hXB @@ -190552,7 +190551,7 @@ lqR roN gWR alN -oLA +sGy uYz hhV vHk @@ -190806,10 +190805,10 @@ mtQ kTH opi tjv -oLA -oLA +sGy +sGy fnM -oLA +sGy axd wBh dLq @@ -191064,7 +191063,7 @@ nKs gAb nKs uKi -oLA +sGy gjo msx frM @@ -253767,20 +253766,20 @@ hyW bgb usP wLl -qLl +rMj uaN knC uaN -qLl +rMj ioW -sie -sie -sie -sie +iqt +iqt +iqt +iqt aei aqx pTO -xFT +rMj qNd kdq bnT @@ -254030,14 +254029,14 @@ wpZ giI naV ioW -sie -sie -sie -sie +iqt +iqt +iqt +iqt aei oFq aVw -xFT +rMj rID kdq ePj @@ -254287,14 +254286,14 @@ aII aII cFE cKY -sie -sie -sie -sie +iqt +iqt +iqt +iqt aei pNX fGo -xFT +rMj fpq kdq ePj @@ -254543,15 +254542,15 @@ iqt iqt iqt sLO -sie -sie -sie -sie -sie +iqt +iqt +iqt +iqt +iqt aei oLA ymc -xFT +rMj xKq rgV ePj @@ -254800,15 +254799,15 @@ iqt iqt iqt sLO -sie -sie -sie -sie -sie +iqt +iqt +iqt +iqt +iqt aei uMj bNf -xFT +rMj vNy pUh rin @@ -255057,15 +255056,15 @@ iqt iqt iqt sLO -sie -sie -sie -sie -sie +iqt +iqt +iqt +iqt +iqt aei oLA nUd -xFT +rMj xcB rQV wxc @@ -255314,15 +255313,15 @@ iqt iqt iqt sLO -sie -sie -sie -sie -sie +iqt +iqt +iqt +iqt +iqt aei oLA oOP -xFT +rMj dim cXY qfi @@ -255579,7 +255578,7 @@ jjA jXu mYx cFu -xFT +rMj xgq cXY fqc @@ -255836,7 +255835,7 @@ xnl dUy now xMt -qLl +rMj gMb cXY fqc @@ -256093,7 +256092,7 @@ lxM bzn brD brD -qLl +rMj nMs tav fqc @@ -256350,7 +256349,7 @@ opj bzn brD kSJ -qLl +rMj nMs uSz fqc @@ -256607,7 +256606,7 @@ pLL bzn brD wAp -qLl +rMj fqc mYs fqc @@ -257369,7 +257368,7 @@ bJm hSe hSe gkV -rMj +sie bgx gti bhk @@ -257882,7 +257881,7 @@ elw eTg eTg eTg -rMj +sie xeZ bgx vzD @@ -258139,7 +258138,7 @@ bln bln bln bln -rMj +sie xeZ bgx bln diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index b35c5c0423c..dc1e3708a3b 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -898,7 +898,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "alL" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -1194,7 +1194,7 @@ }, /obj/machinery/light/directional/north, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "apl" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -1791,7 +1791,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "azK" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -1804,7 +1804,7 @@ name = "Ordnance Mixing Lab Requests Console" }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "aAa" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -2570,7 +2570,7 @@ dir = 6 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "aKe" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/turf_decal/stripes/corner{ @@ -2848,7 +2848,7 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "aOR" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, @@ -3490,7 +3490,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "bbl" = ( /obj/machinery/door/airlock/external{ name = "Abandoned External Airlock" @@ -3649,7 +3649,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "bef" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -4717,7 +4717,7 @@ "bvm" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "bvq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4959,7 +4959,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "bzu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, @@ -5125,7 +5125,7 @@ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "bBE" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5973,7 +5973,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "bRO" = ( /obj/machinery/chem_dispenser, /obj/effect/turf_decal/tile/neutral, @@ -6478,7 +6478,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "bZE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6557,7 +6557,7 @@ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "caM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate, @@ -6598,9 +6598,8 @@ /turf/open/floor/iron, /area/station/security/brig) "cbo" = ( -/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "cbp" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -6684,7 +6683,7 @@ }, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "ccP" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -9239,13 +9238,13 @@ /area/station/maintenance/disposal/incinerator) "cNe" = ( /turf/closed/wall/r_wall/rust, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "cNH" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "cNZ" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/sand/plating, @@ -9327,7 +9326,7 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cPp" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -10177,7 +10176,7 @@ }, /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/storage) "dch" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -10321,7 +10320,7 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /obj/effect/landmark/start/scientist, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "deZ" = ( /obj/structure/chair, /obj/effect/turf_decal/tile/neutral, @@ -10952,7 +10951,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "dmS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, @@ -11168,7 +11167,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "dpR" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -12124,7 +12123,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "dDp" = ( /obj/structure/mirror/directional/north, /obj/structure/sink{ @@ -12806,7 +12805,7 @@ "dNB" = ( /obj/structure/sign/warning/explosives, /turf/closed/wall/r_wall/rust, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "dNH" = ( /obj/structure/toilet, /obj/machinery/light/small/directional/north, @@ -13412,7 +13411,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/station/science/mixing) +/area/station/science/ordnance) "dWj" = ( /obj/machinery/door/airlock/maintenance/external{ name = "Mass Driver Intersection" @@ -13592,7 +13591,7 @@ dir = 6 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "dZM" = ( /obj/machinery/computer/monitor{ dir = 4; @@ -13866,7 +13865,7 @@ dir = 10 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "edj" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -14014,7 +14013,7 @@ }, /obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "efG" = ( /turf/closed/wall, /area/station/maintenance/fore) @@ -14523,7 +14522,7 @@ "emL" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "emU" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /turf/open/floor/engine, @@ -14758,7 +14757,7 @@ piping_layer = 2 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "eqg" = ( /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/dark, @@ -15295,7 +15294,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "exg" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, @@ -15613,7 +15612,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "eBu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -15842,7 +15841,7 @@ "eEJ" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "eEY" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -15923,7 +15922,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "eGp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16291,14 +16290,13 @@ /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "eLb" = ( -/obj/machinery/computer/atmos_control/noreconnect{ - atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber"); - dir = 4 - }, /obj/machinery/firealarm/directional/west, /obj/machinery/light/directional/west, +/obj/machinery/computer/atmos_control/ordnancemix{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "eLm" = ( /turf/closed/wall, /area/station/security/checkpoint/customs) @@ -17873,7 +17871,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "fhs" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -18058,7 +18056,7 @@ /area/station/security/processing) "fiU" = ( /turf/closed/wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "fiY" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -18192,7 +18190,7 @@ dir = 5 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "fjX" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -18772,11 +18770,9 @@ /area/station/service/chapel/monastery) "frq" = ( /obj/effect/decal/cleanable/blood/old, -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas1" - }, +/obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "frK" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -20759,7 +20755,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "fQT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21092,7 +21088,7 @@ name = "Kentucky" }, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "fWB" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/rnd/production/techfab/department/service, @@ -21190,7 +21186,7 @@ /obj/machinery/light/directional/east, /obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "fXZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -21452,7 +21448,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "gbB" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -21536,11 +21532,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 8 }, -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas2" - }, +/obj/machinery/air_sensor/ordnance_freezer_chamber, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "gdk" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/watermelon, @@ -21816,7 +21810,7 @@ pixel_y = 9 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "gix" = ( /obj/effect/turf_decal/box, /obj/structure/cable, @@ -23851,7 +23845,7 @@ "gJi" = ( /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "gJj" = ( /obj/machinery/door/airlock/external{ name = "Arrival Shuttle Airlock"; @@ -23972,7 +23966,7 @@ pixel_x = -32 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "gKB" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/table_frame, @@ -24326,7 +24320,7 @@ /obj/effect/turf_decal/box, /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "gPA" = ( /turf/closed/wall/rust, /area/station/maintenance/port/aft) @@ -24498,7 +24492,7 @@ /area/station/cargo/office) "gQS" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/storage) "gQV" = ( /obj/machinery/camera/directional/west{ c_tag = "Atmospherics Tank - CO2"; @@ -24974,7 +24968,7 @@ }, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "gXR" = ( /obj/structure/table, /obj/item/transfer_valve{ @@ -24993,7 +24987,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "gXX" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/air, @@ -25117,7 +25111,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "hah" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, @@ -25156,7 +25150,7 @@ /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/station/science/mixing) +/area/station/science/ordnance) "hbe" = ( /obj/machinery/door/poddoor/preopen{ id = "xeno4"; @@ -25524,7 +25518,7 @@ pixel_y = -24 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "hgn" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26393,7 +26387,7 @@ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "hqk" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/light/directional/north, @@ -26663,9 +26657,6 @@ dir = 4 }, /area/station/hallway/primary/fore) -"hun" = ( -/turf/closed/wall/r_wall/rust, -/area/station/science/mixing/hallway) "huo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -26818,7 +26809,7 @@ network = list("ss13","rd") }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "hxf" = ( /obj/structure/transit_tube, /obj/structure/disposalpipe/segment, @@ -26959,7 +26950,7 @@ /area/station/commons/fitness/recreation) "hyT" = ( /turf/closed/wall/r_wall/rust, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "hzC" = ( /obj/structure/flora/rock/icy/style_2, /turf/open/misc/asteroid/airless, @@ -27891,7 +27882,7 @@ "hLZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "hMo" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/structure/window/reinforced, @@ -29276,7 +29267,7 @@ "iew" = ( /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "ieI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -29563,7 +29554,7 @@ }, /obj/effect/landmark/start/scientist, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "ijc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -30062,7 +30053,7 @@ }, /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "ios" = ( /turf/closed/wall/rust, /area/station/service/kitchen) @@ -30233,7 +30224,7 @@ pixel_x = -28 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "iqd" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/medical_all, @@ -30512,7 +30503,7 @@ dir = 1 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "iug" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 1 @@ -31501,7 +31492,7 @@ }, /obj/structure/tank_dispenser, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "iHe" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -31717,7 +31708,7 @@ "iJM" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "iJN" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -32317,7 +32308,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "iUm" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -32924,7 +32915,7 @@ dir = 5 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "jbZ" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 8; @@ -33224,7 +33215,7 @@ }, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "jgf" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, @@ -33622,7 +33613,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "jkd" = ( /obj/structure/chair/stool/bar/directional/west, /obj/effect/decal/cleanable/dirt, @@ -33672,7 +33663,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "jlY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33906,7 +33897,7 @@ "jpO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "jpX" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/bot, @@ -33973,8 +33964,6 @@ pixel_x = 24; req_access = list("ordnance") }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 @@ -33982,8 +33971,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "jrr" = ( /obj/structure/table, /obj/item/book/manual/hydroponics_pod_people{ @@ -34076,7 +34066,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "jsD" = ( /obj/effect/turf_decal/bot, /obj/machinery/conveyor{ @@ -34511,7 +34501,7 @@ "jBJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "jBN" = ( /obj/structure/chair/office{ dir = 4 @@ -34743,7 +34733,7 @@ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "jFq" = ( /obj/structure/barricade/wooden/crude, /obj/machinery/door/airlock/bronze, @@ -35050,7 +35040,7 @@ /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "jKj" = ( /obj/structure/chair/sofa/left{ color = "#c45c57"; @@ -35352,12 +35342,11 @@ name = "Ordnance Lab Shutters" }, /obj/machinery/door/firedoor/heavy, -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "jNt" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Arrivals"; @@ -35458,7 +35447,7 @@ }, /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "jOZ" = ( /obj/machinery/computer/rdservercontrol, /obj/effect/turf_decal/bot, @@ -36792,7 +36781,7 @@ dir = 5 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "kmZ" = ( /obj/machinery/camera/autoname/directional/east, /obj/structure/disposalpipe/segment{ @@ -36905,7 +36894,7 @@ }, /obj/machinery/atmospherics/components/binary/pump, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "kpS" = ( /obj/structure/railing{ dir = 1 @@ -37150,12 +37139,13 @@ pixel_x = -8; pixel_y = -3 }, -/obj/item/computer_hardware/hard_drive/portable{ - pixel_x = -2 - }, /obj/structure/table, +/obj/item/computer_hardware/hard_drive/portable/scipaper_program{ + pixel_x = 2; + pixel_y = 1 + }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "ksp" = ( /obj/effect/turf_decal/loading_area{ dir = 1 @@ -37429,7 +37419,7 @@ "kwU" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "kwV" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -38121,7 +38111,7 @@ dir = 1 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "kHQ" = ( /obj/structure/sign/poster/official/wtf_is_co2, /turf/closed/wall, @@ -39178,7 +39168,7 @@ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "kVY" = ( /obj/machinery/door/airlock/command{ name = "Gateway" @@ -40192,7 +40182,7 @@ /area/station/maintenance/port/lesser) "llU" = ( /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "llY" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40390,7 +40380,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "lox" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 5 @@ -40579,7 +40569,7 @@ "lrg" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "lrk" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood{ @@ -41707,7 +41697,7 @@ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "lIr" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -42226,7 +42216,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/remains/human, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "lPY" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -42398,7 +42388,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "lSY" = ( /obj/effect/spawner/random/structure/table, /obj/item/candle{ @@ -42826,7 +42816,7 @@ dir = 10 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "lZn" = ( /obj/structure/sign/departments/science, /turf/closed/wall/rust, @@ -42874,7 +42864,7 @@ }, /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "lZV" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ dir = 8 @@ -44458,7 +44448,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "mwn" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -44628,7 +44618,7 @@ /obj/structure/window/reinforced/spawner/east, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "myS" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -44770,7 +44760,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "mBS" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -45055,7 +45045,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "mFQ" = ( /obj/structure/chair/sofa/bench{ dir = 4 @@ -45261,7 +45251,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "mIb" = ( /obj/machinery/door/airlock/external{ name = "Atmospherics External Airlock" @@ -45964,7 +45954,7 @@ dir = 9 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "mQu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /mob/living/carbon/human/species/monkey, @@ -46134,7 +46124,7 @@ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "mSf" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -46744,7 +46734,7 @@ /area/station/medical/medbay/lobby) "naG" = ( /turf/closed/wall/r_wall, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "naK" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -46776,7 +46766,7 @@ dir = 8 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "nbb" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -47672,7 +47662,7 @@ /obj/structure/window/reinforced, /obj/effect/turf_decal/delivery, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "nqE" = ( /obj/machinery/disposal/bin{ desc = "A pneumatic waste disposal unit. This one leads into space!"; @@ -47830,7 +47820,7 @@ "nst" = ( /obj/structure/sign/warning/explosives, /turf/closed/wall/r_wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "nsw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -48256,7 +48246,7 @@ /obj/effect/turf_decal/box/red, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "nxY" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -48756,7 +48746,7 @@ "nGy" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "nGC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -49122,7 +49112,7 @@ dir = 9 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "nKO" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, @@ -49921,7 +49911,7 @@ "nZS" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "nZX" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/component_printer, @@ -49934,7 +49924,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "nZZ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -49983,7 +49973,7 @@ }, /obj/machinery/disposal/bin, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "oaF" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -50510,7 +50500,7 @@ pixel_x = -32 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "ojs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/newscaster/directional/east, @@ -50693,7 +50683,7 @@ pixel_y = 5 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "olN" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/directional/west, @@ -50878,7 +50868,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/storage) "oow" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/structure/cable, @@ -51972,7 +51962,7 @@ /area/station/engineering/supermatter/room) "oDK" = ( /turf/closed/wall/r_wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "oEc" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -53170,7 +53160,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "oVP" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/rock, @@ -54502,7 +54492,7 @@ /obj/machinery/door/firedoor/heavy, /obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/storage) "ppH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/hydroponics/constructable, @@ -55022,7 +55012,7 @@ /obj/machinery/portable_atmospherics/canister/plasma, /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "pxe" = ( /turf/closed/wall/mineral/plastitanium, /area/station/maintenance/port/aft) @@ -56379,7 +56369,7 @@ dir = 1 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "pRu" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -57211,7 +57201,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "qek" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57988,7 +57978,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "qnT" = ( /obj/structure/closet/secure_closet/chemical, /obj/structure/window/reinforced{ @@ -58052,7 +58042,7 @@ }, /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "qox" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -58329,7 +58319,7 @@ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "qsW" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/east, @@ -58955,7 +58945,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/iron/dark, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "qEh" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -59699,7 +59689,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "qQO" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60117,7 +60107,7 @@ }, /obj/effect/landmark/blobstart, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "qVJ" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral, @@ -60239,7 +60229,6 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -60247,7 +60236,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "qXn" = ( /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance" @@ -60492,9 +60481,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/security/prison) -"rbj" = ( -/turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) "rbk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60766,7 +60752,7 @@ "rfQ" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "rfX" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -60838,12 +60824,11 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 6 }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas2"; +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{ dir = 1 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "rhK" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60924,7 +60909,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "riW" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -61019,7 +61004,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "rlx" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -61299,7 +61284,7 @@ "rpv" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "rpD" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -61360,7 +61345,7 @@ "rql" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "rqm" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -61612,7 +61597,7 @@ }, /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "rsX" = ( /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, @@ -62871,7 +62856,7 @@ name = "BOMB RANGE" }, /turf/closed/wall/r_wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "rKI" = ( /obj/machinery/rnd/production/protolathe/department/science, /obj/effect/turf_decal/bot, @@ -62924,7 +62909,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/machinery/light/small/directional/east, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "rLs" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/item/reagent_containers/glass/bucket, @@ -63740,7 +63725,7 @@ /obj/effect/decal/remains/human, /obj/machinery/light/small/directional/west, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "rXQ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -63850,7 +63835,7 @@ name = "BOMB RANGE" }, /turf/closed/wall/r_wall/rust, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "rZE" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -64051,7 +64036,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "scE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -64790,7 +64775,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing) +/area/station/science/ordnance/freezerchamber) "snw" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -65686,7 +65671,7 @@ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "sBO" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -65848,7 +65833,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "sDq" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -66919,7 +66904,7 @@ /area/station/maintenance/aft) "sRW" = ( /turf/closed/wall, -/area/station/science/storage) +/area/station/science/ordnance/storage) "sRZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -67412,7 +67397,7 @@ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "sYM" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/plating, @@ -68939,7 +68924,7 @@ /obj/machinery/portable_atmospherics/canister, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "tuF" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -69376,7 +69361,7 @@ /area/station/medical/chemistry) "tAU" = ( /turf/closed/wall/r_wall/rust, -/area/station/science/storage) +/area/station/science/ordnance/storage) "tAX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69683,7 +69668,7 @@ /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "tFb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69992,11 +69977,9 @@ }, /area/station/maintenance/starboard/aft) "tKn" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas1" - }, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "tKt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70044,7 +70027,7 @@ dir = 5 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "tKS" = ( /obj/structure/table, /obj/item/clipboard, @@ -70409,7 +70392,7 @@ }, /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "tQI" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/box, @@ -71302,7 +71285,7 @@ "ueU" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "ueZ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -71620,7 +71603,7 @@ pixel_x = 6 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "ujN" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -73070,7 +73053,7 @@ /area/station/science/robotics/mechbay) "uFm" = ( /turf/closed/indestructible/opshuttle, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "uFp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -73295,7 +73278,7 @@ /obj/item/radio/intercom/directional/east, /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "uJg" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -73617,7 +73600,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "uNe" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/peppermill{ @@ -73695,7 +73678,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "uOo" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -73994,7 +73977,7 @@ }, /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "uTG" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral, @@ -74660,7 +74643,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "vcL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/south, @@ -75047,7 +75030,7 @@ "viL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "viM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -75151,7 +75134,7 @@ dir = 6 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "vkL" = ( /obj/structure/railing{ dir = 1 @@ -76478,7 +76461,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "vCi" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -76637,9 +76620,6 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"vEK" = ( -/turf/closed/wall, -/area/station/science/mixing) "vEW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -77396,7 +77376,7 @@ "vOy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, -/area/station/science/misc_lab) +/area/station/science/ordnance/office) "vOH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -78178,7 +78158,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing/hallway) +/area/station/science/ordnance) "vXI" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -78370,11 +78350,11 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "waF" = ( /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "waI" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -79971,7 +79951,7 @@ /area/station/ai_monitored/turret_protected/ai_upload) "wwk" = ( /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "wwv" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -81504,7 +81484,7 @@ }, /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "wPO" = ( /obj/structure/rack, /obj/item/gun/energy/ionrifle{ @@ -82170,7 +82150,7 @@ /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/station/science/mixing) +/area/station/science/ordnance) "wZL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -82846,7 +82826,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "xky" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -85238,7 +85218,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "xTt" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -85404,8 +85384,11 @@ /obj/item/pipe_dispenser, /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/structure/cable, +/obj/machinery/air_sensor{ + chamber_id = "ordnancegas2" + }, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "xVa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -85560,7 +85543,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/science/mixing) +/area/station/science/ordnance) "xXo" = ( /obj/structure/sign/departments/xenobio, /turf/closed/wall/r_wall, @@ -86044,7 +86027,7 @@ /area/station/hallway/primary/central/fore) "yel" = ( /turf/closed/wall/r_wall, -/area/station/science/storage) +/area/station/science/ordnance) "yem" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -86059,7 +86042,7 @@ dir = 4 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "yeo" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -86118,7 +86101,7 @@ dir = 9 }, /turf/open/floor/engine/vacuum, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "yeY" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -86192,7 +86175,7 @@ "yfJ" = ( /obj/machinery/atmospherics/components/tank/oxygen, /turf/open/floor/iron/showroomfloor, -/area/station/science/storage) +/area/station/science/ordnance/storage) "yfP" = ( /obj/structure/grille, /obj/structure/cable, @@ -86394,7 +86377,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "yip" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -126914,7 +126897,7 @@ olC bvm gbv lSN -hun +tAU gKv qsK riR @@ -128196,15 +128179,15 @@ hyT naG vOy naG -gQS +yel ior jNr gQS aOI -yel +gQS cPo -yel -yel +gQS +gQS lDu lDu kWf @@ -128710,12 +128693,12 @@ frq bdY qVG oiX -rbj -rbj cbo -rbj -rbj -rbj +cbo +cbo +cbo +cbo +cbo hgj fiU naW @@ -128970,9 +128953,9 @@ eEJ uTy wPL cbo -rbj -rbj -rbj +cbo +cbo +cbo tQH yic pQX @@ -129231,7 +129214,7 @@ vCg gXR hpZ nxP -vEK +fiU snp lDu iZa @@ -129486,7 +129469,7 @@ iZa haU rrl sYL -rbj +cbo ueU dZJ kwU @@ -130257,7 +130240,7 @@ rZV mtc oLH lZQ -rbj +cbo viL mBJ mBJ @@ -130515,7 +130498,7 @@ mtc lDu qow efD -rbj +cbo sDo myM lDu diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 73c367de4cb..632fbbb22b3 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -156,7 +156,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "adp" = ( /turf/closed/wall, /area/station/hallway/primary/starboard) @@ -435,7 +435,7 @@ }, /obj/machinery/light/small/directional/south, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "aib" = ( /turf/open/floor/plating, /area/station/engineering/supermatter/room) @@ -482,7 +482,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "aja" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1001,7 +1001,7 @@ }, /obj/machinery/newscaster/directional/east, /turf/open/floor/grass, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "asX" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, @@ -1066,7 +1066,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "auh" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -1171,7 +1171,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "avJ" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -1421,7 +1421,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "aAs" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -1904,7 +1904,7 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "aIX" = ( /obj/machinery/portable_atmospherics/pump, /obj/machinery/light/small/directional/north, @@ -2151,7 +2151,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "aMA" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -2269,7 +2269,7 @@ "aNU" = ( /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "aNZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -2432,7 +2432,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "aQE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2538,7 +2538,7 @@ "aSE" = ( /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "aSG" = ( /obj/structure/window/reinforced{ dir = 8 @@ -2611,7 +2611,7 @@ /obj/effect/turf_decal/box/red, /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "aTD" = ( /obj/machinery/vending/coffee, /obj/item/radio/intercom/directional/south, @@ -2909,7 +2909,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "aYd" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -3363,10 +3363,10 @@ "bgB" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "bgO" = ( /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "bgS" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/camera/directional/west{ @@ -3553,7 +3553,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "bkl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -3701,7 +3701,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "bno" = ( /obj/structure/transit_tube/diagonal, /turf/open/space, @@ -3765,7 +3765,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "bnA" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -4563,7 +4563,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "bEU" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -5239,7 +5239,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "bUc" = ( /obj/machinery/shower{ dir = 8 @@ -5357,7 +5357,7 @@ /obj/structure/cable, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "bWh" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -5545,7 +5545,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "caC" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/box/white{ @@ -5559,7 +5559,7 @@ "caE" = ( /obj/machinery/rnd/experimentor, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "cbi" = ( /obj/machinery/camera/directional/east{ c_tag = "Aft Primary Hallway - Fore" @@ -5576,7 +5576,7 @@ "cbF" = ( /obj/machinery/component_printer, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "cce" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ @@ -5733,12 +5733,11 @@ }, /area/station/security/prison) "cgC" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas1"; +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{ dir = 1 }, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "cgF" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -5845,8 +5844,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "cit" = ( -/turf/open/floor/engine, -/area/station/science/misc_lab/range) +/turf/closed/wall/r_wall, +/area/station/science/ordnance/freezerchamber) "ciG" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5898,7 +5897,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "ckb" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating/airless{ @@ -6751,7 +6750,7 @@ /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "czG" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -7273,7 +7272,7 @@ pixel_y = 32 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "cKd" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -7605,7 +7604,7 @@ "cRM" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cRW" = ( /obj/machinery/light/directional/south, /obj/machinery/button/door/directional/south{ @@ -7891,14 +7890,14 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "cWf" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/siding/purple{ dir = 10 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cWr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8037,7 +8036,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "cYJ" = ( /obj/docking_port/stationary{ dir = 2; @@ -8173,7 +8172,7 @@ /obj/item/raw_anomaly_core/random, /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "daO" = ( /obj/structure/rack, /obj/item/gun/ballistic/shotgun/riot, @@ -8822,7 +8821,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "dji" = ( /obj/structure/lattice, /obj/structure/sign/warning/electric_shock{ @@ -9044,7 +9043,7 @@ dir = 10 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "dps" = ( /obj/machinery/light/small/directional/west, /obj/machinery/navbeacon{ @@ -9202,7 +9201,7 @@ dir = 4 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "dsb" = ( /obj/effect/turf_decal/plaque{ icon_state = "L13" @@ -9238,7 +9237,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "dss" = ( /obj/machinery/status_display/evac/directional/west, /obj/effect/turf_decal/tile/yellow{ @@ -9468,7 +9467,7 @@ dir = 4 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "dxO" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/camera/directional/east{ @@ -10123,7 +10122,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "dLu" = ( /obj/machinery/newscaster/directional/north, /obj/machinery/disposal/bin, @@ -10615,7 +10614,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "dTh" = ( /obj/structure/bed, /obj/item/clothing/suit/straight_jacket, @@ -10857,7 +10856,7 @@ pixel_x = -8 }, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "dXe" = ( /obj/machinery/door/airlock/maintenance{ name = "Storage Room" @@ -11184,7 +11183,7 @@ "ecn" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ecp" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/bot, @@ -11274,7 +11273,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "edP" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -11404,7 +11403,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "egs" = ( /obj/effect/spawner/random/maintenance/two, /obj/structure/rack, @@ -11779,7 +11778,7 @@ /obj/structure/flora/bush/fullgrass/style_random, /obj/item/radio/intercom/directional/east, /turf/open/floor/grass, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "emN" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -11817,7 +11816,7 @@ }, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "enw" = ( /obj/structure/table, /obj/item/paper_bin, @@ -11915,7 +11914,7 @@ dir = 10 }, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "epi" = ( /obj/structure/window/reinforced/plasma{ dir = 1 @@ -12263,7 +12262,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "euc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/l3closet/janitor, @@ -13269,7 +13268,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "eQs" = ( /obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, @@ -13281,7 +13280,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "eQO" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -13570,7 +13569,7 @@ /obj/structure/cable, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "eWq" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -13788,8 +13787,11 @@ dir = 9 }, /obj/machinery/airalarm/directional/west, +/obj/item/computer_hardware/hard_drive/portable/scipaper_program{ + pixel_x = 1 + }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "eZI" = ( /obj/structure/table, /obj/item/clothing/glasses/sunglasses{ @@ -13997,7 +13999,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ffd" = ( /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/neutral, @@ -14450,7 +14452,7 @@ /obj/item/radio/intercom/directional/north, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "fmw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -14755,7 +14757,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "ftY" = ( /obj/machinery/light/directional/south, /obj/machinery/firealarm/directional/south, @@ -14944,7 +14946,7 @@ }, /obj/effect/turf_decal/box/red, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "fAd" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -15354,7 +15356,7 @@ "fHN" = ( /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "fHV" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law{ @@ -15447,7 +15449,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "fJP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, @@ -15638,7 +15640,7 @@ "fNl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "fNx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -16051,7 +16053,7 @@ "fWQ" = ( /obj/machinery/atmospherics/components/binary/valve/digital, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "fWU" = ( /obj/structure/chair/office{ dir = 1 @@ -16620,7 +16622,7 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/plating, -/area/station/science/storage) +/area/station/science/ordnance/storage) "ggU" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral{ @@ -16767,7 +16769,7 @@ "gjo" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "gjr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, @@ -16945,7 +16947,7 @@ /area/station/hallway/primary/central) "gmL" = ( /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "gmS" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -17893,7 +17895,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "gFL" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -18279,7 +18281,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "gNl" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage" @@ -18442,7 +18444,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "gQt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -18877,7 +18879,7 @@ "gXr" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "gXu" = ( /turf/open/floor/plating, /area/station/engineering/main) @@ -18999,7 +19001,7 @@ dir = 9 }, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "gZD" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -19938,7 +19940,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "hsF" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet3"; @@ -20057,7 +20059,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hum" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, @@ -20382,7 +20384,7 @@ /obj/machinery/door/poddoor/massdriver_ordnance, /obj/structure/fans/tiny, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hyC" = ( /obj/structure/disposaloutlet{ desc = "An outlet for the pneumatic disposal system. This one seems designed for rapid corpse disposal."; @@ -20469,7 +20471,7 @@ }, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "hAE" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark/telecomms, @@ -20622,7 +20624,7 @@ /area/station/security/checkpoint/supply) "hEm" = ( /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "hEA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -20761,7 +20763,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "hHd" = ( /obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20929,7 +20931,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "hKv" = ( /obj/structure/chair/pew/left, /turf/open/floor/iron/chapel{ @@ -20985,7 +20987,7 @@ }, /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "hLj" = ( /obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/west, @@ -21043,7 +21045,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hMn" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -21200,13 +21202,13 @@ req_access = list("ordnance") }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "hOX" = ( /obj/structure/rack, /obj/item/integrated_circuit/loaded/hello_world, /obj/item/integrated_circuit/loaded/speech_relay, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "hPu" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 5 @@ -21278,7 +21280,7 @@ dir = 5 }, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "hQT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21901,13 +21903,13 @@ /obj/effect/turf_decal/box/red, /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "hZD" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 6 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "hZO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21999,7 +22001,7 @@ /obj/structure/tank_dispenser, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "ibX" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -22331,7 +22333,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "ihF" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -22534,7 +22536,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "ikZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -22849,7 +22851,7 @@ "ipF" = ( /obj/machinery/mass_driver/ordnance, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "ipG" = ( /obj/structure/table, /obj/item/poster/random_contraband, @@ -23222,7 +23224,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/chair/office/light, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "ivi" = ( /obj/machinery/hydroponics/soil, /obj/item/cultivator, @@ -23636,7 +23638,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "iBX" = ( /obj/machinery/computer/operating, /obj/machinery/light/small/directional/north, @@ -23662,7 +23664,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "iCz" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ @@ -23818,7 +23820,7 @@ "iER" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "iFe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -24233,7 +24235,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "iMk" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -24421,7 +24423,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "iOp" = ( /obj/machinery/door/airlock/command{ name = "Command Desk" @@ -24509,7 +24511,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "iPX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig{ @@ -24761,7 +24763,7 @@ pixel_y = 5 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "iSI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -24896,7 +24898,7 @@ /obj/effect/turf_decal/stripes/white/line, /obj/machinery/research/anomaly_refinery, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "iVs" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -25470,7 +25472,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jgg" = ( /obj/structure/cable, /obj/machinery/light_switch/directional/south, @@ -25678,7 +25680,7 @@ dir = 9 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "jjm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25746,7 +25748,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "jkT" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -26017,7 +26019,7 @@ }, /obj/effect/turf_decal/box/red, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jpr" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/command_all, @@ -26072,7 +26074,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jpO" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -26339,7 +26341,7 @@ dir = 9 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "jtE" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -26347,7 +26349,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jtI" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -26885,7 +26887,7 @@ "jCX" = ( /obj/item/bodypart/l_arm, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "jDb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, @@ -26969,7 +26971,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "jEY" = ( /obj/structure/table, /obj/item/phone{ @@ -27074,7 +27076,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jHg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27137,7 +27139,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "jHW" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -27228,7 +27230,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "jJC" = ( /obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk, @@ -27571,7 +27573,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "jPe" = ( /obj/structure/table, /obj/item/airlock_painter, @@ -28037,7 +28039,7 @@ /area/station/medical/chemistry) "jYz" = ( /turf/closed/wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "jYB" = ( /obj/machinery/conveyor/inverted{ dir = 6; @@ -28054,7 +28056,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jYX" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -28319,7 +28321,7 @@ /area/station/cargo/warehouse) "kdF" = ( /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "kdN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -28336,7 +28338,7 @@ /area/station/security/courtroom) "kdP" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "kdX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28793,7 +28795,7 @@ pixel_y = -32 }, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "kmN" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) @@ -29382,7 +29384,7 @@ /obj/item/assembly/timer, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "kwi" = ( /obj/effect/spawner/random/structure/crate_empty, /obj/item/clothing/gloves/color/fyellow, @@ -29490,7 +29492,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "kyh" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -30186,7 +30188,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "kNx" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -31278,7 +31280,7 @@ "lfy" = ( /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "lfG" = ( /obj/effect/turf_decal/trimline/purple/corner{ dir = 1 @@ -31577,11 +31579,11 @@ /obj/item/target/clown, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "llL" = ( /obj/item/bodypart/l_leg, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "llT" = ( /obj/structure/table/wood, /obj/machinery/button/ticket_machine{ @@ -31650,7 +31652,7 @@ "lmu" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "lmA" = ( /obj/machinery/power/smes{ capacity = 9e+006; @@ -32601,7 +32603,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "lEY" = ( /obj/machinery/gravity_generator/main/station, /obj/effect/turf_decal/bot_white, @@ -32613,7 +32615,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "lFg" = ( /obj/structure/chair{ dir = 4 @@ -32622,7 +32624,7 @@ dir = 9 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "lFq" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, @@ -33623,7 +33625,7 @@ dir = 6 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "lYx" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -33923,7 +33925,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "mfh" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -34971,11 +34973,9 @@ /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) "mAh" = ( -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas1" - }, +/obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "mAm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -35028,7 +35028,7 @@ "mAX" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "mBb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -35206,7 +35206,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "mEj" = ( /obj/structure/closet/crate/hydroponics, /obj/item/paper/guides/jobs/hydroponics, @@ -35438,7 +35438,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "mHl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35454,7 +35454,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "mHs" = ( /obj/item/shard, /turf/open/floor/plating/airless{ @@ -35537,7 +35537,7 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "mJa" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 @@ -35746,7 +35746,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor/heavy, /turf/open/floor/plating, -/area/station/science/storage) +/area/station/science/ordnance/storage) "mMu" = ( /obj/machinery/camera/directional/south{ c_tag = "Theater - Backstage" @@ -35836,7 +35836,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "mNZ" = ( /obj/machinery/holopad, /turf/open/floor/iron, @@ -35917,9 +35917,8 @@ c_tag = "Science Firing Range"; network = list("ss13","rd") }, -/obj/structure/cable, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "mPK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36476,7 +36475,7 @@ "mZr" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "mZy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36583,7 +36582,7 @@ }, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "nbs" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -36757,7 +36756,7 @@ dir = 1 }, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "ndS" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/command) @@ -37793,7 +37792,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "nwa" = ( /obj/structure/closet/wardrobe/pjs, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -38030,7 +38029,7 @@ /obj/structure/table, /obj/item/binoculars, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "nAu" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating/airless{ @@ -38070,7 +38069,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "nBa" = ( /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, @@ -38182,7 +38181,7 @@ /obj/machinery/light/directional/north, /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "nDk" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes{ @@ -38290,7 +38289,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/scientist, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "nGe" = ( /obj/structure/railing, /obj/machinery/light/small/red/directional/west, @@ -38442,14 +38441,14 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "nJB" = ( /obj/structure/sign/warning/secure_area{ desc = "A warning sign which reads 'BOMB RANGE"; name = "BOMB RANGE" }, /turf/closed/wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "nJG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -39036,7 +39035,7 @@ }, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "nUW" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -39337,7 +39336,7 @@ "oaK" = ( /obj/item/target/syndicate, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "oaW" = ( /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -39495,7 +39494,7 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "ocP" = ( /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, @@ -40066,7 +40065,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "oog" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -40219,7 +40218,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "oqi" = ( /obj/effect/landmark/start/paramedic, /obj/structure/disposalpipe/segment{ @@ -40567,7 +40566,7 @@ /obj/structure/flora/bush/fullgrass/style_random, /obj/machinery/light/directional/east, /turf/open/floor/grass, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "ovX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -40648,7 +40647,7 @@ dir = 5 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "oxx" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -40684,7 +40683,7 @@ /obj/structure/filingcabinet, /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "oyx" = ( /obj/structure/toilet{ pixel_y = 8 @@ -40770,7 +40769,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "ozK" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 @@ -40841,7 +40840,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "oBq" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, @@ -41638,7 +41637,7 @@ /area/station/hallway/primary/fore) "oRi" = ( /turf/closed/wall, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "oRn" = ( /obj/structure/table/wood, /obj/machinery/recharger{ @@ -41976,7 +41975,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "oXR" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -42326,7 +42325,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/landmark/start/scientist, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "pdx" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -42860,7 +42859,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "poJ" = ( /obj/machinery/telecomms/hub/preset, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -42897,7 +42896,7 @@ /obj/item/compact_remote, /obj/item/compact_remote, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "ppB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, @@ -43394,12 +43393,11 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 10 }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas2"; +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{ dir = 4 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "pyv" = ( /obj/machinery/vending/wardrobe/cargo_wardrobe, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -44036,7 +44034,7 @@ "pJk" = ( /obj/structure/training_machine, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "pJl" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -44506,7 +44504,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "pTf" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -44592,7 +44590,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "pUp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -44801,7 +44799,7 @@ "pXu" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "pXA" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -44871,7 +44869,7 @@ req_access = list("science") }, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "pZc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44921,7 +44919,7 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "pZQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45033,7 +45031,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "qdr" = ( /obj/structure/table, /obj/item/food/grown/wheat, @@ -45352,7 +45350,7 @@ "qhp" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "qhx" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/tile/purple, @@ -45456,7 +45454,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "qjf" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -45616,7 +45614,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "qlG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -45902,7 +45900,7 @@ /area/station/cargo/miningoffice) "qqs" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "qqL" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46360,7 +46358,7 @@ dir = 5 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "qzg" = ( /obj/structure/closet/emcloset, /obj/structure/sign/warning/vacuum/external{ @@ -46614,7 +46612,7 @@ pixel_y = 32 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "qDt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46858,7 +46856,7 @@ /area/station/maintenance/starboard/greater) "qHX" = ( /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "qIi" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -47334,7 +47332,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "qPS" = ( /obj/machinery/light_switch/directional/north, /obj/effect/turf_decal/siding/wood{ @@ -47541,10 +47539,8 @@ /turf/open/floor/iron, /area/station/commons/storage/primary) "qSB" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "qSJ" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall, @@ -47872,7 +47868,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "qZv" = ( /obj/structure/window/reinforced{ dir = 8 @@ -48111,7 +48107,7 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/plating, -/area/station/science/mixing) +/area/station/science/ordnance) "rea" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 5 @@ -48646,7 +48642,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "roa" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/cable, @@ -48886,7 +48882,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "rtn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49418,7 +49414,7 @@ "rAK" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "rBe" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -49654,7 +49650,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "rFB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -49694,7 +49690,7 @@ }, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "rGb" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/tile/blue{ @@ -50212,7 +50208,7 @@ "rMD" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "rMI" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, @@ -50377,7 +50373,7 @@ }, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "rQd" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -50415,7 +50411,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "rQJ" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -50425,7 +50421,7 @@ /obj/machinery/light/directional/north, /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "rQL" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -50591,7 +50587,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "rSk" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -50977,7 +50973,7 @@ dir = 8 }, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "rYN" = ( /obj/item/radio/intercom/directional/west, /obj/structure/table/glass, @@ -51030,7 +51026,7 @@ /obj/effect/turf_decal/siding/purple, /obj/item/kirbyplants/random, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "rZt" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 8 @@ -51383,7 +51379,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "sew" = ( /obj/structure/chair/stool/directional/east, /obj/effect/landmark/start/assistant, @@ -51590,7 +51586,7 @@ }, /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "sip" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51665,7 +51661,7 @@ /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "skq" = ( /obj/machinery/shower{ dir = 4 @@ -51733,7 +51729,7 @@ "slY" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "smg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/effect/mapping_helpers/airlock/locked, @@ -52023,7 +52019,7 @@ "sry" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "srG" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -52167,7 +52163,7 @@ /area/station/medical/treatment_center) "stF" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing) +/area/station/science/ordnance) "stL" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52187,7 +52183,7 @@ "suu" = ( /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "sux" = ( /turf/open/floor/plating/airless{ icon_state = "platingdmg2" @@ -52896,7 +52892,7 @@ }, /obj/item/kirbyplants/random, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "sHa" = ( /obj/machinery/door/airlock/external{ name = "Security External Airlock" @@ -52941,7 +52937,7 @@ dir = 6 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "sIb" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -53013,7 +53009,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "sJL" = ( /obj/item/crowbar, /obj/structure/cable, @@ -53062,7 +53058,7 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "sKt" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, @@ -53155,7 +53151,7 @@ pixel_x = -24 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "sMl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, @@ -53457,7 +53453,7 @@ dir = 5 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "sRT" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -54014,7 +54010,7 @@ /obj/effect/landmark/start/scientist, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "taz" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -54601,7 +54597,7 @@ dir = 10 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "tkP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -54897,7 +54893,7 @@ }, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "tpC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55125,7 +55121,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "ttA" = ( /obj/structure/table, /obj/item/flashlight{ @@ -55315,7 +55311,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "twN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57013,7 +57009,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "uaE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57252,7 +57248,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "ued" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57586,7 +57582,7 @@ /obj/structure/table, /obj/item/clipboard, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "uke" = ( /obj/structure/rack, /obj/effect/spawner/random/food_or_drink/booze{ @@ -57827,7 +57823,7 @@ dir = 5 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "uor" = ( /obj/machinery/door/poddoor{ id = "QMLoaddoor2"; @@ -57994,7 +57990,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "usg" = ( /obj/item/radio/intercom/directional/south, /obj/structure/table/reinforced, @@ -58194,7 +58190,7 @@ "uuY" = ( /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "uvw" = ( /obj/machinery/status_display/supply{ pixel_y = 32 @@ -58584,7 +58580,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "uCq" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -58748,7 +58744,7 @@ /turf/open/floor/plating/airless{ luminosity = 2 }, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "uFZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -59022,7 +59018,7 @@ req_access = list("ordnance") }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "uKa" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 6 @@ -59348,7 +59344,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "uQF" = ( /obj/structure/lattice, /obj/item/stack/rods, @@ -59478,7 +59474,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "uTj" = ( /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/dark, @@ -59917,7 +59913,7 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/plating, -/area/station/science/mixing) +/area/station/science/ordnance) "vdi" = ( /obj/machinery/camera/directional/west{ c_tag = "Security - Office - Port" @@ -60038,7 +60034,7 @@ dir = 9 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "vfk" = ( /obj/structure/cable, /turf/open/floor/engine, @@ -60087,11 +60083,9 @@ /area/station/medical/chemistry) "vga" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2, -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas2" - }, +/obj/machinery/air_sensor/ordnance_freezer_chamber, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "vgb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -60422,7 +60416,7 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "vlh" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/rnd_secure_all, @@ -60634,7 +60628,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "vpg" = ( /obj/machinery/door/poddoor/preopen{ id = "bridge blast"; @@ -61696,7 +61690,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "vJt" = ( /obj/structure/cable, /obj/machinery/firealarm/directional/west, @@ -62054,7 +62048,7 @@ /obj/machinery/light/directional/south, /obj/machinery/module_duplicator, /turf/open/floor/iron/white, -/area/station/science/misc_lab) +/area/station/science/explab) "vQb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -62101,7 +62095,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "vQv" = ( /obj/structure/table, /obj/item/plant_analyzer, @@ -62411,7 +62405,7 @@ /area/station/ai_monitored/command/storage/satellite) "vVH" = ( /turf/closed/wall/r_wall, -/area/station/science/storage) +/area/station/science/ordnance/storage) "vVI" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -63132,7 +63126,7 @@ "whR" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "wih" = ( /obj/machinery/newscaster/directional/south, /turf/open/floor/wood, @@ -63324,7 +63318,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "wmc" = ( /obj/structure/closet/secure_closet/evidence, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -63359,7 +63353,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "wmz" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron, @@ -63844,7 +63838,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "wuM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -63960,7 +63954,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "wxF" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -64088,7 +64082,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "wAp" = ( /obj/item/radio/intercom/directional/west, /obj/structure/table, @@ -64312,7 +64306,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/landmark/start/scientist, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "wDG" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -64640,7 +64634,7 @@ req_access = list("rd") }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "wKu" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -65225,7 +65219,7 @@ dir = 6 }, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "wTO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65434,7 +65428,7 @@ desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; name = "hyper-reinforced wall" }, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "wXP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65537,7 +65531,7 @@ }, /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "wYx" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -66284,7 +66278,7 @@ "xns" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "xnt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -66392,16 +66386,15 @@ /area/station/maintenance/disposal/incinerator) "xpC" = ( /obj/effect/turf_decal/siding/purple, -/obj/machinery/computer/atmos_control/noreconnect{ - atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber"); - dir = 1 - }, /obj/machinery/camera/directional/south{ c_tag = "Science Ordnance Mix Lab"; network = list("ss13","rd") }, +/obj/machinery/computer/atmos_control/ordnancemix{ + dir = 1 + }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "xpI" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -66849,7 +66842,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "xyp" = ( /obj/machinery/status_display/evac/directional/north, /obj/structure/cable, @@ -67402,7 +67395,7 @@ "xHi" = ( /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance/storage) "xIi" = ( /obj/structure/chair/office{ dir = 8 @@ -67414,7 +67407,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/explab) "xIx" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -67795,9 +67788,8 @@ dir = 8 }, /obj/machinery/light/small/directional/north, -/obj/structure/cable, /turf/open/floor/engine, -/area/station/science/misc_lab/range) +/area/station/science/explab) "xPb" = ( /obj/structure/chair{ dir = 8 @@ -68100,7 +68092,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/doppler_array, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "xUX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68302,7 +68294,7 @@ dir = 10 }, /turf/open/floor/iron/dark, -/area/station/science/mixing) +/area/station/science/ordnance) "xXG" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer5{ @@ -68397,7 +68389,7 @@ name = "Test Range Requests Console" }, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "xYQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /obj/effect/spawner/structure/window/reinforced, @@ -68569,7 +68561,7 @@ /obj/effect/turf_decal/siding/purple, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "yby" = ( /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/chapel, @@ -68762,7 +68754,7 @@ /obj/effect/turf_decal/stripes/white/line, /obj/effect/turf_decal/box/red, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "yeS" = ( /obj/item/retractor, /obj/item/hemostat{ @@ -68986,7 +68978,7 @@ /area/station/service/chapel/office) "yke" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "ykj" = ( /obj/structure/table, /obj/structure/cable, @@ -98835,7 +98827,7 @@ stF hZD qhp qyX -yke +cit vfd xXz svS @@ -99347,9 +99339,9 @@ sry sKm stF xyf -yke +cit xyf -yke +cit diK hsC vcK @@ -103692,7 +103684,7 @@ wXF qSB bgB lEU -cit +qSB oaK tAg lnA @@ -103947,7 +103939,7 @@ tUn hKV wXF lmu -cit +qSB jOW iER slY diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index fb3f3bed263..589732c2452 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -1999,7 +1999,7 @@ "kp" = ( /obj/structure/server, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "kQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 8 @@ -2034,7 +2034,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "nq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -2122,7 +2122,7 @@ "tV" = ( /obj/structure/bot, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "uf" = ( /obj/structure/fans/tiny/invisible, /obj/effect/turf_decal/stripes/line{ @@ -2164,11 +2164,11 @@ pixel_x = 5 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "vm" = ( /mob/living/circuit_drone, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "vv" = ( /obj/machinery/door/airlock, /turf/open/floor/plating, @@ -2222,7 +2222,7 @@ /area/station/hallway/primary/central) "wU" = ( /turf/closed/wall/r_wall, -/area/station/science/misc_lab) +/area/station/science/explab) "yK" = ( /obj/structure/fans/tiny/invisible, /obj/effect/turf_decal/stripes/line{ @@ -2246,7 +2246,7 @@ pixel_y = 23 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "AP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 8 @@ -2286,7 +2286,7 @@ "CT" = ( /obj/machinery/component_printer, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "CV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/cable, @@ -2298,7 +2298,7 @@ /obj/item/integrated_circuit/loaded/speech_relay, /obj/structure/rack, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "DW" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -2355,7 +2355,7 @@ "Ir" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/misc_lab) +/area/station/science/explab) "Iy" = ( /obj/structure/closet/secure_closet/research_director{ locked = 0 @@ -2413,7 +2413,7 @@ }, /obj/machinery/door/airlock/research, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "LW" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -2440,7 +2440,7 @@ "Nb" = ( /obj/machinery/bci_implanter, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "Nc" = ( /obj/machinery/chem_recipe_debug, /turf/open/floor/iron, @@ -2461,7 +2461,7 @@ /obj/item/stock_parts/cell/bluespace, /obj/item/stock_parts/cell/bluespace, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "OU" = ( /obj/item/disk/tech_disk/debug, /turf/open/floor/iron, @@ -2545,7 +2545,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "Vy" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -2583,7 +2583,7 @@ "WK" = ( /obj/structure/money_bot, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "WT" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -2623,7 +2623,7 @@ pixel_y = 5 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "XR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 9 @@ -2649,7 +2649,7 @@ pixel_x = 4 }, /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) "Yy" = ( /obj/machinery/light/directional/north, /obj/machinery/rnd/production/circuit_imprinter/department, @@ -2663,7 +2663,7 @@ /area/station/engineering/atmos) "ZP" = ( /turf/open/floor/iron/dark, -/area/station/science/misc_lab) +/area/station/science/explab) (1,1,1) = {" aa diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 50068afa164..4a9a5f5b7c0 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -1005,7 +1005,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "azp" = ( /obj/structure/easel, /obj/item/canvas/nineteen_nineteen, @@ -1331,7 +1331,7 @@ "aHe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "aHf" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 @@ -1451,7 +1451,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "aJM" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/structure/sign/warning/biohazard{ @@ -1823,7 +1823,7 @@ /area/station/cargo/storage) "aSu" = ( /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "aSw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -2581,7 +2581,7 @@ dir = 5 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "biI" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -2675,7 +2675,7 @@ /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/mixing/launch) +/area/station/science/ordnance/testlab) "bkl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3518,7 +3518,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "bxC" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 9 @@ -3790,7 +3790,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "bBX" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -4315,7 +4315,7 @@ "bKN" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "bKU" = ( /obj/machinery/door/airlock/command/glass{ name = "Server Access" @@ -4574,7 +4574,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "bOm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning, @@ -4599,7 +4599,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "bOr" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -4645,7 +4645,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "bOR" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/effect/decal/cleanable/dirt, @@ -4842,7 +4842,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "bRD" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/structure/disposalpipe/segment{ @@ -5377,7 +5377,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "caw" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -5841,7 +5841,7 @@ "cgk" = ( /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cgs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/garbage{ @@ -6232,7 +6232,7 @@ "cmH" = ( /obj/machinery/research/anomaly_refinery, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "cmM" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -6265,7 +6265,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cnV" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -6559,8 +6559,12 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, +/obj/item/computer_hardware/hard_drive/portable/scipaper_program{ + pixel_x = 4; + pixel_y = -2 + }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "crr" = ( /obj/structure/table/glass, /obj/item/book/manual/wiki/cytology{ @@ -7427,7 +7431,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "cDX" = ( /obj/effect/turf_decal/bot, /obj/machinery/flasher/directional/east{ @@ -7459,7 +7463,7 @@ }, /obj/effect/turf_decal/box, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cEy" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -7590,7 +7594,7 @@ dir = 8 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "cFs" = ( /turf/open/openspace, /area/station/hallway/primary/tram/left) @@ -7603,13 +7607,13 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "cFK" = ( /obj/structure/window/reinforced{ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "cFM" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/decal/cleanable/dirt, @@ -7921,7 +7925,7 @@ "cKQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "cKZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -8288,7 +8292,7 @@ /area/station/ai_monitored/turret_protected/aisat/hallway) "cSh" = ( /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cSk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8481,7 +8485,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cVa" = ( /obj/machinery/light/small/directional/north, /turf/open/openspace, @@ -8597,7 +8601,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "cWx" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -8931,7 +8935,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "dbK" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -8951,7 +8955,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "dbR" = ( /obj/structure/cable, /turf/open/floor/iron/white, @@ -9093,7 +9097,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "dez" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -10341,7 +10345,7 @@ pixel_y = 13 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "dxC" = ( /turf/closed/wall/r_wall, /area/station/command/gateway) @@ -11036,7 +11040,7 @@ /area/station/service/hydroponics) "dIS" = ( /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "dIY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -11556,7 +11560,7 @@ pixel_y = 5 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "dRB" = ( /obj/structure/table, /obj/item/restraints/handcuffs, @@ -11620,13 +11624,12 @@ /area/station/security/prison) "dSM" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/machinery/computer/atmos_control/noreconnect{ - atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber"); +/obj/machinery/light/directional/east, +/obj/machinery/computer/atmos_control/ordnancemix{ dir = 8 }, -/obj/machinery/light/directional/east, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "dSN" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -11902,7 +11905,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "dYD" = ( /obj/structure/table, /obj/item/clothing/gloves/boxing, @@ -12060,7 +12063,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "ebw" = ( /obj/structure/bodycontainer/morgue{ dir = 1 @@ -12231,7 +12234,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "eeJ" = ( /obj/structure/window/reinforced/spawner, /turf/open/floor/iron/dark/smooth_edge, @@ -12277,7 +12280,7 @@ /obj/structure/cable, /obj/machinery/light/directional/south, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "efG" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -12294,7 +12297,7 @@ }, /obj/machinery/light/directional/north, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "efK" = ( /obj/structure/lattice, /obj/effect/spawner/random/structure/grille, @@ -12663,7 +12666,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "elB" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -12836,7 +12839,7 @@ }, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "epz" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -12871,7 +12874,7 @@ "eqk" = ( /obj/structure/tank_dispenser, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "eqq" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -12889,7 +12892,7 @@ /area/station/engineering/break_room) "eqF" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "eqL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -12919,7 +12922,7 @@ /area/station/engineering/atmospherics_engine) "erC" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "erP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -13127,7 +13130,7 @@ }, /obj/machinery/door/window/left/directional/north, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "evg" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 @@ -13363,11 +13366,9 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "eAp" = ( -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas1" - }, +/obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "eAr" = ( /obj/machinery/light/directional/south, /turf/open/floor/plating, @@ -13836,7 +13837,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "eIX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15241,7 +15242,7 @@ "fkg" = ( /obj/structure/chair/office/light, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "fkh" = ( /obj/structure/sign/warning/docking, /obj/effect/spawner/structure/window/reinforced, @@ -16177,7 +16178,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "fBp" = ( /obj/machinery/door/airlock{ id_tag = "private_l"; @@ -16722,7 +16723,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "fLR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16914,7 +16915,7 @@ /obj/machinery/atmospherics/components/binary/tank_compressor, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "fPu" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/segment{ @@ -16953,7 +16954,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "fQK" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -17596,7 +17597,7 @@ }, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "gbB" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -17844,12 +17845,11 @@ /turf/open/floor/iron, /area/station/commons/dorms) "gge" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas1"; +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "ggi" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, @@ -19090,7 +19090,7 @@ /area/station/commons/dorms) "gBR" = ( /turf/closed/wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "gCc" = ( /obj/machinery/door/window/brigdoor{ dir = 4; @@ -19194,7 +19194,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "gFb" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/turf_decal/siding/thinplating/corner{ @@ -20307,7 +20307,7 @@ }, /obj/machinery/meter, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "gWx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20617,7 +20617,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "hbD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21136,7 +21136,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "hlC" = ( /obj/effect/turf_decal/siding/thinplating, /turf/open/floor/iron, @@ -21437,7 +21437,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "hrR" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/peppermill{ @@ -21496,7 +21496,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "htn" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -21694,7 +21694,7 @@ /obj/machinery/firealarm/directional/east, /obj/machinery/light/directional/east, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "hxl" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall, @@ -21715,7 +21715,7 @@ dir = 10 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hyg" = ( /turf/open/floor/glass/reinforced, /area/station/hallway/primary/tram/center) @@ -22313,7 +22313,7 @@ "hHl" = ( /obj/machinery/atmospherics/components/binary/valve/digital, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "hHu" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -22421,7 +22421,7 @@ "hJJ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/misc_lab) +/area/station/science/auxlab) "hJW" = ( /obj/structure/window/reinforced{ dir = 8 @@ -22698,7 +22698,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hQf" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23060,7 +23060,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "hVY" = ( /obj/machinery/computer/teleporter{ dir = 4 @@ -23472,7 +23472,7 @@ name = "BOMB RANGE" }, /turf/closed/wall, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "icx" = ( /turf/open/floor/circuit/green, /area/station/science/robotics/mechbay) @@ -23601,7 +23601,7 @@ /area/station/hallway/secondary/entry) "ieK" = ( /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "ieS" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -24157,7 +24157,7 @@ dir = 6 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "ion" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, @@ -24227,7 +24227,7 @@ /obj/structure/cable, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "ipe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/iron, @@ -24958,7 +24958,7 @@ "iAU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "iBm" = ( /obj/machinery/light/directional/west, /obj/structure/bed{ @@ -25692,7 +25692,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "iQU" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -25999,7 +25999,7 @@ /area/station/engineering/supermatter) "iUz" = ( /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "iUE" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "prisondorm"; @@ -26375,7 +26375,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "jap" = ( /obj/structure/chair{ dir = 8 @@ -26408,7 +26408,7 @@ }, /obj/machinery/meter, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "jaH" = ( /obj/structure/cable, /turf/open/floor/iron/showroomfloor, @@ -26786,7 +26786,7 @@ "jjm" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jjn" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/disposal/bin, @@ -27031,7 +27031,7 @@ dir = 1 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "jnO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/event_spawn, @@ -27377,7 +27377,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "jtN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -27396,7 +27396,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "jtW" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -28077,7 +28077,7 @@ "jFi" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "jFx" = ( /obj/structure/lattice, /obj/effect/spawner/random/structure/grille, @@ -28490,7 +28490,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "jMn" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -28530,7 +28530,7 @@ /area/station/command/heads_quarters/hop) "jMB" = ( /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "jMD" = ( /obj/structure/table/glass, /turf/open/floor/iron/cafeteria{ @@ -28558,14 +28558,14 @@ "jMR" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "jMS" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/modular_computer/console/preset/civilian{ dir = 1 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "jMX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -28978,7 +28978,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "jUh" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics" @@ -29231,7 +29231,7 @@ dir = 9 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "jYd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -29240,7 +29240,7 @@ }, /obj/machinery/door/firedoor/heavy, /turf/open/floor/plating, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "jYf" = ( /obj/structure/chair/office{ dir = 8 @@ -30818,7 +30818,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "kwN" = ( /obj/machinery/computer/holodeck{ dir = 4 @@ -31059,7 +31059,7 @@ dir = 9 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "kBE" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -31279,7 +31279,7 @@ "kEL" = ( /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "kES" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -32271,7 +32271,7 @@ /obj/machinery/door/firedoor/heavy, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance) "kVV" = ( /turf/open/floor/carpet, /area/station/command/bridge) @@ -32437,7 +32437,7 @@ desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; name = "hyper-reinforced wall" }, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "kXI" = ( /obj/structure/closet/crate, /obj/item/crowbar, @@ -32556,7 +32556,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/iron/white, -/area/station/science/mixing/launch) +/area/station/science/ordnance) "kZr" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/three, @@ -32606,7 +32606,7 @@ dir = 1 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "lal" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -33019,7 +33019,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "lhw" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -33259,7 +33259,7 @@ }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "llU" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 @@ -33554,7 +33554,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "lrB" = ( /obj/structure/table, /obj/item/book/manual/wiki/engineering_hacking{ @@ -33765,7 +33765,7 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/light_switch/directional/south, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "luy" = ( /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/dark, @@ -34077,7 +34077,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/machinery/meter, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "lyD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/corner, @@ -35200,7 +35200,7 @@ "lSc" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "lSe" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, @@ -36584,7 +36584,7 @@ /obj/machinery/firealarm/directional/west, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "mrm" = ( /obj/structure/table/wood, /obj/item/radio/intercom, @@ -36654,7 +36654,7 @@ /area/station/engineering/main) "msn" = ( /turf/closed/wall, -/area/station/science/misc_lab) +/area/station/science/auxlab) "msx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36779,7 +36779,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "mve" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37203,7 +37203,7 @@ pixel_y = 24 }, /turf/open/floor/iron/white, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "mAW" = ( /obj/structure/table/wood, /obj/item/folder/yellow, @@ -37670,7 +37670,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "mHg" = ( /obj/effect/turf_decal/sand, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39681,7 +39681,7 @@ pixel_y = 24 }, /turf/open/floor/iron/white, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "npf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -39833,7 +39833,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "nrF" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; @@ -39915,7 +39915,7 @@ /obj/machinery/door/poddoor/massdriver_ordnance, /obj/structure/fans/tiny, /turf/open/floor/plating, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "nuc" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -39959,7 +39959,7 @@ }, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "nvg" = ( /obj/structure/bodycontainer/morgue{ dir = 1 @@ -40175,7 +40175,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance_storage, /turf/open/floor/iron/white, -/area/station/science/storage) +/area/station/science/ordnance) "nyi" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -40968,7 +40968,7 @@ }, /obj/effect/turf_decal/stripes, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "nOC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -41000,7 +41000,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "nPs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41046,7 +41046,7 @@ /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "nQr" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -41453,7 +41453,7 @@ /obj/machinery/light_switch/directional/west, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "nXp" = ( /obj/structure/floodlight_frame, /turf/open/misc/asteroid, @@ -42302,7 +42302,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "onW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -42410,7 +42410,7 @@ "opG" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "opN" = ( /obj/machinery/power/shieldwallgen, /obj/effect/turf_decal/bot, @@ -42899,7 +42899,7 @@ }, /obj/effect/turf_decal/stripes, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "oyD" = ( /obj/structure/window/reinforced{ dir = 8 @@ -44102,7 +44102,7 @@ pixel_y = -32 }, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "oUs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -44272,7 +44272,7 @@ network = list("ss13","rd") }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "oXC" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -44924,7 +44924,7 @@ dir = 4 }, /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "piE" = ( /obj/structure/chair{ dir = 4; @@ -46385,7 +46385,7 @@ /obj/effect/turf_decal/box/red, /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "pHq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -46853,7 +46853,7 @@ pixel_y = 2 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "pOo" = ( /obj/structure/table, /obj/structure/cable, @@ -47564,7 +47564,7 @@ "qcU" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "qdj" = ( /turf/closed/wall/r_wall, /area/station/science/breakroom) @@ -47656,7 +47656,7 @@ "qeu" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "qeE" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 @@ -47672,7 +47672,7 @@ /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/storage) +/area/station/science/ordnance/storage) "qeL" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 10 @@ -48331,7 +48331,7 @@ /obj/machinery/light/directional/north, /obj/machinery/component_printer, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "qpu" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -48837,7 +48837,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "qxS" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -49095,7 +49095,7 @@ network = list("ss13","rd") }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "qCQ" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -50159,7 +50159,7 @@ }, /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "qUt" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -51003,11 +51003,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 5 }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - chamber_id = "ordnancegas2" - }, +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "rlU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -51034,7 +51032,7 @@ /area/station/security/office) "rmk" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "rmm" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -51241,7 +51239,7 @@ dir = 10 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "rqG" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/structure/railing/corner, @@ -51491,7 +51489,7 @@ req_access = list("ordnance") }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "ruA" = ( /obj/structure/railing{ dir = 1 @@ -51655,7 +51653,7 @@ /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/mixing/launch) +/area/station/science/ordnance/testlab) "rxo" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -51782,7 +51780,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "ryZ" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/structure/disposalpipe/segment{ @@ -52007,7 +52005,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "rCn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52131,7 +52129,7 @@ /area/station/medical/medbay/central) "rDX" = ( /turf/closed/wall/r_wall, -/area/station/science/mixing) +/area/station/science/ordnance) "rEe" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -52158,7 +52156,7 @@ }, /obj/effect/landmark/start/scientist, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "rEB" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -52324,7 +52322,7 @@ dir = 5 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "rHq" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 8 @@ -52420,7 +52418,7 @@ }, /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "rIT" = ( /obj/structure/table/wood, /obj/effect/spawner/random/decoration/ornament, @@ -52537,7 +52535,7 @@ /area/station/command/teleporter) "rKh" = ( /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "rKj" = ( /obj/structure/table/wood, /obj/item/storage/dice, @@ -53042,7 +53040,7 @@ /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "rPS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -53709,7 +53707,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "scA" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -53734,7 +53732,7 @@ dir = 8 }, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "scV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53939,7 +53937,7 @@ dir = 10 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "sgu" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -54095,7 +54093,7 @@ }, /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "slf" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -54188,7 +54186,7 @@ piping_layer = 2 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "snC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -54451,7 +54449,7 @@ "ssl" = ( /obj/structure/closet/firecloset, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "ssp" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -54619,7 +54617,7 @@ /obj/item/integrated_circuit/loaded/speech_relay, /obj/item/compact_remote, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "svk" = ( /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai_upload) @@ -54650,7 +54648,7 @@ /obj/machinery/requests_console/directional/west, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "swr" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, @@ -55097,6 +55095,9 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"sFu" = ( +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) "sFA" = ( /obj/machinery/door/airlock/research/glass{ name = "Experimentation Lab" @@ -57292,7 +57293,7 @@ /obj/machinery/airalarm/directional/north, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "trL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -58327,7 +58328,7 @@ /obj/item/toy/figure/assistant, /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "tIi" = ( /mob/living/simple_animal/bot/floorbot, /turf/open/floor/iron/dark, @@ -58567,7 +58568,7 @@ }, /obj/effect/turf_decal/box/red, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "tMG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58708,7 +58709,7 @@ /area/station/maintenance/department/medical) "tQc" = ( /turf/closed/wall/r_wall, -/area/station/science/storage) +/area/station/science/ordnance/storage) "tQq" = ( /obj/machinery/recharge_station, /turf/open/floor/plating, @@ -58826,7 +58827,7 @@ }, /obj/effect/landmark/start/scientist, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "tRW" = ( /obj/structure/toilet{ dir = 8; @@ -60331,7 +60332,7 @@ /obj/machinery/airalarm/directional/south, /obj/machinery/light/directional/south, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "utB" = ( /obj/structure/table, /obj/item/multitool, @@ -61089,7 +61090,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "uFX" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/scrubber, @@ -61238,7 +61239,7 @@ dir = 10 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "uJx" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -61612,7 +61613,7 @@ pixel_y = -8 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "uOZ" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -62583,7 +62584,7 @@ /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/mixing/launch) +/area/station/science/ordnance/testlab) "vfD" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -62850,7 +62851,7 @@ }, /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "vju" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -62945,7 +62946,7 @@ }, /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "vlO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/misc/asteroid/airless, @@ -63033,7 +63034,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "voN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -63240,7 +63241,7 @@ dir = 6 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "vrN" = ( /obj/effect/turf_decal/delivery, /obj/effect/landmark/start/hangover, @@ -63601,7 +63602,7 @@ pixel_y = 1 }, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "vwZ" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, @@ -63860,7 +63861,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "vCk" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -64450,7 +64451,7 @@ /obj/item/raw_anomaly_core/random, /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "vND" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -64782,7 +64783,7 @@ }, /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "vTM" = ( /turf/open/floor/wood, /area/station/service/bar) @@ -65156,7 +65157,7 @@ "waK" = ( /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "wbb" = ( /turf/open/floor/iron, /area/station/commons/dorms) @@ -65928,7 +65929,7 @@ /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine/vacuum, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "wqu" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, @@ -65967,7 +65968,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "wrs" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/effect/decal/cleanable/dirt, @@ -66340,7 +66341,7 @@ "wwY" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "wxb" = ( /obj/machinery/computer/chef_order{ dir = 1 @@ -66643,7 +66644,7 @@ "wBM" = ( /obj/structure/chair/office, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "wBX" = ( /obj/structure/window/reinforced{ dir = 4; @@ -66855,7 +66856,7 @@ "wGn" = ( /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "wGy" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -67343,7 +67344,7 @@ "wQi" = ( /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "wQm" = ( /turf/open/floor/iron, /area/station/engineering/atmos) @@ -67507,7 +67508,7 @@ }, /obj/item/assembly/timer, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "wUR" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -67917,7 +67918,7 @@ network = list("ss13","rd") }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "xaB" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -68193,7 +68194,7 @@ name = "Lil Pump" }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "xeK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -68350,7 +68351,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/science/misc_lab) +/area/station/science/auxlab) "xgN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -68377,7 +68378,7 @@ /obj/machinery/airalarm/directional/north, /obj/machinery/light/directional/north, /turf/open/floor/iron/white, -/area/station/science/mixing/hallway) +/area/station/science/ordnance/office) "xhs" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -68451,7 +68452,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/science/storage) +/area/station/science/ordnance/storage) "xiq" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/siding/thinplating/dark, @@ -68534,7 +68535,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "xks" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -68906,7 +68907,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2, /obj/machinery/meter/layer2, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "xsc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68972,7 +68973,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2, /obj/machinery/atmospherics/components/unary/vent_scrubber, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "xtP" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/closet, @@ -69725,7 +69726,7 @@ dir = 6 }, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "xGX" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 8 @@ -69833,7 +69834,7 @@ pixel_y = 24 }, /turf/open/floor/engine, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/burnchamber) "xJj" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -70332,7 +70333,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/station/science/storage) +/area/station/science/ordnance/storage) "xRv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70538,7 +70539,7 @@ pixel_y = -2 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "xVr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -70548,7 +70549,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/mixing) +/area/station/science/ordnance) "xVx" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -70700,7 +70701,7 @@ pixel_x = 3 }, /turf/open/floor/iron/dark, -/area/station/science/mixing/launch) +/area/station/science/ordnance/testlab) "xWu" = ( /obj/machinery/status_display/shuttle, /turf/closed/wall, @@ -70736,11 +70737,9 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 8 }, -/obj/machinery/air_sensor{ - chamber_id = "ordnancegas2" - }, +/obj/machinery/air_sensor/ordnance_freezer_chamber, /turf/open/floor/iron/dark/airless, -/area/station/science/mixing/chamber) +/area/station/science/ordnance/freezerchamber) "xWX" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -70903,7 +70902,7 @@ dir = 5 }, /turf/open/floor/plating/airless, -/area/station/science/test_area) +/area/station/science/ordnance/bomb) "xZZ" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -118529,7 +118528,7 @@ cFF rmk tMu xVr -tQc +rDX efH cnL fBl @@ -119043,7 +119042,7 @@ aJC ruv iAU nPg -tQc +rDX jFi xeH cgk @@ -119300,7 +119299,7 @@ ebu ieK ieK scv -tQc +rDX jFi xeH cgk @@ -119557,7 +119556,7 @@ ieK ieK cKQ muZ -tQc +rDX tQc tQc tQc @@ -119814,7 +119813,7 @@ ieK uOO dSM gbd -eqF +rDX cmH vNA pHl @@ -120069,9 +120068,9 @@ oys hth bRs pit -rmk +sFu kZq -eqF +rDX rID dbu dbu @@ -120583,7 +120582,7 @@ oys hth wpQ pit -rmk +sFu vfz rxf rxf @@ -120840,7 +120839,7 @@ oys scP eAp gge -rmk +sFu pOn cDR dRt @@ -121097,7 +121096,7 @@ oys dIS kEL dIS -rmk +sFu wUK skt xUX @@ -121354,7 +121353,7 @@ oys waK waK waK -rmk +sFu jjm eqF jjm diff --git a/code/controllers/subsystem/traitor.dm b/code/controllers/subsystem/traitor.dm index cbbba49d086..57190c51cba 100644 --- a/code/controllers/subsystem/traitor.dm +++ b/code/controllers/subsystem/traitor.dm @@ -66,7 +66,6 @@ SUBSYSTEM_DEF(traitor) /area/station/engineering/lobby, /area/station/engineering/storage, /area/station/science/lobby, - /area/station/science/test_area, /area/station/security/prison, )) diff --git a/code/game/area/areas/station.dm b/code/game/area/areas/station.dm index 803aec7a8c5..91ff7dccf72 100644 --- a/code/game/area/areas/station.dm +++ b/code/game/area/areas/station.dm @@ -1301,44 +1301,43 @@ name = "\improper Cytology Lab" icon_state = "cytology" -/area/station/science/storage - name = "Ordnance Storage" +// Use this for the main lab. If test equipment, storage, etc is also present use this one too. +/area/station/science/ordnance + name = "\improper Ordnance Lab" + icon_state = "ord_main" + +/area/station/science/ordnance/office + name = "\improper Ordnance Office" + icon_state = "ord_office" + +/area/station/science/ordnance/storage + name = "\improper Ordnance Storage" icon_state = "ord_storage" -/area/station/science/test_area - name = "\improper Ordnance Test Area" +/area/station/science/ordnance/burnchamber + name = "\improper Ordnance Burn Chamber" + icon_state = "ord_burn" + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED + +/area/station/science/ordnance/freezerchamber + name = "\improper Ordnance Freezer Chamber" + icon_state = "ord_freeze" + area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED + +// Room for equipments and such +/area/station/science/ordnance/testlab + name = "\improper Ordnance Testing Lab" icon_state = "ord_test" area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED -/area/station/science/mixing - name = "\improper Ordnance Mixing Lab" - icon_state = "ord_mix" - -/area/station/science/mixing/chamber - name = "\improper Ordnance Mixing Chamber" - icon_state = "ord_mix_chamber" - area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED - -/area/station/science/mixing/hallway - name = "\improper Ordnance Mixing Hallway" - icon_state = "ord_mix_hallway" - -/area/station/science/mixing/launch - name = "\improper Ordnance Mixing Launch Site" - icon_state = "ord_mix_launch" +/area/station/science/ordnance/bomb + name = "\improper Ordnance Bomb Site" + icon_state = "ord_boom" /area/station/science/genetics name = "\improper Genetics Lab" icon_state = "geneticssci" -/area/station/science/misc_lab - name = "\improper Testing Lab" - icon_state = "ord_misc" - -/area/station/science/misc_lab/range - name = "\improper Research Testing Range" - icon_state = "ord_range" - /area/station/science/server name = "\improper Research Division Server Room" icon_state = "server" @@ -1347,6 +1346,11 @@ name = "\improper Experimentation Lab" icon_state = "exp_lab" +// Useless room +/area/station/science/auxlab + name = "\improper Auxillary Lab" + icon_state = "aux_lab" + /area/station/science/robotics name = "Robotics" icon_state = "robotics" diff --git a/code/game/machinery/computer/atmos_computers/__identifiers.dm b/code/game/machinery/computer/atmos_computers/__identifiers.dm index 3a8bfa5322c..c8096472b8e 100644 --- a/code/game/machinery/computer/atmos_computers/__identifiers.dm +++ b/code/game/machinery/computer/atmos_computers/__identifiers.dm @@ -26,7 +26,8 @@ #define ATMOS_GAS_MONITOR_HELIUM "helium" #define ATMOS_GAS_MONITOR_ANTINOBLIUM "antinoblium" #define ATMOS_GAS_MONITOR_INCINERATOR "incinerator" -#define ATMOS_GAS_MONITOR_ORDNANCE_LAB "ordnancelab" +#define ATMOS_GAS_MONITOR_ORDNANCE_BURN "ordnanceburn" +#define ATMOS_GAS_MONITOR_ORDNANCE_FREEZER "ordnancefreezer" #define ATMOS_GAS_MONITOR_DISTRO "distro" #define ATMOS_GAS_MONITOR_WASTE "waste" @@ -55,7 +56,8 @@ GLOBAL_LIST_INIT(station_gas_chambers, list( ATMOS_GAS_MONITOR_ANTINOBLIUM = "Antinoblium Supply", ATMOS_GAS_MONITOR_MIX = "Mix Chamber", ATMOS_GAS_MONITOR_INCINERATOR = "Incinerator Chamber", - ATMOS_GAS_MONITOR_ORDNANCE_LAB = "Ordnance Chamber", + ATMOS_GAS_MONITOR_ORDNANCE_BURN = "Ordnance Burn Chamber", + ATMOS_GAS_MONITOR_ORDNANCE_FREEZER = "Ordnance Freezer Chamber", ATMOS_GAS_MONITOR_DISTRO = "Distribution Loop", ATMOS_GAS_MONITOR_WASTE = "Waste Loop", )) diff --git a/code/game/machinery/computer/atmos_computers/air_sensors.dm b/code/game/machinery/computer/atmos_computers/air_sensors.dm index 429389473ee..bd28bcbae3a 100644 --- a/code/game/machinery/computer/atmos_computers/air_sensors.dm +++ b/code/game/machinery/computer/atmos_computers/air_sensors.dm @@ -2,10 +2,6 @@ name = "plasma tank gas sensor" chamber_id = ATMOS_GAS_MONITOR_PLAS -/obj/machinery/air_sensor/ordnance_mixing_tank - name = "ordnance mixing gas sensor" - chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_LAB - /obj/machinery/air_sensor/oxygen_tank name = "oxygen tank gas sensor" chamber_id = ATMOS_GAS_MONITOR_O2 @@ -93,3 +89,11 @@ /obj/machinery/air_sensor/incinerator_tank name = "incinerator chamber gas sensor" chamber_id = ATMOS_GAS_MONITOR_INCINERATOR + +/obj/machinery/air_sensor/ordnance_burn_chamber + name = "ordnance burn chamber gas sensor" + chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_BURN + +/obj/machinery/air_sensor/ordnance_freezer_chamber + name = "ordnance freezer chamber gas sensor" + chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_FREEZER diff --git a/code/game/machinery/computer/atmos_computers/atmos_controls.dm b/code/game/machinery/computer/atmos_computers/atmos_controls.dm index 6aa45f7c234..bf386c83a1c 100644 --- a/code/game/machinery/computer/atmos_computers/atmos_controls.dm +++ b/code/game/machinery/computer/atmos_computers/atmos_controls.dm @@ -118,7 +118,10 @@ circuit = /obj/item/circuitboard/computer/atmos_control/nocontrol/incinerator atmos_chambers = list(ATMOS_GAS_MONITOR_INCINERATOR = "Incinerator Chamber") -/obj/machinery/computer/atmos_control/nocontrol/ordnancemix - name = "Ordnance Chamber Monitor" - circuit = /obj/item/circuitboard/computer/atmos_control/nocontrol/ordnancemix - atmos_chambers = list(ATMOS_GAS_MONITOR_ORDNANCE_LAB = "Ordnance Chamber") +/obj/machinery/computer/atmos_control/ordnancemix + name = "Ordnance Chamber Control" + circuit = /obj/item/circuitboard/computer/atmos_control/ordnancemix + atmos_chambers = list( + ATMOS_GAS_MONITOR_ORDNANCE_BURN = "Ordnance Burn Chamber", + ATMOS_GAS_MONITOR_ORDNANCE_FREEZER = "Ordnance Freezer Chamber", + ) diff --git a/code/game/machinery/computer/atmos_computers/inlets.dm b/code/game/machinery/computer/atmos_computers/inlets.dm index 934d128f1aa..4df5a9185f8 100644 --- a/code/game/machinery/computer/atmos_computers/inlets.dm +++ b/code/game/machinery/computer/atmos_computers/inlets.dm @@ -161,6 +161,12 @@ name = "incinerator chamber input injector" chamber_id = ATMOS_GAS_MONITOR_INCINERATOR -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_mixing_input - name = "ordnance mixing input injector" - chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_LAB +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input + on = FALSE + name = "ordnance burn chamber input injector" + chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_BURN + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input + on = FALSE + name = "ordnance freezer chamber input injector" + chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_FREEZER diff --git a/code/game/machinery/computer/atmos_computers/outlets.dm b/code/game/machinery/computer/atmos_computers/outlets.dm index 5b7dac9a176..c20a431dacc 100644 --- a/code/game/machinery/computer/atmos_computers/outlets.dm +++ b/code/game/machinery/computer/atmos_computers/outlets.dm @@ -120,9 +120,13 @@ name = "incinerator chamber output inlet" chamber_id = ATMOS_GAS_MONITOR_INCINERATOR -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/ordnance_mixing_output - name = "ordnance mixing output inlet" - chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_LAB +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/ordnance_burn_chamber_output + name = "ordnance burn chamber output inlet" + chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_BURN + +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/ordnance_freezer_chamber_output + name = "ordnance freezer chamber output inlet" + chamber_id = ATMOS_GAS_MONITOR_ORDNANCE_FREEZER /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored frequency = FREQ_ATMOS_STORAGE diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index b5c42240abc..e92fc690b87 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -56,9 +56,9 @@ name = "Incinerator Chamber Monitor (Computer Board)" build_path = /obj/machinery/computer/atmos_control/nocontrol/incinerator -/obj/item/circuitboard/computer/atmos_control/nocontrol/ordnancemix - name = "Ordnance Chamber Monitor (Computer Board)" - build_path = /obj/machinery/computer/atmos_control/nocontrol/ordnancemix +/obj/item/circuitboard/computer/atmos_control/ordnancemix + name = "Ordnance Chamber Control (Computer Board)" + build_path = /obj/machinery/computer/atmos_control/ordnancemix /obj/item/circuitboard/computer/atmos_control/oxygen_tank name = "Oxygen Supply Control (Computer Board)" diff --git a/code/game/turfs/open/dirtystation.dm b/code/game/turfs/open/dirtystation.dm index c0094837405..63d25fefb87 100644 --- a/code/game/turfs/open/dirtystation.dm +++ b/code/game/turfs/open/dirtystation.dm @@ -25,7 +25,6 @@ //high dirt - 1/3 chance. var/static/list/high_dirt_areas = typecacheof(list( - /area/station/science/test_area, /area/mine/production, /area/mine/living_quarters, /area/station/commons/vacant_room/office, diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 7f1da58359a..0d27ae74468 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -284,7 +284,7 @@ var/list/areas_with_intercom = list() var/list/areas_with_camera = list() var/static/list/station_areas_blacklist = typecacheof(list(/area/station/holodeck/rec_center, /area/shuttle, /area/station/engineering/supermatter, - /area/station/science/test_area, /area/space, /area/station/solars, /area/mine, /area/ruin, /area/centcom/asteroid)) + /area/space, /area/station/solars, /area/mine, /area/ruin, /area/centcom/asteroid)) if(SSticker.current_state == GAME_STATE_STARTUP) to_chat(usr, "Game still loading, please hold!", confidential = TRUE) diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm index 0d18709e9e0..e695fa4f177 100644 --- a/code/modules/events/anomaly.dm +++ b/code/modules/events/anomaly.dm @@ -24,7 +24,6 @@ /area/station/holodeck, /area/shuttle, /area/station/maintenance, - /area/station/science/test_area, )) //Subtypes from the above that actually should explode. diff --git a/code/modules/modular_computers/hardware/program_disks.dm b/code/modules/modular_computers/hardware/program_disks.dm index bc7776af9d0..63f10a9d2ca 100644 --- a/code/modules/modular_computers/hardware/program_disks.dm +++ b/code/modules/modular_computers/hardware/program_disks.dm @@ -128,6 +128,15 @@ . = ..() store_file(new /datum/computer_file/program/signal_commander(src)) +/obj/item/computer_hardware/hard_drive/portable/scipaper_program + name = "NT Frontier data disk" + desc = "Data disk containing NT Frontier. Simply insert to a computer and open File Manager!" + icon_state = "datadisk5" + +/obj/item/computer_hardware/hard_drive/portable/scipaper_program/install_default_programs() + . = ..() + store_file(new /datum/computer_file/program/scipaper_program(src)) + /** * Engineering */ diff --git a/icons/area/areas_station.dmi b/icons/area/areas_station.dmi index 68d19905302..a359ebdcf01 100644 Binary files a/icons/area/areas_station.dmi and b/icons/area/areas_station.dmi differ