From 3e1e24f6a0fcec3b4af9fa085a463e9252c4917d Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sun, 20 Feb 2022 22:47:44 -0500 Subject: [PATCH 1/9] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 641 +++++++++++------- 1 file changed, 378 insertions(+), 263 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index e9fec9bb24..212feeeccc 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -16206,6 +16206,9 @@ /obj/structure/cable/white{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "azq" = ( @@ -16213,14 +16216,17 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "azr" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/supply/visible{ + dir = 1 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -19245,11 +19251,6 @@ name = "Station Intercom"; pixel_x = -26 }, -/obj/machinery/camera{ - c_tag = "Engineering Secure Storage"; - dir = 4; - network = list("ss13","engine") - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -21268,7 +21269,7 @@ "aHg" = ( /obj/machinery/camera{ c_tag = "Gravity Generator Room"; - dir = 8; + dir = 6; network = list("ss13","engine") }, /obj/effect/turf_decal/bot_white/left, @@ -21461,15 +21462,13 @@ /obj/structure/cable/white{ icon_state = "2-8" }, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/vending/wardrobe/engi_wardrobe, /turf/open/floor/engine, /area/engineering/main) "aHv" = ( @@ -23360,10 +23359,6 @@ /area/solars/port/aft) "aKs" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Gravity Generator Chamber"; - req_access_txt = "19; 61" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -23379,6 +23374,10 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Gravity Generator"; + req_access_txt = "11" + }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aKt" = ( @@ -24809,10 +24808,6 @@ /area/tcommsat/server) "aML" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Telecomms Control Room"; - req_access_txt = "19; 61" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -24820,6 +24815,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/airlock/engineering{ + name = "Telecommunications"; + req_access_txt = "61" + }, /turf/open/floor/plasteel, /area/tcommsat/server) "aMM" = ( @@ -27271,10 +27270,6 @@ icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/command{ - name = "Telecomms Server Room"; - req_access_txt = "61" - }, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -27282,6 +27277,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room"; + req_access_txt = "61" + }, /turf/open/floor/plasteel/grimy, /area/tcommsat/server) "aQI" = ( @@ -28313,10 +28312,6 @@ }, /area/maintenance/port/aft) "aSM" = ( -/obj/machinery/door/airlock/command{ - name = "Telecomms Server Room"; - req_access_txt = "61" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -28337,6 +28332,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room"; + req_access_txt = "61" + }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) "aSN" = ( @@ -28354,7 +28353,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/vending/wardrobe/engi_wardrobe, +/obj/structure/sign/warning/vacuum/external{ + pixel_x = -32 + }, /turf/open/floor/engine, /area/engineering/main) "aSQ" = ( @@ -28669,15 +28670,13 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "aTv" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation Room"; + req_access_txt = "39" }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 }, /turf/open/floor/plasteel/freezer, /area/medical/virology) @@ -28960,10 +28959,12 @@ /turf/open/floor/plasteel/dark, /area/maintenance/port/aft) "aTW" = ( -/obj/structure/bed, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plasteel/freezer, /area/medical/virology) "aTX" = ( @@ -31103,10 +31104,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, /turf/open/floor/plasteel, /area/medical/virology) "aXE" = ( @@ -32302,13 +32299,12 @@ /turf/open/floor/plasteel/dark, /area/medical/chemistry) "aZB" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/airlock/virology/glass{ - name = "Isolation Room"; - req_access_txt = "39" +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/plasteel, /area/medical/virology) "aZC" = ( /obj/structure/table/wood, @@ -36708,37 +36704,10 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/obj/machinery/camera{ - c_tag = "Xenobiology Central"; - dir = 4; - network = list("ss13","rd"); - pixel_y = -5 - }, /turf/open/floor/plasteel, /area/science/xenobiology) "bgd" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/beakers{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/syringes, -/obj/item/extinguisher/mini, -/obj/machinery/airalarm/unlocked{ - dir = 4; - pixel_x = -23 - }, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology Lab"; - dir = 4; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, +/obj/structure/closet/l3closet/scientist, /turf/open/floor/plasteel, /area/science/xenobiology) "bge" = ( @@ -36776,21 +36745,14 @@ }, /area/hallway/primary/aft) "bgg" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/machinery/camera{ - c_tag = "Xenobiology South"; - dir = 1; - network = list("ss13","rd") +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bgh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -38042,10 +38004,6 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/entry) "biD" = ( -/obj/machinery/shower{ - dir = 8; - name = "emergency shower" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/white{ icon_state = "1-2" @@ -38053,6 +38011,12 @@ /obj/effect/turf_decal/stripes/end{ dir = 4 }, +/obj/machinery/camera{ + c_tag = "Xenobiology Central"; + dir = 8; + network = list("ss13","rd"); + pixel_y = -5 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "biF" = ( @@ -38478,15 +38442,13 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "bjr" = ( -/obj/machinery/holopad, /obj/structure/cable/white{ icon_state = "1-2" }, /obj/structure/cable/white{ icon_state = "1-8" }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bjs" = ( /obj/effect/turf_decal/tile/purple{ @@ -38608,51 +38570,38 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bjD" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bjE" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/scientist, /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/bot, +/obj/machinery/holopad, +/turf/open/floor/plasteel, /area/science/xenobiology) "bjF" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bjG" = ( -/obj/structure/closet/l3closet/scientist, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bjH" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/effect/turf_decal/stripes/end{ + dir = 8 }, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -38708,67 +38657,33 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bjR" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 1 - }, -/obj/machinery/light, -/obj/machinery/requests_console{ - department = "Xenobiology Lab"; - name = "Xenobiology RC"; - pixel_y = -32; - receive_ore_updates = 1 - }, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/scientist, /obj/structure/cable/white{ - icon_state = "1-4" + icon_state = "1-2" }, -/turf/open/floor/circuit/green, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bjS" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bjT" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - pixel_y = 5 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/machinery/power/apc{ - areastring = "/area/science/xenobiology"; - dir = 4; - name = "Xenobiology Lab APC"; - pixel_x = 24 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = -24 - }, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_y = -24 - }, -/obj/structure/cable/white{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "bjU" = ( /obj/machinery/status_display{ @@ -39196,7 +39111,6 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/main) "blF" = ( -/obj/structure/fans/tiny, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/service/chapel/main) @@ -39209,12 +39123,6 @@ dir = 8 }, /obj/machinery/light/small, -/obj/machinery/button/massdriver{ - id = "chapelmassdoor"; - name = "mass driver blast door button"; - pixel_x = 24; - pixel_y = -8 - }, /obj/machinery/button/massdriver{ id = "chapelgun"; pixel_x = 24; @@ -39236,11 +39144,11 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/main) "blI" = ( +/obj/structure/fans/tiny, /obj/machinery/door/poddoor{ - id = "chapelmassdoor"; + id = "chapelgun"; name = "Chapel Launcher Door" }, -/obj/structure/fans/tiny, /turf/open/floor/plating, /area/service/chapel/main) "blJ" = ( @@ -40476,13 +40384,13 @@ /turf/open/floor/plasteel, /area/science/mixing) "chJ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/bot, /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -40745,7 +40653,7 @@ /area/engineering/atmos) "dMl" = ( /obj/structure/sign/warning/fire, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, /turf/closed/wall/r_wall, @@ -40786,6 +40694,15 @@ dir = 4 }, /area/maintenance/starboard/aft) +"dSV" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) "dXv" = ( /obj/item/transfer_valve{ pixel_x = -5 @@ -41046,7 +40963,6 @@ /turf/open/floor/plasteel, /area/science/mixing) "fbH" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/decal/cleanable/dirt, /obj/structure/fireaxecabinet{ pixel_x = -30 @@ -41054,6 +40970,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -41173,6 +41090,12 @@ icon_state = "wood-broken" }, /area/maintenance/starboard/aft) +"fpy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) "fpH" = ( /obj/item/seeds/harebell, /turf/open/space/basic, @@ -41362,6 +41285,13 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"ggJ" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) "ghr" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line, @@ -41516,13 +41446,18 @@ }, /turf/open/floor/plasteel, /area/command/gateway) +"gRg" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) "gSu" = ( /turf/open/floor/plasteel/yellowsiding{ dir = 8 }, /area/maintenance/starboard/aft) "gSv" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -41536,6 +41471,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark, /area/engineering/atmos) "gVX" = ( @@ -41630,6 +41566,10 @@ }, /turf/closed/wall/r_wall/rust, /area/engineering/atmos) +"hvX" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "hyX" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 @@ -41874,9 +41814,6 @@ }, /area/maintenance/starboard/aft) "ixk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 5 }, @@ -42152,8 +42089,7 @@ /turf/open/floor/engine, /area/science/mixing) "jtZ" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/plasteel, @@ -42436,6 +42372,33 @@ dir = 4 }, /area/maintenance/starboard/aft) +"kui" = ( +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/machinery/power/apc{ + areastring = "/area/science/xenobiology"; + dir = 4; + name = "Xenobiology Lab APC"; + pixel_x = 24 + }, +/obj/machinery/light_switch{ + pixel_x = 24; + pixel_y = -24 + }, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_y = -24 + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "kwF" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -42477,13 +42440,13 @@ /turf/open/floor/plasteel, /area/science/mixing) "kCU" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/meter/atmos, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "kFf" = ( @@ -42638,12 +42601,12 @@ /turf/open/floor/grass, /area/hallway/secondary/entry) "lvw" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/decal/cleanable/dirt, /obj/machinery/meter/atmos, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -42862,12 +42825,12 @@ /area/science/mixing) "msJ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "mvB" = ( @@ -42928,7 +42891,7 @@ "mTT" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; - name = "Port to Fuel Pipe" + name = "Port to Incinerator" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43026,6 +42989,26 @@ }, /turf/open/pool, /area/maintenance/starboard/aft) +"nkN" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5 + }, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "nqr" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -43123,6 +43106,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/solars/port/aft) +"nRu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/bed{ + dir = 1 + }, +/obj/machinery/airalarm{ + pixel_y = 22 + }, +/turf/open/floor/plasteel/freezer, +/area/medical/virology) "nTg" = ( /obj/item/assembly/timer{ pixel_x = 5; @@ -43156,6 +43151,23 @@ /obj/machinery/pool/drain, /turf/open/pool, /area/maintenance/starboard/aft) +"nYJ" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Xenobiology South"; + dir = 1; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "oaV" = ( /obj/structure/grille, /obj/machinery/meter, @@ -43174,6 +43186,12 @@ }, /turf/open/floor/plating, /area/science/mixing) +"ohz" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/medical/virology) "ohM" = ( /obj/machinery/door/poddoor{ id = "toxinsdriver"; @@ -43476,6 +43494,10 @@ pixel_y = 6; req_access_txt = "55" }, +/obj/machinery/shower{ + dir = 8; + name = "emergency shower" + }, /turf/open/floor/plasteel, /area/science/xenobiology) "pmx" = ( @@ -43539,7 +43561,6 @@ /area/maintenance/starboard/aft) "pvX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, @@ -43559,6 +43580,7 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/checker, /area/engineering/atmos) "pAN" = ( @@ -43571,6 +43593,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/mixing) +"pCA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "pEt" = ( /obj/machinery/power/apc{ areastring = "/area/hallway/primary/starboard/fore"; @@ -43733,8 +43761,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/item/broken_bottle, -/obj/item/pickaxe, +/obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/engineering/atmos) "qeO" = ( @@ -43796,6 +43823,12 @@ icon_state = "panelscorched" }, /area/engineering/atmos) +"qro" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/medical/virology) "qsc" = ( /obj/machinery/air_sensor/atmos/air_tank, /turf/open/floor/engine/air, @@ -43826,6 +43859,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engineering/atmos) +"qEo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) "qFj" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -43891,12 +43930,12 @@ /turf/open/floor/wood, /area/service/lawoffice) "qTa" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "qUQ" = ( @@ -43963,6 +44002,17 @@ icon_state = "wood-broken5" }, /area/maintenance/starboard/aft) +"rtb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/warning/deathsposal{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/medical/virology) "rwH" = ( /turf/closed/wall/mineral/titanium, /area/asteroid/nearstation) @@ -44072,6 +44122,14 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"seq" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/warning/deathsposal{ + pixel_x = 30 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "sjr" = ( /obj/item/reagent_containers/food/snacks/grown/wheat, /turf/open/space/basic, @@ -44101,6 +44159,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"spl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/space/nearstation) "spw" = ( /obj/machinery/computer/bank_machine, /turf/open/floor/circuit/green, @@ -44132,6 +44197,22 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input, /turf/open/floor/engine/n2o, /area/engineering/atmos) +"svq" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/requests_console{ + department = "Xenobiology Lab"; + name = "Xenobiology RC"; + pixel_y = -32; + receive_ore_updates = 1 + }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/turf/open/floor/circuit/green, +/area/science/xenobiology) "svX" = ( /obj/structure/sign/warning/fire{ pixel_y = -32 @@ -46836,12 +46917,12 @@ /area/engineering/atmos) "tdN" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "tfP" = ( @@ -46902,7 +46983,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "ttA" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/bot, /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, @@ -46912,6 +46992,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -46936,6 +47017,15 @@ icon_state = "wood-broken6" }, /area/maintenance/starboard/aft) +"txO" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/medical/virology) "tFk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -47041,9 +47131,6 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "ueG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 6 - }, /obj/machinery/light{ dir = 8 }, @@ -47054,6 +47141,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 6 + }, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -47220,6 +47310,8 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/item/broken_bottle, +/obj/item/pickaxe, /turf/open/floor/plating, /area/engineering/atmos) "uCY" = ( @@ -47539,7 +47631,6 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "vJt" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/bot, /obj/machinery/space_heater, /obj/machinery/light{ @@ -47553,6 +47644,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -47864,11 +47956,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, @@ -47908,18 +48000,38 @@ id = "incineratorturbine" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 9 - }, /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 9 + }, /turf/open/floor/plasteel/checker, /area/maintenance/disposal/incinerator) "xwu" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/break_room) +"xym" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/beakers{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/syringes, +/obj/item/extinguisher/mini, +/obj/machinery/airalarm/unlocked{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "xyo" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/decal/cleanable/dirt, @@ -47997,12 +48109,11 @@ /turf/closed/wall/r_wall, /area/engineering/atmos) "xKp" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance"; - req_access_txt = "10" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/turf/open/floor/plating, -/area/engineering/gravity_generator) +/turf/open/floor/plasteel, +/area/engineering/atmos) "xMv" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ @@ -48138,6 +48249,11 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port/aft) +"yfi" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/asteroid/nearstation) "ygB" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Gateway Maintenance Hatch"; @@ -48169,14 +48285,13 @@ /turf/open/floor/plasteel, /area/service/bar/atrium) "yhg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/door/airlock/external{ + name = "Engineering External Access"; + req_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/engineering/main) "yin" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -75304,7 +75419,7 @@ aCF qTa oJp hUG -yhg +hUG hUG hUG ueC @@ -75561,7 +75676,7 @@ jpv msJ rjQ rjQ -jtZ +rjQ rjQ bGL vuN @@ -76085,7 +76200,7 @@ xyo hNO bOy uBJ -xKp +aGe aId aIc aJi @@ -78154,8 +78269,8 @@ aPI bwV aRF aSP -aEt -bvo +yhg +yfi aad bvo aad @@ -80190,7 +80305,7 @@ qui awJ axo ayi -diG +jtZ oGc awF aCA @@ -80488,9 +80603,9 @@ aSe aSJ aTm aLw -aaa -aaa -aaa +dSV +aad +aad aaa aaa aaa @@ -80704,7 +80819,7 @@ aqz aqz axq cBf -diG +xKp aAr aBy aCD @@ -80744,6 +80859,8 @@ aKV aTk aSK aYE +ohz +qro aKV aad aaa @@ -80761,8 +80878,6 @@ aaa aaa aaa aaa -aaa -aaa jFP jFP jFP @@ -81000,10 +81115,10 @@ aVG aKV aTl aXD -aKV -aKV -aKV -aKV +rtb +txO +nRu +aLw aaa aaa aaa @@ -91288,10 +91403,10 @@ aae aaa aaa aaa -aaa -aaa -aaa -aaa +aac +aac +aac +aac aaa aaa aaa @@ -91547,9 +91662,9 @@ bjc bfP bfP aad -aaa -aaa -aaa +ggJ +aac +aac aaa aaa aaa @@ -91804,8 +91919,8 @@ bgY bgm bfP aad -aac -aac +fpy +aKo aad aad aaa @@ -92061,7 +92176,7 @@ bgZ bhM sKZ aad -aac +spl aad aad aad @@ -92318,7 +92433,7 @@ exb bhN bfP bfP -aad +qEo aad aad aad @@ -92574,8 +92689,8 @@ jdD bhb bhO bgd -bfP -aad +xym +pCA aad aad aad @@ -92831,8 +92946,8 @@ bhP bjq bjD bgg -bfP -aad +nYJ +pCA aad aad aad @@ -93088,8 +93203,8 @@ biY bjr bjE bjR -bfP -aad +svq +pCA aad aad aad @@ -93345,8 +93460,8 @@ biZ bjs bjF bjS -bfP -aad +nkN +pCA aad aad aad @@ -93602,8 +93717,8 @@ bja bjt bjG bjT -bfP -aad +kui +pCA aad aad aad @@ -93858,9 +93973,9 @@ xFw bjb bju bjH -bfP -sKZ -aad +seq +hvX +gRg aad aad aad @@ -94116,7 +94231,7 @@ bjc bjv bjc bfP -aad +bfP aad aad aad From 11bfc18714a969533c8390561ee6463f0ec9fee2 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sun, 20 Feb 2022 22:57:59 -0500 Subject: [PATCH 2/9] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 527 +++++++++--------- 1 file changed, 258 insertions(+), 269 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 212feeeccc..6693ed5aad 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -9230,7 +9230,7 @@ /obj/structure/table/wood, /obj/structure/window/reinforced/spawner/west, /obj/item/folder/blue, -/turf/open/floor/carpet/green/airless, +/turf/open/floor/carpet/green, /area/service/lawoffice) "aoE" = ( /obj/machinery/airalarm{ @@ -18299,10 +18299,6 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/machinery/camera{ - c_tag = "Central Hallway East"; - dir = 4 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -19535,6 +19531,10 @@ pixel_x = 24 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/camera{ + c_tag = "Central Hallway West"; + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "aEK" = ( @@ -20345,10 +20345,6 @@ pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/camera{ - c_tag = "Central Hallway West"; - dir = 8 - }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/port) @@ -40327,6 +40323,10 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall, /area/command/gateway) +"bRW" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "bVs" = ( /obj/structure/girder, /obj/effect/turf_decal/sand/plating, @@ -40367,6 +40367,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"cfq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/space/nearstation) "cfz" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/stripes/line{ @@ -40484,6 +40491,12 @@ /obj/machinery/pool/controller, /turf/open/floor/wood, /area/maintenance/starboard/aft) +"cLO" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/medical/virology) "cRz" = ( /obj/machinery/button/door{ id = "supplybridge"; @@ -40630,6 +40643,14 @@ /obj/structure/sink/puddle, /turf/open/floor/plating/asteroid, /area/maintenance/port/aft) +"dxC" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/warning/deathsposal{ + pixel_x = 30 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "dFV" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -40694,15 +40715,6 @@ dir = 4 }, /area/maintenance/starboard/aft) -"dSV" = ( -/obj/structure/disposaloutlet{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/plating, -/area/space/nearstation) "dXv" = ( /obj/item/transfer_valve{ pixel_x = -5 @@ -41016,6 +41028,13 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/asteroid/nearstation) +"fji" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) "fjs" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -41070,7 +41089,7 @@ /obj/structure/window/reinforced/spawner/west, /obj/item/flashlight/lamp/green, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/carpet/green/airless, +/turf/open/floor/carpet/green, /area/service/lawoffice) "fnp" = ( /obj/machinery/air_sensor/atmos/nitrous_tank, @@ -41090,12 +41109,6 @@ icon_state = "wood-broken" }, /area/maintenance/starboard/aft) -"fpy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/space/nearstation) "fpH" = ( /obj/item/seeds/harebell, /turf/open/space/basic, @@ -41285,18 +41298,38 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) -"ggJ" = ( -/obj/structure/disposaloutlet, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/plating, -/area/space/nearstation) "ghr" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/port/aft) +"gia" = ( +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/machinery/power/apc{ + areastring = "/area/science/xenobiology"; + dir = 4; + name = "Xenobiology Lab APC"; + pixel_x = 24 + }, +/obj/machinery/light_switch{ + pixel_x = 24; + pixel_y = -24 + }, +/obj/item/radio/intercom{ + name = "Station Intercom"; + pixel_y = -24 + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "gii" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -41446,12 +41479,6 @@ }, /turf/open/floor/plasteel, /area/command/gateway) -"gRg" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/closed/wall/r_wall/rust, -/area/science/xenobiology) "gSu" = ( /turf/open/floor/plasteel/yellowsiding{ dir = 8 @@ -41514,6 +41541,12 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"hfm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) "hhM" = ( /turf/closed/mineral/random/labormineral, /area/science/test_area) @@ -41566,10 +41599,12 @@ }, /turf/closed/wall/r_wall/rust, /area/engineering/atmos) -"hvX" = ( -/obj/structure/disposalpipe/segment, +"hvC" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/closed/wall/r_wall, -/area/science/xenobiology) +/area/medical/virology) "hyX" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 @@ -41954,7 +41989,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/turf/open/floor/carpet/green/airless, +/turf/open/floor/carpet/green, /area/service/lawoffice) "iZQ" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input, @@ -42065,6 +42100,12 @@ dir = 1 }, /area/engineering/atmos) +"jpG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) "jqM" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -42335,6 +42376,18 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"koJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/bed{ + dir = 1 + }, +/obj/machinery/airalarm{ + pixel_y = 22 + }, +/turf/open/floor/plasteel/freezer, +/area/medical/virology) "koL" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -42372,33 +42425,6 @@ dir = 4 }, /area/maintenance/starboard/aft) -"kui" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, -/obj/machinery/power/apc{ - areastring = "/area/science/xenobiology"; - dir = 4; - name = "Xenobiology Lab APC"; - pixel_x = 24 - }, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = -24 - }, -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_y = -24 - }, -/obj/structure/cable/white{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "kwF" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -42816,6 +42842,12 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"mrI" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/closed/wall/r_wall/rust, +/area/science/xenobiology) "msl" = ( /turf/closed/wall/rust, /area/command/gateway) @@ -42989,26 +43021,6 @@ }, /turf/open/pool, /area/maintenance/starboard/aft) -"nkN" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/stack/sheet/mineral/plasma{ - amount = 5 - }, -/obj/item/reagent_containers/glass/beaker/large, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/structure/cable/white{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "nqr" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -43106,18 +43118,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"nRu" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/bed{ - dir = 1 - }, -/obj/machinery/airalarm{ - pixel_y = 22 - }, -/turf/open/floor/plasteel/freezer, -/area/medical/virology) "nTg" = ( /obj/item/assembly/timer{ pixel_x = 5; @@ -43146,28 +43146,11 @@ icon_state = "0-4" }, /turf/open/floor/plasteel/dark/corner, -/area/engineering/atmos) +/area/maintenance/disposal/incinerator) "nXb" = ( /obj/machinery/pool/drain, /turf/open/pool, /area/maintenance/starboard/aft) -"nYJ" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology South"; - dir = 1; - network = list("ss13","rd") - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "oaV" = ( /obj/structure/grille, /obj/machinery/meter, @@ -43186,12 +43169,6 @@ }, /turf/open/floor/plating, /area/science/mixing) -"ohz" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/closed/wall/r_wall, -/area/medical/virology) "ohM" = ( /obj/machinery/door/poddoor{ id = "toxinsdriver"; @@ -43593,12 +43570,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/mixing) -"pCA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/science/xenobiology) "pEt" = ( /obj/machinery/power/apc{ areastring = "/area/hallway/primary/starboard/fore"; @@ -43823,12 +43794,6 @@ icon_state = "panelscorched" }, /area/engineering/atmos) -"qro" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/medical/virology) "qsc" = ( /obj/machinery/air_sensor/atmos/air_tank, /turf/open/floor/engine/air, @@ -43859,12 +43824,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engineering/atmos) -"qEo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/closed/wall/r_wall/rust, -/area/science/xenobiology) "qFj" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -44002,17 +43961,6 @@ icon_state = "wood-broken5" }, /area/maintenance/starboard/aft) -"rtb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/structure/sign/warning/deathsposal{ - pixel_y = -32 - }, -/turf/open/floor/plasteel, -/area/medical/virology) "rwH" = ( /turf/closed/wall/mineral/titanium, /area/asteroid/nearstation) @@ -44122,14 +44070,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"seq" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/structure/sign/warning/deathsposal{ - pixel_x = 30 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "sjr" = ( /obj/item/reagent_containers/food/snacks/grown/wheat, /turf/open/space/basic, @@ -44147,6 +44087,12 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/command/gateway) +"snF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "soC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -44159,13 +44105,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"spl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/girder/reinforced, -/turf/open/floor/plating, -/area/space/nearstation) "spw" = ( /obj/machinery/computer/bank_machine, /turf/open/floor/circuit/green, @@ -44197,22 +44136,6 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input, /turf/open/floor/engine/n2o, /area/engineering/atmos) -"svq" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 1 - }, -/obj/machinery/light, -/obj/machinery/requests_console{ - department = "Xenobiology Lab"; - name = "Xenobiology RC"; - pixel_y = -32; - receive_ore_updates = 1 - }, -/obj/structure/cable/white{ - icon_state = "1-4" - }, -/turf/open/floor/circuit/green, -/area/science/xenobiology) "svX" = ( /obj/structure/sign/warning/fire{ pixel_y = -32 @@ -44319,7 +44242,7 @@ name = "Lawyer RC"; pixel_y = -30 }, -/turf/open/floor/carpet/green/airless, +/turf/open/floor/carpet/green, /area/service/lawoffice) "syT" = ( /turf/closed/wall/r_wall/rust, @@ -47017,15 +46940,6 @@ icon_state = "wood-broken6" }, /area/maintenance/starboard/aft) -"txO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/medical/virology) "tFk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -47077,6 +46991,26 @@ }, /turf/open/floor/plasteel/dark, /area/service/library) +"uac" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/beakers{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/syringes, +/obj/item/extinguisher/mini, +/obj/machinery/airalarm/unlocked{ + dir = 4; + pixel_x = -23 + }, +/obj/machinery/newscaster{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "ucd" = ( /obj/machinery/door/airlock/research{ name = "Toxins Storage"; @@ -47088,23 +47022,28 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/turf/open/floor/plasteel, +/area/engineering/atmos) +"udG" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5 + }, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/machinery/status_display{ + pixel_y = -32 + }, /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Security Checkpoint"; - dir = 10 - }, -/turf/open/floor/plasteel{ - heat_capacity = 1e+006 - }, -/area/hallway/primary/aft) +/turf/open/floor/plasteel, +/area/science/xenobiology) "udT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/power/apc{ @@ -47187,6 +47126,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output, /turf/open/floor/engine/n2o, /area/engineering/atmos) +"ukp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/medical/virology) "uok" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 8 @@ -47390,6 +47338,22 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/atmos) +"uTb" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/requests_console{ + department = "Xenobiology Lab"; + name = "Xenobiology RC"; + pixel_y = -32; + receive_ore_updates = 1 + }, +/obj/structure/cable/white{ + icon_state = "1-4" + }, +/turf/open/floor/circuit/green, +/area/science/xenobiology) "uTF" = ( /obj/machinery/door/window/southleft{ name = "Mass Driver Door"; @@ -47586,6 +47550,26 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"vuZ" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) +"vvD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/structure/sign/warning/deathsposal{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/medical/virology) "vxf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -47939,6 +47923,37 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"xjj" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Security Checkpoint"; + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/aft) +"xoR" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Xenobiology South"; + dir = 1; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "xpX" = ( /obj/structure/toilet{ dir = 8 @@ -48012,26 +48027,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/break_room) -"xym" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/beakers{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/syringes, -/obj/item/extinguisher/mini, -/obj/machinery/airalarm/unlocked{ - dir = 4; - pixel_x = -23 - }, -/obj/machinery/newscaster{ - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) "xyo" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/effect/decal/cleanable/dirt, @@ -48109,11 +48104,13 @@ /turf/closed/wall/r_wall, /area/engineering/atmos) "xKp" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/door/airlock/external{ + name = "Engineering External Access"; + req_access_txt = "10;13" }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/engineering/main) "xMv" = ( /obj/structure/lattice, /obj/structure/fluff/broken_flooring{ @@ -48249,11 +48246,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port/aft) -"yfi" = ( -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/asteroid/nearstation) "ygB" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Gateway Maintenance Hatch"; @@ -48285,13 +48277,10 @@ /turf/open/floor/plasteel, /area/service/bar/atrium) "yhg" = ( -/obj/machinery/door/airlock/external{ - name = "Engineering External Access"; - req_access_txt = "10;13" +/turf/open/floor/plating{ + icon_state = "panelscorched" }, -/obj/structure/fans/tiny, -/turf/open/floor/plating, -/area/engineering/main) +/area/asteroid/nearstation) "yin" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -78269,8 +78258,8 @@ aPI bwV aRF aSP +xKp yhg -yfi aad bvo aad @@ -80603,7 +80592,7 @@ aSe aSJ aTm aLw -dSV +vuZ aad aad aaa @@ -80819,7 +80808,7 @@ aqz aqz axq cBf -xKp +ucu aAr aBy aCD @@ -80859,8 +80848,8 @@ aKV aTk aSK aYE -ohz -qro +cLO +hvC aKV aad aaa @@ -81115,9 +81104,9 @@ aVG aKV aTl aXD -rtb -txO -nRu +vvD +ukp +koJ aLw aaa aaa @@ -89840,7 +89829,7 @@ aUy aWQ tWh aYc -ucu +iey sKB baI bby @@ -90610,7 +90599,7 @@ aVr aUz aWT fgG -aYc +xjj aYW bys byo @@ -91662,7 +91651,7 @@ bjc bfP bfP aad -ggJ +fji aac aac aaa @@ -91919,7 +91908,7 @@ bgY bgm bfP aad -fpy +jpG aKo aad aad @@ -92176,7 +92165,7 @@ bgZ bhM sKZ aad -spl +cfq aad aad aad @@ -92433,7 +92422,7 @@ exb bhN bfP bfP -qEo +hfm aad aad aad @@ -92689,8 +92678,8 @@ jdD bhb bhO bgd -xym -pCA +uac +snF aad aad aad @@ -92946,8 +92935,8 @@ bhP bjq bjD bgg -nYJ -pCA +xoR +snF aad aad aad @@ -93203,8 +93192,8 @@ biY bjr bjE bjR -svq -pCA +uTb +snF aad aad aad @@ -93460,8 +93449,8 @@ biZ bjs bjF bjS -nkN -pCA +udG +snF aad aad aad @@ -93717,8 +93706,8 @@ bja bjt bjG bjT -kui -pCA +gia +snF aad aad aad @@ -93973,9 +93962,9 @@ xFw bjb bju bjH -seq -hvX -gRg +dxC +bRW +mrI aad aad aad From a127b495993bd1dc0553704440c881e7e910687b Mon Sep 17 00:00:00 2001 From: TripleShades Date: Sun, 20 Feb 2022 23:14:20 -0500 Subject: [PATCH 3/9] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 6693ed5aad..32f864809b 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -41623,6 +41623,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/portable_atmospherics/pump, /turf/open/floor/plasteel, /area/science/mixing) "hDi" = ( @@ -42559,6 +42560,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/maintenance/starboard/aft) +"kWQ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plasteel, +/area/science/mixing) "kYh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -98310,7 +98319,7 @@ bdI bdM bft ajP -mhf +kWQ kCG ybw vGQ From 85569cc9a8cd5116b7abf99221854557b47e8964 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Mon, 21 Feb 2022 15:12:37 -0500 Subject: [PATCH 4/9] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 32f864809b..bf0a0cb141 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -34229,6 +34229,7 @@ /area/science/robotics/lab) "bcA" = ( /obj/effect/turf_decal/stripes/line, +/obj/machinery/rnd/production/circuit_imprinter, /turf/open/floor/plasteel, /area/science/robotics/lab) "bcB" = ( From f2c14bcaf269dedd8fdb7ef097173c32e3e2522a Mon Sep 17 00:00:00 2001 From: TripleShades Date: Tue, 22 Feb 2022 03:28:39 -0500 Subject: [PATCH 5/9] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index bf0a0cb141..0da36eb120 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -6155,6 +6155,9 @@ /turf/closed/wall/r_wall, /area/command/heads_quarters/cmo) "ajH" = ( +/obj/machinery/door/window/eastleft{ + req_access_txt = "48;50" + }, /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, From d96c703d88fe3ff670a45c131657529c5215b144 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Tue, 22 Feb 2022 23:21:00 -0500 Subject: [PATCH 6/9] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 571 +++++++++--------- 1 file changed, 301 insertions(+), 270 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 0da36eb120..ab56dbd057 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -20160,17 +20160,21 @@ /turf/open/floor/plasteel, /area/engineering/main) "aFB" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/airalarm{ - pixel_y = 24 - }, /obj/machinery/camera{ c_tag = "Starboard Bow Solar"; network = list("ss13","engine") }, +/obj/machinery/power/solar_control{ + id = "forestarboard"; + name = "Starboard Bow Solar Control" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "aFC" = ( @@ -24247,13 +24251,10 @@ /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aLL" = ( -/obj/effect/turf_decal/box, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/tracker, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solars/port/aft) +/obj/structure/grille, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "aLM" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -32801,7 +32802,6 @@ pixel_x = -32; pixel_y = 32 }, -/obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "4-8" }, @@ -32814,6 +32814,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/caution, /turf/open/floor/plasteel, /area/maintenance/solars/port/aft) "bal" = ( @@ -33361,13 +33362,13 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bbf" = ( -/obj/machinery/power/smes, /obj/machinery/camera{ c_tag = "Port Quarter Solar"; dir = 4; network = list("ss13","engine") }, -/obj/structure/cable{ +/obj/machinery/power/smes, +/obj/structure/cable/white{ icon_state = "0-4" }, /turf/open/floor/plating, @@ -33382,6 +33383,9 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bbi" = ( @@ -33392,10 +33396,7 @@ pixel_x = 24 }, /obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/structure/cable/white{ - icon_state = "0-2" + icon_state = "0-8" }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -33484,10 +33485,10 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable/white{ +/obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bbp" = ( @@ -33834,9 +33835,15 @@ /area/solars/starboard/fore) "bbR" = ( /obj/machinery/light/small, -/obj/structure/cable/white{ - icon_state = "1-8" +/obj/machinery/power/solar_control{ + dir = 8; + id = "aftport"; + name = "Port Quarter Solar Control" }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bbS" = ( @@ -33884,7 +33891,6 @@ /turf/open/floor/plating/airless, /area/solars/starboard/fore) "bbZ" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -33894,6 +33900,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/effect/turf_decal/caution, /turf/open/floor/plasteel, /area/maintenance/solars/starboard/fore) "bca" = ( @@ -33905,7 +33912,6 @@ dir = 8 }, /obj/effect/landmark/xeno_spawn, -/obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "4-8" }, @@ -34321,25 +34327,19 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcJ" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/box, -/obj/machinery/power/tracker, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solars/starboard/fore) +/obj/structure/lattice, +/obj/structure/grille, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "bcK" = ( -/obj/machinery/power/solar_control{ - id = "forestarboard"; - name = "Starboard Bow Solar Control" - }, -/obj/effect/turf_decal/bot, /obj/machinery/power/terminal{ dir = 4 }, /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcL" = ( @@ -34403,6 +34403,10 @@ /obj/structure/cable/white{ icon_state = "1-8" }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcS" = ( @@ -34892,14 +34896,11 @@ /turf/open/floor/plating/airless, /area/solars/starboard/fore) "bdC" = ( -/obj/machinery/power/solar_control{ - id = "aftport"; - name = "Port Quarter Solar Control" - }, -/obj/effect/turf_decal/bot, -/obj/structure/cable, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" + }, +/obj/structure/cable/white{ + icon_state = "4-8" }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -34929,17 +34930,17 @@ }, /area/command/heads_quarters/rd) "bdE" = ( -/obj/machinery/power/apc{ - areastring = "/area/maintenance/solars/starboard/fore"; - name = "Starboard Bow Solar APC"; - pixel_y = -26 - }, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/structure/cable/white{ icon_state = "0-8" }, +/obj/machinery/power/apc{ + areastring = "/area/maintenance/solars/starboard/fore"; + name = "Starboard Bow Solar APC"; + pixel_y = -26 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bdF" = ( @@ -34966,7 +34967,7 @@ dir = 1; pixel_y = -22 }, -/obj/structure/cable/white{ +/obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plating, @@ -36811,8 +36812,11 @@ /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "bgk" = ( -/obj/structure/cable/white{ - icon_state = "4-8" +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -40903,6 +40907,10 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) +"eDE" = ( +/obj/effect/landmark/carpspawn, +/turf/open/space/basic, +/area/space/station_ruins) "eOg" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -47275,6 +47283,14 @@ /obj/item/pickaxe, /turf/open/floor/plating, /area/engineering/atmos) +"uBW" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/box, +/obj/machinery/power/tracker, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solars/starboard/fore) "uCY" = ( /turf/open/pool, /area/maintenance/starboard/aft) @@ -47653,6 +47669,14 @@ "vMb" = ( /turf/open/floor/engine/n2o, /area/engineering/atmos) +"vPH" = ( +/obj/effect/turf_decal/box, +/obj/machinery/power/tracker, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solars/port/aft) "vPZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -47781,6 +47805,13 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"wle" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/space/basic, +/area/solars/starboard/fore) "wqL" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 @@ -71075,7 +71106,7 @@ jFP jFP jFP jFP -jFP +eDE jFP jFP jFP @@ -71587,23 +71618,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -71844,23 +71875,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -72101,23 +72132,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -72358,23 +72389,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +fMP +sdX +fMP +fMP +fMP +sdX +vPH +sdX +fMP +fMP +fMP +sdX +fMP +aaa +aaa jFP jFP jFP @@ -72615,23 +72646,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +fMP +aaa +aaa +aaa +aaa +aaa +aMH +aaa +aaa +aaa +aaa +aaa +fMP +aaa +aaa jFP jFP jFP @@ -72872,21 +72903,21 @@ jFP jFP jFP jFP -jFP -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa +fMP aaa +aKr +aKr +aKr +aKr +aMI +aKr +aKr +aKr +aKr aaa +fMP aaa aaa jFP @@ -73129,21 +73160,21 @@ jFP jFP jFP jFP -jFP -aaa -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa +sdX +sdX +aKB +aLz +aLz +aLz +aMQ +bar +bar +bar +bbS +sdX +sdX aaa aaa jFP @@ -73388,18 +73419,18 @@ aaa aaa aaa aaa -pZU -sdX -pZU -pZU -pZU -sdX -aLL -sdX -pZU -pZU -pZU -sdX +fMP +aaa +aKF +aKF +aKF +aKF +aMH +aKF +aKF +aKF +aKF +aaa pZU aaa aaa @@ -73645,13 +73676,13 @@ aaa aaa aaa aaa -pZU +fMP aaa aaa aaa aaa aaa -aMH +aZS aaa aaa aaa @@ -96714,7 +96745,7 @@ aaa aaa aaa aaa -pZU +sdX aaa aaa aaa @@ -96726,7 +96757,7 @@ aaa aaa aaa aaa -pZU +sdX aaa aaa aaa @@ -96971,7 +97002,7 @@ aaa aaa aaa aaa -sdX +aLL aaa abL abL @@ -96983,7 +97014,7 @@ abL abL abL aaa -sdX +pZU aaa aaa aaa @@ -97228,7 +97259,7 @@ jFP aaa aaa aaa -pZU +aLL sdX abM bbQ @@ -97485,13 +97516,13 @@ jFP aaa aaa aaa -pZU +aLL aaa acu acu acu acu -aef +wle acu acu acu @@ -97742,19 +97773,19 @@ jFP aaa aaa aaa -pZU +sdX aaa aaa aaa aaa aaa -adt +aef aaa aaa aaa aaa aaa -pZU +sdX aaa aaa aaa @@ -97999,19 +98030,19 @@ jFP aaa aaa aaa -sdX -sdX -pZU -pZU -pZU -sdX bcJ -sdX +aaa +abL +abL +abL +abL +adt +abL +abL +abL +abL +aaa pZU -pZU -pZU -sdX -sdX aaa aaa aaa @@ -98256,19 +98287,19 @@ jFP aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aLL +sdX +abM +bbQ +bbQ +bbQ +adM +bbV +bbV +bbV +bcD +sdX +pZU aaa aaa aaa @@ -98513,19 +98544,19 @@ jFP aaa aaa aaa +pZU aaa +acu +acu +acu +acu +aef +acu +acu +acu +acu aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU aaa aaa aaa @@ -98770,19 +98801,19 @@ jFP aaa aaa aaa +pZU aaa aaa aaa aaa aaa +adt aaa aaa aaa aaa aaa -aaa -aaa -aaa +pZU aaa aaa aaa @@ -99027,19 +99058,19 @@ jFP aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU +sdX +pZU +pZU +pZU +sdX +uBW +sdX +pZU +pZU +pZU +sdX +pZU aaa aaa aaa @@ -99539,23 +99570,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -99796,23 +99827,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP From 982b29d505efda1bf51712aefbce77e82d9d7130 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Tue, 22 Feb 2022 23:21:34 -0500 Subject: [PATCH 7/9] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index ab56dbd057..8f9f2e186a 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -72393,17 +72393,17 @@ aaa aaa fMP sdX -fMP -fMP -fMP +aLL +aLL +aLL sdX vPH sdX -fMP -fMP -fMP +aLL +aLL +aLL sdX -fMP +aLL aaa aaa jFP @@ -72660,7 +72660,7 @@ aaa aaa aaa aaa -fMP +aLL aaa aaa jFP @@ -72917,7 +72917,7 @@ aKr aKr aKr aaa -fMP +aLL aaa aaa jFP @@ -73419,7 +73419,7 @@ aaa aaa aaa aaa -fMP +aLL aaa aKF aKF @@ -73431,7 +73431,7 @@ aKF aKF aKF aaa -pZU +bcJ aaa aaa jFP @@ -73676,7 +73676,7 @@ aaa aaa aaa aaa -fMP +aLL aaa aaa aaa From e49f5c4d846d0caa94d4ecbd89bce5acfd4f73ba Mon Sep 17 00:00:00 2001 From: TripleShades Date: Wed, 23 Feb 2022 00:36:47 -0500 Subject: [PATCH 8/9] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 8f9f2e186a..89f6c2d4e7 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -23307,7 +23307,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/space/basic, +/turf/open/floor/plating, /area/maintenance/port/aft) "aKo" = ( /obj/structure/lattice, From 1678d8a5516723a4bbd971d24e8cb495b8e0753d Mon Sep 17 00:00:00 2001 From: TripleShades Date: Wed, 23 Feb 2022 02:51:55 -0500 Subject: [PATCH 9/9] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 89f6c2d4e7..275cf95856 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -10526,6 +10526,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/structure/closet/secure_closet/contraband/armory, /turf/open/floor/plasteel, /area/security/brig) "aqC" = (