From 674ff7f266e36a2d96643d97b784929ff979aec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9C=88=E7=8C=AB?= Date: Sun, 1 Aug 2021 10:33:41 -0400 Subject: [PATCH] Fixes multiple mapping errors (#60534) --- .../map_files/Deltastation/DeltaStation2.dmm | 451 ++++++++---------- .../map_files/IceBoxStation/IceBoxStation.dmm | 57 ++- .../IcemoonUnderground_Above.dmm | 16 +- _maps/map_files/KiloStation/KiloStation.dmm | 81 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 197 ++++---- _maps/map_files/tramstation/tramstation.dmm | 259 ++++++---- code/game/machinery/computer/camera.dm | 2 +- 7 files changed, 532 insertions(+), 531 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 98237839034..adfcf806b96 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1594,7 +1594,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "ahS" = ( /obj/machinery/status_display/evac/directional/east, /obj/machinery/light/directional/east, @@ -3154,7 +3154,7 @@ dir = 4 }, /turf/open/floor/plating/airless, -/area/science/misc_lab/range) +/area/science/mixing) "asD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/barsign{ @@ -5934,7 +5934,7 @@ pixel_x = -26 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "aPQ" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -6346,7 +6346,7 @@ "aST" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "aSY" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/red{ @@ -6734,7 +6734,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "aXx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -7193,6 +7193,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/science/mixing) "bcG" = ( @@ -7721,7 +7722,7 @@ /obj/structure/training_machine, /obj/item/target/syndicate, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "bfR" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -12259,7 +12260,7 @@ }, /obj/structure/table/reinforced, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "bNM" = ( /obj/machinery/door/poddoor/preopen{ id = "justicechamber"; @@ -15446,7 +15447,7 @@ "ccN" = ( /obj/structure/girder, /turf/open/floor/plating, -/area/science/misc_lab) +/area/maintenance/port) "ccU" = ( /obj/effect/spawner/randomsnackvend, /obj/machinery/light/directional/west, @@ -18479,7 +18480,7 @@ /obj/item/screwdriver, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "crG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -19582,7 +19583,7 @@ /turf/open/floor/iron{ heat_capacity = 1e+006 }, -/area/science/misc_lab/range) +/area/science/mixing) "cBR" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -28831,7 +28832,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "dwt" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -29716,13 +29717,10 @@ /turf/open/floor/plating, /area/science/research/abandoned) "dAw" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/line, -/obj/machinery/power/apc/auto_name/west, /turf/open/floor/iron, /area/science/mixing) "dAx" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -31257,6 +31255,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/science/mixing) "dHm" = ( @@ -32514,7 +32513,7 @@ dir = 1 }, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "dMt" = ( /obj/structure/closet/firecloset, /obj/machinery/light/small/directional/south, @@ -37379,7 +37378,7 @@ /obj/machinery/light/directional/north, /obj/effect/turf_decal/bot, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "emw" = ( /obj/structure/filingcabinet/security, /turf/open/floor/carpet, @@ -39118,7 +39117,7 @@ dir = 8 }, /turf/open/floor/plating/airless, -/area/science/misc_lab/range) +/area/science/mixing) "eMt" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -40328,9 +40327,9 @@ "faI" = ( /obj/item/kirbyplants/random, /obj/machinery/camera{ - c_tag = "MiniSat Service Bay"; + c_tag = "Science Maintnence"; dir = 8; - network = list("minisat"); + network = list("ss13","rd"); start_active = 1 }, /obj/structure/cable, @@ -40746,7 +40745,7 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/south, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "ffH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -41189,7 +41188,6 @@ /area/science/storage) "fno" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -42544,7 +42542,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "fGF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -43315,7 +43313,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "fUZ" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow, @@ -45071,7 +45069,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "gvf" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -45549,7 +45547,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "gDw" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red{ @@ -48297,7 +48295,6 @@ /area/cargo/warehouse) "huK" = ( /obj/effect/landmark/start/scientist, -/obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -48676,7 +48673,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "hAI" = ( /obj/structure/window, /obj/structure/sink{ @@ -49347,7 +49344,7 @@ }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "hJb" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -51173,7 +51170,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "ifX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -51739,14 +51736,9 @@ /area/command/gateway) "iod" = ( /obj/structure/table/reinforced, -/obj/machinery/camera{ - c_tag = "Science - Experimentation Lab"; - name = "science camera"; - network = list("ss13","rd") - }, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "iog" = ( /obj/item/clothing/suit/hazardvest{ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; @@ -52508,9 +52500,8 @@ /turf/open/floor/iron/dark, /area/security/interrogation) "iyK" = ( -/obj/effect/turf_decal/tile/purple, -/turf/closed/wall/r_wall, -/area/science/misc_lab) +/turf/open/floor/iron, +/area/maintenance/port) "iyX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52550,16 +52541,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"izv" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/science/misc_lab/range) "izG" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue{ @@ -53721,7 +53702,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "iPI" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -55701,7 +55682,6 @@ name = "science camera"; network = list("ss13","rd") }, -/obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -55715,7 +55695,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/power/apc/auto_name/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/iron/dark, /area/science/mixing) @@ -56170,7 +56149,6 @@ /turf/open/floor/iron, /area/cargo/miningoffice) "jAR" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -56179,7 +56157,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "jAZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -56470,7 +56448,7 @@ "jER" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "jES" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -58948,7 +58926,7 @@ "kot" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall, -/area/science/misc_lab/range) +/area/science/mixing) "koD" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, @@ -61449,7 +61427,7 @@ /area/security/warden) "kVu" = ( /turf/closed/wall, -/area/science/misc_lab/range) +/area/science/mixing) "kVD" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -61681,7 +61659,7 @@ "kYl" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "kYo" = ( /obj/effect/turf_decal/bot, /obj/machinery/firealarm/directional/north, @@ -61805,7 +61783,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "kZE" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -62332,7 +62310,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "lfw" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -62382,7 +62360,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "lgs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62932,7 +62910,7 @@ dir = 10 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "lmL" = ( /turf/closed/wall, /area/engineering/supermatter/room) @@ -63256,7 +63234,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "lrc" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -64391,7 +64369,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "lHI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -64924,7 +64902,7 @@ pixel_y = -3 }, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "lPn" = ( /obj/structure/chair/comfy/brown{ buildstackamount = 0; @@ -65779,7 +65757,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "mat" = ( /obj/effect/decal/cleanable/dirt, /obj/item/kirbyplants/random, @@ -66343,11 +66321,6 @@ }, /turf/open/floor/plating, /area/service/abandoned_gambling_den) -"mhV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/girder, -/turf/open/floor/plating, -/area/science/misc_lab) "mhX" = ( /obj/machinery/camera{ c_tag = "Art Gallery"; @@ -66443,7 +66416,6 @@ /area/engineering/supermatter/room) "mkm" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -67372,7 +67344,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "muI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown{ @@ -68176,7 +68148,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "mHf" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -68560,7 +68532,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "mLO" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -68792,7 +68764,7 @@ /obj/machinery/research/explosive_compressor, /obj/effect/turf_decal/bot, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "mPp" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -69421,7 +69393,7 @@ dir = 6 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "mYA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -70584,6 +70556,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/science/mixing) "nkL" = ( @@ -72172,15 +72145,8 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "nGy" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/science/mixing) +/turf/closed/wall/r_wall, +/area/science/misc_lab/range) "nGD" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -72221,7 +72187,7 @@ dir = 6 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "nGZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -72678,10 +72644,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/engineering/atmos/upper) -"nNa" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/science/misc_lab) "nNm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/filingcabinet/filingcabinet, @@ -73112,7 +73074,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -73126,7 +73087,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "nSD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73549,11 +73510,19 @@ /turf/open/floor/iron, /area/ai_monitored/command/storage/eva) "nXC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "nXD" = ( /obj/item/kirbyplants/random, /obj/machinery/light_switch/directional/west, @@ -75066,7 +75035,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "ooH" = ( /obj/machinery/camera{ c_tag = "Engineering Hallway - Starboard"; @@ -76017,7 +75986,7 @@ /obj/machinery/light/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "oBs" = ( /turf/closed/wall, /area/cargo/qm) @@ -76184,7 +76153,7 @@ pixel_x = 28 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "oDC" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -76372,7 +76341,7 @@ dir = 6 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "oFV" = ( /obj/structure/window/reinforced{ dir = 4 @@ -76650,6 +76619,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/power/apc/auto_name/south, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/science/mixing) "oIv" = ( @@ -78073,7 +78044,7 @@ dir = 5 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "paN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -79429,13 +79400,12 @@ dir = 6 }, /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/airalarm/directional/east, /obj/machinery/newscaster/directional/north, /obj/machinery/light_switch/directional/east{ pixel_y = 26 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "puL" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -82231,7 +82201,7 @@ /obj/machinery/firealarm/directional/east, /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "qhm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -84449,7 +84419,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "qKx" = ( /obj/machinery/power/tesla_coil, /obj/effect/turf_decal/bot, @@ -84460,7 +84430,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "qKC" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -86110,7 +86080,6 @@ /turf/open/floor/iron, /area/engineering/supermatter/room) "rev" = ( -/obj/structure/cable, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -86128,7 +86097,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "rew" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, @@ -86157,7 +86126,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "reB" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red, @@ -87143,7 +87112,7 @@ /obj/machinery/door/poddoor/massdriver_toxins, /obj/structure/fans/tiny, /turf/open/floor/plating, -/area/science/misc_lab/range) +/area/science/mixing) "rsL" = ( /obj/structure/plaque/static_plaque/atmos, /turf/closed/wall, @@ -88435,7 +88404,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "rLP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red{ @@ -88570,7 +88539,7 @@ /obj/item/gun/energy/laser/practice, /obj/item/gun/energy/laser/practice, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "rMV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -88688,7 +88657,7 @@ "rOQ" = ( /obj/structure/table/reinforced, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "rPb" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ @@ -89494,8 +89463,20 @@ /turf/open/floor/iron, /area/engineering/atmos/upper) "saw" = ( -/turf/closed/wall/r_wall, -/area/science/misc_lab/range) +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/science/mixing) "say" = ( /obj/item/kirbyplants/random, /obj/machinery/camera{ @@ -89642,21 +89623,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"scS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/science/mixing) "scY" = ( /obj/structure/cable, /obj/effect/turf_decal/bot, @@ -89894,7 +89860,7 @@ /turf/open/floor/iron{ heat_capacity = 1e+006 }, -/area/science/misc_lab/range) +/area/science/mixing) "sfo" = ( /obj/effect/decal/remains/xeno, /turf/open/floor/engine/vacuum, @@ -90240,7 +90206,7 @@ "skA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/science/misc_lab/range) +/area/science/mixing) "skH" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/brown, @@ -91672,7 +91638,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "sCo" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -92082,6 +92048,10 @@ pixel_y = -26 }, /obj/machinery/newscaster/directional/south, +/obj/machinery/computer/security/telescreen/rd{ + dir = 4; + pixel_x = -26 + }, /turf/open/floor/iron, /area/command/heads_quarters/rd) "sGN" = ( @@ -92279,7 +92249,7 @@ /obj/item/clothing/glasses/science, /obj/effect/turf_decal/bot, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "sJv" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -92916,7 +92886,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "sTm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -93083,7 +93053,7 @@ "sUT" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, -/area/science/misc_lab) +/area/science/misc_lab/range) "sUU" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow, @@ -93473,7 +93443,7 @@ }, /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "sYF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -93910,14 +93880,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/science/robotics/mechbay) -"tew" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/science/mixing) "teB" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -95119,7 +95081,7 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "txh" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ @@ -98109,8 +98071,6 @@ /turf/open/floor/iron/dark, /area/service/chapel/office) "ujY" = ( -/obj/machinery/power/apc/auto_name/east, -/obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -98121,7 +98081,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "ukj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple, @@ -99166,7 +99126,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "uyh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown, @@ -99608,7 +99568,7 @@ }, /obj/structure/rack, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "uCT" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -100337,7 +100297,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "uMi" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -100597,7 +100557,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "uRC" = ( /obj/structure/bonfire, /obj/item/reagent_containers/food/drinks/bottle/orangejuice{ @@ -100964,10 +100924,6 @@ }, /turf/open/floor/iron, /area/cargo/storage) -"uWD" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/science/misc_lab) "uWH" = ( /obj/structure/table/wood, /obj/item/storage/photo_album, @@ -103284,7 +103240,7 @@ dir = 10 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "vFR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -103309,7 +103265,7 @@ dir = 8 }, /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "vGx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 @@ -105184,7 +105140,7 @@ "weA" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall, -/area/science/misc_lab/range) +/area/science/mixing) "weH" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -105374,7 +105330,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "whY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -106089,7 +106045,7 @@ dir = 9 }, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "wss" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -107226,9 +107182,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/aisat/exterior) -"wId" = ( -/turf/open/floor/plating, -/area/science/misc_lab) "wIn" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -107447,7 +107400,7 @@ /obj/structure/table/reinforced, /obj/machinery/cell_charger, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "wMU" = ( /obj/machinery/button/flasher{ id = "Cell 5"; @@ -109562,7 +109515,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/science/misc_lab) +/area/maintenance/port) "xsP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -110767,7 +110720,7 @@ dir = 8 }, /turf/open/floor/iron/white, -/area/science/misc_lab) +/area/science/misc_lab/range) "xKt" = ( /obj/structure/filingcabinet/employment, /obj/machinery/airalarm/directional/east, @@ -110796,7 +110749,7 @@ /area/service/hydroponics) "xKO" = ( /turf/open/floor/iron, -/area/science/misc_lab) +/area/science/misc_lab/range) "xKQ" = ( /obj/item/kirbyplants/random, /obj/structure/disposalpipe/segment{ @@ -111675,7 +111628,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/science/misc_lab/range) +/area/science/mixing) "xYc" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -137048,11 +137001,11 @@ nPM nPM nPM nPM -gSi -gSi -gSi -gSi -gSi +nGy +nGy +nGy +nGy +nGy dhQ dhQ dhQ @@ -137302,14 +137255,14 @@ iuP exk swm pfQ -tCh +caE crF rOQ -gSi +nGy map vGv lmF -gSi +nGy dul dvZ dxH @@ -137559,14 +137512,14 @@ cjq ced wXQ moY -tCh +caE iod qKy -gSi +nGy mLI bfJ aST -gSi +nGy djs dlf dxI @@ -137816,14 +137769,14 @@ cMY cMY ceb moY -tCh +caE wMH -nNa -gSi +qpq +nGy uRm xKO aST -gSi +nGy dlg dli xwx @@ -138073,14 +138026,14 @@ cNd cMY cea kEw -tCh -nNa -nNa -gSi +caE +qpq +qpq +nGy mLI xKO mGu -gSi +nGy dum dli dpZ @@ -138333,11 +138286,11 @@ laE xsp jER muj -gSi +nGy mLI sSW aST -gSi +nGy yjc lEl dxJ @@ -138587,14 +138540,14 @@ xtH cMY deX aiu -tCh -nNa +caE +qpq dwo -gSi +nGy gve uMh nGU -gSi +nGy dun lEl dxK @@ -138844,14 +138797,14 @@ lvo cMY deX joJ -tCh -mhV +caE +xMn ccN -gSi +nGy lPk xKi ffG -gSi +nGy duo dmu eMD @@ -139101,14 +139054,14 @@ xXC cMY deY oAw -tCh -wId -xKO -gSi +caE +cea +iyK +nGy oBr ifR dMi -gSi +nGy dup dlg dxL @@ -139358,14 +139311,14 @@ enx cMY cjp hST -tCh -wId -wId -gSi +caE +cea +cea +nGy kYl oox bNG -gSi +nGy duq dlh dxM @@ -139615,14 +139568,14 @@ dcd cMY deZ joJ -tCh +caE uCC -uWD -iyK +ceb +nGy rMT oox qhk -gSi +nGy dur xze dxN @@ -139872,14 +139825,14 @@ rMk cMY deX joJ -tCh -tCh -tCh -gSi +caE +caE +caE +nGy sUT fGC -gSi -gSi +nGy +nGy dus dwa dom @@ -140915,14 +140868,14 @@ cxO mbI caE aad -saw +drP skA skA -saw +drP skA -saw +drP eMn -saw +drP dOa dOM aad @@ -141179,7 +141132,7 @@ hIQ aPJ skA asu -saw +drP dOb ert ert @@ -141430,13 +141383,13 @@ oFE cOj aad skA -nXC +xmt lra lHp iPA weA rsF -saw +drP dOc ert yiM @@ -141686,14 +141639,14 @@ dzo mbI caE aaa -saw +drP emq cBP mYu rLO skA hAH -saw +drP dOd ert iKu @@ -141950,7 +141903,7 @@ qKr sJb kot aXp -saw +drP dOe hmH yli @@ -142203,11 +142156,11 @@ aaa skA twD uxQ -izv +jAR mPo skA lft -saw +drP dLW fTa elW @@ -142457,14 +142410,14 @@ cxO oFE caE aad -saw +drP puE ujY jAR whX oDB sCm -saw +drP qHZ kwQ bce @@ -142714,14 +142667,14 @@ dzp pxk caE caE -saw -saw -saw +drP +drP +drP nSA -saw -saw -saw -saw +drP +drP +drP +drP uSp hmH etl @@ -143743,11 +143696,11 @@ drP drP drP drP -saw -saw +drP +drP rew -saw -saw +drP +drP dLS dNw fGR @@ -144509,8 +144462,8 @@ ote qzP dwi huK -rMd -uqv +nXC +saw hEu qkc hCm @@ -144765,7 +144718,7 @@ drR dtl lMO dtl -tew +dtl dtl dtl bcD @@ -145022,7 +144975,7 @@ drT dtm iQK lXF -nGy +vAb vAb vAb nkD @@ -145793,7 +145746,7 @@ exE oIE lyU fpQ -scS +yiv eMJ yiv gNS diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 28f541a48f5..b520afccbf7 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -10434,7 +10434,8 @@ /area/science/research) "biS" = ( /obj/machinery/camera{ - c_tag = "Research Division Access" + c_tag = "Research Division Access"; + network = list("ss13","rd") }, /obj/structure/sink{ dir = 8; @@ -12364,7 +12365,8 @@ /area/hallway/primary/central) "btA" = ( /obj/machinery/camera{ - c_tag = "Research Division West" + c_tag = "Research Division West"; + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/research) @@ -12671,7 +12673,8 @@ "bvf" = ( /obj/machinery/camera{ c_tag = "Research Division North"; - dir = 8 + dir = 8; + network = list("ss13","rd") }, /turf/open/floor/iron/white/side{ dir = 9 @@ -12831,9 +12834,9 @@ /area/medical/medbay/aft) "bvB" = ( /obj/machinery/camera{ - c_tag = "Genetics Access"; + c_tag = "Med-Sci Access"; dir = 8; - network = list("ss13","medbay"); + network = list("ss13","medbay","rd"); pixel_y = -22 }, /turf/open/floor/iron/white, @@ -15415,7 +15418,7 @@ "bLc" = ( /obj/machinery/computer/security/telescreen{ dir = 8; - name = "Test Chamber Monitor"; + name = "Xenobio Monitor"; network = list("xeno"); pixel_x = 26 }, @@ -17150,8 +17153,7 @@ /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/computer/camera_advanced/xenobio{ - dir = 1; - networks = list("xeno_pens") + dir = 1 }, /turf/open/floor/iron, /area/science/xenobiology) @@ -22066,7 +22068,9 @@ }, /obj/machinery/keycard_auth/directional/south, /obj/machinery/camera/autoname{ - dir = 1 + c_tag = "Research Directors Office"; + dir = 1; + network = list("ss13","rd") }, /turf/open/floor/iron/cafeteria, /area/command/heads_quarters/rd) @@ -24322,7 +24326,9 @@ /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/turf_decal/bot, /obj/machinery/camera/autoname{ - dir = 1 + c_tag = "Toxins Storage"; + dir = 1; + network = list("ss13","rd") }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -24369,7 +24375,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens Observation - Starboard Aft"; dir = 8; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/openspace, /area/science/xenobiology) @@ -28018,7 +28024,8 @@ /obj/item/crowbar/large, /obj/machinery/camera{ c_tag = "Mech Bay"; - dir = 1 + dir = 1; + network = list("ss13","rd") }, /obj/machinery/light/directional/south, /turf/open/floor/iron, @@ -30376,7 +30383,8 @@ "iFt" = ( /obj/machinery/camera{ c_tag = "Toxins Launch Room Access"; - dir = 1 + dir = 1; + network = list("ss13","rd") }, /obj/machinery/vending/coffee, /turf/open/floor/iron, @@ -39580,7 +39588,7 @@ "nLm" = ( /obj/machinery/camera{ c_tag = "Xenobiology Lab Entrance"; - network = list("ss13","rd") + network = list("ss13","rd","xeno") }, /turf/open/openspace, /area/science/xenobiology) @@ -42757,7 +42765,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens Observation - Starboard Fore"; dir = 8; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/openspace, /area/science/xenobiology) @@ -43279,7 +43287,7 @@ /area/service/library) "pOq" = ( /obj/machinery/camera{ - c_tag = "Circuits Lab"; + c_tag = "Research Division East"; dir = 4; network = list("ss13","rd") }, @@ -47983,9 +47991,7 @@ /turf/open/floor/iron, /area/hallway/primary/central) "swQ" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - networks = list("xeno_pens") - }, +/obj/machinery/computer/camera_advanced/xenobio, /turf/open/floor/iron, /area/science/xenobiology) "swV" = ( @@ -50176,6 +50182,11 @@ /area/security/office) "tJy" = ( /obj/machinery/component_printer, +/obj/machinery/camera{ + c_tag = "Circuits Lab"; + dir = 4; + network = list("ss13","rd") + }, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -56890,7 +56901,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens Observation - Port Fore"; dir = 4; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /obj/machinery/light/directional/west, /turf/open/openspace, @@ -58387,7 +58398,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens Observation - Port Aft"; dir = 4; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/openspace, /area/science/xenobiology) @@ -106852,8 +106863,8 @@ bpE bpE bpE bpE -boB -boB +bhA +bhA pLE qSi sql diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index 00512e4609a..d99b23a5140 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -1568,7 +1568,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens - Starboard Aft"; dir = 8; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/floor/engine, /area/science/xenobiology) @@ -1846,7 +1846,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens - Port Aft"; dir = 4; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/floor/engine, /area/science/xenobiology) @@ -2447,7 +2447,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens Hall - Fore"; dir = 6; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -4414,7 +4414,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens - Starboard Fore"; dir = 8; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/floor/engine, /area/science/xenobiology) @@ -4722,7 +4722,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens - Starboard Mid"; dir = 8; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/floor/engine, /area/science/xenobiology) @@ -4776,7 +4776,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens - Port Mid"; dir = 4; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/floor/engine, /area/science/xenobiology) @@ -4988,7 +4988,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Pens - Port Fore"; dir = 4; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /turf/open/floor/engine, /area/science/xenobiology) @@ -5013,7 +5013,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Kill Chamber"; dir = 4; - network = list("ss13","rd","xeno_pens") + network = list("ss13","rd","xeno") }, /obj/effect/turf_decal/stripes/line{ dir = 10 diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index c80ee5f72eb..115e610dddb 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -39301,7 +39301,7 @@ }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "cIb" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -41356,7 +41356,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/module_duplicator, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "dkX" = ( /obj/structure/sign/poster/contraband/random, /turf/closed/wall/rust, @@ -41467,7 +41467,7 @@ dir = 9 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "dpC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/blood/old, @@ -41689,7 +41689,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "dtq" = ( /turf/closed/wall/rust, /area/engineering/gravity_generator) @@ -42286,7 +42286,7 @@ /turf/open/floor/plating{ icon_state = "panelscorched" }, -/area/science/test_area) +/area/science/misc_lab) "dIT" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/cargo{ @@ -46147,7 +46147,7 @@ dir = 9 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "fuC" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -49092,7 +49092,7 @@ "gJJ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/science/test_area) +/area/science/misc_lab) "gJT" = ( /obj/structure/chair/sofa/right{ color = "#c45c57"; @@ -49534,7 +49534,7 @@ /area/engineering/supermatter/room) "gVX" = ( /turf/closed/wall/rust, -/area/science/test_area) +/area/science/misc_lab) "gWx" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -51257,7 +51257,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "hNl" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall/rust, @@ -51761,7 +51761,7 @@ dir = 9 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "hYb" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, @@ -52200,7 +52200,7 @@ dir = 9 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "igh" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -54018,7 +54018,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "iTK" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/west, @@ -54121,7 +54121,7 @@ /obj/item/compact_remote, /obj/item/compact_remote, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "iUy" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -61101,7 +61101,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "lRG" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/structure/grille, @@ -62796,6 +62796,9 @@ }, /turf/open/floor/iron/dark, /area/engineering/main) +"mDd" = ( +/turf/closed/wall/r_wall, +/area/science/misc_lab) "mDG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -64196,7 +64199,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/science/test_area) +/area/science/misc_lab) "nmc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -68230,7 +68233,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "paZ" = ( /obj/machinery/light/small/directional/west, /obj/structure/cable, @@ -68288,7 +68291,7 @@ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "pbw" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -68302,7 +68305,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "pbW" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -70911,7 +70914,7 @@ /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "qaY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71331,7 +71334,7 @@ /obj/effect/turf_decal/tile/purple, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "qlU" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -71471,7 +71474,7 @@ "qoN" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/rust, -/area/science/test_area) +/area/science/misc_lab) "qoR" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall/rust, @@ -74813,7 +74816,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "rKt" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -75963,7 +75966,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "slN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -76938,7 +76941,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "sLL" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -79415,7 +79418,7 @@ }, /obj/machinery/research/explosive_compressor, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "tNt" = ( /turf/open/floor/plating, /area/maintenance/disposal/incinerator) @@ -79614,7 +79617,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "tQw" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -80007,7 +80010,7 @@ dir = 9 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "tZH" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -80783,7 +80786,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "upp" = ( /obj/structure/flora/ausbushes/palebush, /obj/effect/turf_decal/stripes/line{ @@ -82568,7 +82571,7 @@ /turf/open/floor/plating{ icon_state = "platingdmg1" }, -/area/science/test_area) +/area/science/misc_lab) "ver" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -83611,7 +83614,7 @@ "vAx" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/science/test_area) +/area/science/misc_lab) "vAL" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/event_spawn, @@ -85068,7 +85071,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "wjo" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -85512,7 +85515,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "wrh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -87302,7 +87305,7 @@ /obj/machinery/light/small/directional/south, /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "xfU" = ( /obj/item/circuitboard/computer/solar_control, /turf/open/floor/plating/asteroid/airless, @@ -87719,7 +87722,7 @@ /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "xpP" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -88488,7 +88491,7 @@ /area/cargo/miningoffice) "xEu" = ( /turf/closed/wall, -/area/science/test_area) +/area/science/misc_lab) "xEE" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -88979,7 +88982,7 @@ pixel_x = -32 }, /turf/open/floor/iron/dark, -/area/science/test_area) +/area/science/misc_lab) "xQT" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -89075,7 +89078,7 @@ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "xSr" = ( /obj/machinery/door/airlock/external{ name = "Atmospherics External Airlock"; @@ -89586,7 +89589,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/showroomfloor, -/area/science/test_area) +/area/science/misc_lab) "yfb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -132491,7 +132494,7 @@ beo hdj aOT bbi -caT +mDd xpL pbn tNe diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 164edfdd93a..4511e15a9d7 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -9346,7 +9346,6 @@ }, /area/maintenance/port/fore) "bIO" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ dir = 4 @@ -14278,7 +14277,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Lab - Central West"; dir = 8; - network = list("ss13","rd") + network = list("ss13","rd","xeno") }, /obj/structure/disposalpipe/segment, /obj/machinery/button/door/directional/east{ @@ -14633,7 +14632,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/camera{ c_tag = "Science Hallway - Central"; - dir = 4 + dir = 4; + network = list("ss13","rd") }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 @@ -15554,7 +15554,8 @@ }, /obj/machinery/camera{ c_tag = "Science Break Room"; - dir = 4 + dir = 4; + network = list("ss13","rd") }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -18724,7 +18725,7 @@ req_access_txt = "8" }, /turf/open/floor/plating, -/area/science/mixing) +/area/maintenance/starboard/aft) "dNN" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, @@ -19015,7 +19016,8 @@ /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/camera{ c_tag = "Science Toxins Launch 2"; - dir = 8 + dir = 8; + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/mixing) @@ -19147,7 +19149,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 10 }, @@ -19914,7 +19915,8 @@ /obj/item/stock_parts/cell/high, /obj/machinery/firealarm/directional/west, /obj/machinery/camera{ - c_tag = "Science Mechbay" + c_tag = "Science Mechbay"; + network = list("ss13","rd") }, /obj/machinery/button/door/directional/north{ id = "mechbay"; @@ -21285,7 +21287,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Lab - Central South"; dir = 6; - network = list("ss13","rd") + network = list("ss13","rd","xeno") }, /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/white, @@ -21442,7 +21444,8 @@ /area/service/chapel/office) "eHX" = ( /obj/machinery/camera{ - c_tag = "Science Robotics Workshop" + c_tag = "Science Robotics Workshop"; + network = list("ss13","rd") }, /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -22581,13 +22584,6 @@ dir = 1 }, /area/engineering/main) -"eYI" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engineering/atmos) "eYN" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -23877,7 +23873,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Lab - Fore"; dir = 4; - network = list("ss13","rd") + network = list("ss13","rd","xeno") }, /obj/machinery/light/directional/west, /obj/structure/cable, @@ -24038,13 +24034,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, /area/maintenance/aft/secondary) -"fyr" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/floor/iron, -/area/engineering/atmos) "fys" = ( /obj/structure/table/glass, /obj/item/folder/blue, @@ -24254,7 +24243,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/plating, -/area/science/misc_lab) +/area/maintenance/starboard/secondary) "fBA" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -24365,6 +24354,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/treatment_center) +"fCV" = ( +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable, +/turf/open/floor/engine, +/area/science/misc_lab/range) "fCY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -25003,7 +24997,6 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/structure/cable, /obj/machinery/atmospherics/components/binary/pump{ dir = 8; name = "Fuel Pipe to Filter" @@ -25094,7 +25087,8 @@ /obj/machinery/light/small/directional/north, /obj/machinery/camera{ c_tag = "Science Toxins Corridor"; - dir = 4 + dir = 4; + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/mixing) @@ -25277,7 +25271,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Lab - Central North"; dir = 1; - network = list("ss13","rd") + network = list("ss13","rd","xeno") }, /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/white, @@ -25352,9 +25346,7 @@ /turf/open/floor/engine/cult, /area/service/library) "fVN" = ( -/obj/structure/cable, /obj/machinery/light/directional/north, -/obj/machinery/power/apc/auto_name/north, /obj/effect/turf_decal/siding/wood{ dir = 9 }, @@ -25401,7 +25393,6 @@ /turf/open/floor/circuit/green, /area/science/robotics/mechbay) "fXt" = ( -/obj/structure/cable, /obj/item/food/cracker, /obj/item/food/cracker{ pixel_x = 9; @@ -25419,6 +25410,7 @@ dir = 8 }, /obj/machinery/light/small/directional/north, +/obj/structure/cable, /turf/open/floor/engine, /area/science/misc_lab/range) "fXO" = ( @@ -25484,7 +25476,8 @@ }, /obj/machinery/camera{ c_tag = "Science Hallway - West"; - dir = 4 + dir = 4; + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/research) @@ -26217,7 +26210,6 @@ /turf/open/floor/iron/dark, /area/engineering/break_room) "gls" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -26496,7 +26488,8 @@ }, /obj/machinery/camera{ c_tag = "Science Admin"; - dir = 4 + dir = 4; + network = list("ss13","rd") }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, @@ -26663,7 +26656,8 @@ }, /obj/structure/cable, /obj/machinery/camera{ - c_tag = "Science Hallway - Research" + c_tag = "Science Hallway - Research"; + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/research) @@ -26829,7 +26823,8 @@ "gyI" = ( /obj/structure/table/reinforced, /obj/machinery/camera{ - c_tag = "Science Robotics Office" + c_tag = "Science Robotics Office"; + network = list("ss13","rd") }, /obj/item/radio/intercom/directional/north, /obj/item/storage/firstaid{ @@ -27008,7 +27003,8 @@ }, /obj/machinery/camera{ c_tag = "Science Genetics"; - dir = 4 + dir = 4; + network = list("ss13","rd") }, /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/dark, @@ -28177,7 +28173,6 @@ /turf/open/floor/iron/white, /area/medical/abandoned) "gZq" = ( -/obj/structure/cable, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -28449,7 +28444,8 @@ }, /obj/machinery/camera{ c_tag = "Science Toxins Lab"; - dir = 1 + dir = 1; + network = list("ss13","rd") }, /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/siding{ @@ -28673,7 +28669,8 @@ }, /obj/machinery/camera{ c_tag = "Science Toxins Mix"; - dir = 1 + dir = 1; + network = list("ss13","rd") }, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, @@ -28876,7 +28873,7 @@ /obj/machinery/camera{ c_tag = "Cytology - Secure Pen"; dir = 4; - network = list("ss13","rd") + network = list("ss13","rd","xeno") }, /turf/open/floor/engine, /area/science/cytology) @@ -32075,7 +32072,6 @@ dir = 8; name = "emergency shower" }, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/machinery/requests_console/directional/east{ department = "Atmospherics"; @@ -38230,10 +38226,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/carpet, /area/command/heads_quarters/captain/private) -"kBo" = ( -/obj/effect/spawner/lootdrop/donkpockets, -/turf/open/floor/plating, -/area/maintenance/starboard) "kBC" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 @@ -39265,7 +39257,7 @@ /obj/machinery/camera{ c_tag = "Cytology Lab - Worklab"; dir = 4; - network = list("ss13","rd") + network = list("ss13","rd","xeno") }, /turf/open/floor/holofloor/dark, /area/science/cytology) @@ -39335,7 +39327,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Lab - Airlock"; dir = 4; - network = list("ss13","rd") + network = list("ss13","rd","xeno") }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -39566,7 +39558,8 @@ "kYf" = ( /obj/machinery/camera{ c_tag = "RD Observation Cage"; - dir = 1 + dir = 1; + network = list("ss13","rd") }, /turf/open/floor/engine, /area/command/heads_quarters/rd) @@ -40510,7 +40503,8 @@ }, /obj/structure/cable, /obj/machinery/camera{ - c_tag = "Science Lobby" + c_tag = "Science Lobby"; + network = list("ss13","rd") }, /obj/machinery/vending/modularpc, /turf/open/floor/iron/white, @@ -40856,7 +40850,6 @@ /area/medical/virology) "lsw" = ( /obj/machinery/meter, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/floor/iron, /area/engineering/atmos) @@ -41846,7 +41839,6 @@ /turf/open/floor/wood, /area/cargo/qm) "lMm" = ( -/obj/structure/cable, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -42429,6 +42421,16 @@ pixel_x = 6; req_access_txt = "30" }, +/obj/machinery/button/door/directional/north{ + id = "rdoffice"; + name = "Privacy Control"; + pixel_y = 34; + req_access_txt = "30" + }, +/obj/machinery/computer/security/telescreen/rd{ + pixel_x = 31; + pixel_y = 30 + }, /turf/open/floor/iron/white, /area/command/heads_quarters/rd) "lXg" = ( @@ -43219,7 +43221,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) @@ -44361,7 +44362,6 @@ /obj/machinery/door/window/northleft{ name = "Petting Zoo" }, -/obj/structure/cable, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -49209,7 +49209,8 @@ /obj/effect/decal/cleanable/blood/old, /obj/machinery/camera{ c_tag = "Science Maintenance Corridor"; - dir = 8 + dir = 8; + network = list("ss13","rd") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -50242,7 +50243,6 @@ /turf/open/floor/iron/dark, /area/science/robotics/lab) "otl" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engineering/atmos) @@ -50316,7 +50316,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard/secondary) "ovg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -53160,7 +53160,8 @@ "ppA" = ( /obj/machinery/camera{ c_tag = "Science Toxins Secure"; - dir = 4 + dir = 4; + network = list("ss13","rd") }, /obj/structure/filingcabinet/chestdrawer, /obj/item/radio/intercom/directional/west{ @@ -53914,7 +53915,6 @@ /area/service/hydroponics) "pCC" = ( /obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/engineering/atmos) @@ -59086,7 +59086,8 @@ "rqT" = ( /obj/machinery/camera{ c_tag = "Science Petting Zoo"; - dir = 8 + dir = 8; + network = list("ss13","rd") }, /obj/structure/frame/computer{ anchored = 1; @@ -60608,7 +60609,8 @@ }, /obj/machinery/camera{ c_tag = "Science Research"; - dir = 1 + dir = 1; + network = list("ss13","rd") }, /turf/open/floor/iron/dark/side{ dir = 4 @@ -61714,7 +61716,8 @@ /obj/structure/closet/emcloset, /obj/machinery/camera{ c_tag = "Science Entry"; - dir = 1 + dir = 1; + network = list("ss13","rd") }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -63478,7 +63481,8 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/camera{ c_tag = "Science Toxins Secure 2"; - dir = 8 + dir = 8; + network = list("ss13","rd") }, /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, @@ -63511,7 +63515,6 @@ /turf/open/floor/iron/dark, /area/service/chapel/main) "sOg" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, @@ -64456,7 +64459,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ dir = 4 }, -/obj/structure/cable, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -65143,7 +65145,7 @@ /obj/machinery/camera{ c_tag = "Xenobiology Lab - Central East"; dir = 4; - network = list("ss13","rd") + network = list("ss13","rd","xeno") }, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, @@ -66604,7 +66606,8 @@ /obj/item/paper_bin, /obj/item/pen, /obj/machinery/camera{ - c_tag = "Science Research Office" + c_tag = "Science Research Office"; + network = list("ss13","rd") }, /turf/open/floor/iron, /area/science/lab) @@ -66837,7 +66840,8 @@ "tQb" = ( /obj/machinery/camera{ c_tag = "Xenobiology Lab - Pen #1"; - dir = 4 + dir = 4; + network = list("ss13","rd","xeno") }, /turf/open/floor/engine, /area/science/xenobiology) @@ -67692,7 +67696,6 @@ /turf/open/floor/iron, /area/cargo/storage) "ufw" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ dir = 1 }, @@ -69023,8 +69026,10 @@ /area/science/cytology) "uzH" = ( /obj/machinery/camera{ - c_tag = "Science Firing Range" + c_tag = "Science Firing Range"; + network = list("ss13","rd") }, +/obj/structure/cable, /turf/open/floor/engine, /area/science/misc_lab/range) "uzL" = ( @@ -69242,11 +69247,6 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"uDl" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/grass, -/area/science/research) "uDq" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = -32 @@ -72450,7 +72450,8 @@ /obj/structure/table, /obj/machinery/camera{ c_tag = "Science Toxins Launch"; - dir = 1 + dir = 1; + network = list("ss13","rd") }, /obj/machinery/computer/pod/old/mass_driver_controller/toxinsdriver{ pixel_y = -24 @@ -73147,7 +73148,7 @@ pixel_x = -8 }, /turf/open/floor/iron/white, -/area/science/misc_lab/range) +/area/science/misc_lab) "vRT" = ( /obj/machinery/light/directional/south, /obj/item/stack/sheet/cardboard{ @@ -73324,7 +73325,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, @@ -73709,7 +73709,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, @@ -74611,7 +74610,8 @@ "wqM" = ( /obj/machinery/camera{ c_tag = "Science Hallway - Admin"; - dir = 1 + dir = 1; + network = list("ss13","rd") }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -75594,12 +75594,6 @@ departmentType = 5; name = "Research Director's Requests Console" }, -/obj/machinery/button/door/directional/north{ - id = "rdoffice"; - name = "Privacy Control"; - pixel_x = -8; - req_access_txt = "30" - }, /turf/open/floor/iron/white, /area/command/heads_quarters/rd) "wMh" = ( @@ -78981,13 +78975,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"xPA" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 10 - }, -/turf/open/floor/iron, -/area/engineering/atmos) "xPF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -113680,8 +113667,8 @@ scO crR crR crR -cyK -cyK +nOc +nOc dNG nOc nOc @@ -114707,7 +114694,7 @@ gEE nFC idk idk -cyK +crR tXF kEC eCn @@ -114939,7 +114926,7 @@ paq quV pbs cuZ -pcn +fCV oxa cFB pcn @@ -116736,7 +116723,7 @@ odO hrc dee quV -kBo +jAh ouU oUQ ovj @@ -117510,7 +117497,7 @@ uOq tfU bTe chC -alq +ovj ovj ovj ovj @@ -117778,7 +117765,7 @@ crZ cgo mvj fXt -uDl +oTI mAN niR bih @@ -122121,13 +122108,13 @@ tbd gls bIO pCC -fyr -grx -xPA +slA +lye +tHX isF otl lsw -eYI +fJd xoQ sMi yiS diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index d6cef37f3c8..b1f563e1ec0 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -138,7 +138,7 @@ /obj/machinery/camera{ c_tag = "Science - Genetics Pen"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd") }, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -2243,7 +2243,7 @@ /obj/machinery/camera{ c_tag = "Science - Break Room"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/cafeteria{ @@ -2320,7 +2320,7 @@ "aiw" = ( /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "aix" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -4023,7 +4023,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology Lower North"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd","xeno") }, /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, @@ -6615,7 +6615,7 @@ "avN" = ( /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "avO" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /turf/open/floor/iron, @@ -6948,7 +6948,7 @@ /obj/machinery/portable_atmospherics/canister/toxins, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "awO" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -6973,7 +6973,7 @@ /obj/machinery/camera{ c_tag = "Science - Lower Main North"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd") }, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, @@ -10565,7 +10565,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology Airlock"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd") }, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, @@ -12323,6 +12323,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/cable, /turf/open/floor/iron/white, /area/science/mixing) "aUv" = ( @@ -14163,7 +14164,7 @@ /obj/machinery/camera{ c_tag = "Science - Lobby"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd") }, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white, @@ -15763,7 +15764,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "bZi" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot, @@ -20120,6 +20121,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/science/mixing) "dKk" = ( @@ -21799,6 +21801,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/cable, /turf/open/floor/iron/white, /area/science/mixing) "esv" = ( @@ -22003,7 +22006,7 @@ /obj/machinery/camera{ c_tag = "Science - Toxins North"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron, /area/science/mixing) @@ -22804,7 +22807,8 @@ }, /obj/machinery/camera/motion{ c_tag = "Secure - AI Upload Access"; - dir = 5 + dir = 5; + network = list("ss13","aiupload") }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) @@ -23106,7 +23110,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "eVL" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -24540,7 +24544,7 @@ /obj/machinery/computer/security/telescreen{ dir = 1; name = "Science Camera Monitor"; - network = list("ss13","science"); + network = list("ss13","rd"); pixel_y = -28 }, /turf/open/floor/iron, @@ -26617,6 +26621,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/research) "gqc" = ( @@ -28850,7 +28855,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology West"; dir = 5; - network = list("ss13","science") + network = list("ss13","rd","xeno") }, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -29000,6 +29005,9 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engineering/break_room) +"hir" = ( +/turf/open/floor/iron, +/area/science/storage) "hiz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30048,6 +30056,9 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/service/bar) +"hDo" = ( +/turf/closed/wall/r_wall, +/area/science/storage) "hDp" = ( /obj/item/shovel, /obj/item/storage/bag/ore, @@ -30297,6 +30308,15 @@ }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) +"hIv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/science/mixing) "hIw" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder{ @@ -30590,7 +30610,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology Lower East"; dir = 8; - network = list("ss13","science") + network = list("ss13","rd","xeno") }, /turf/open/floor/iron/dark, /area/science/xenobiology) @@ -33198,7 +33218,7 @@ /obj/machinery/camera{ c_tag = "Science - Security Outpost"; dir = 1; - network = list("ss13","science","Security") + network = list("ss13","rd","Security") }, /obj/effect/landmark/start/depsec/science, /obj/structure/reagent_dispensers/peppertank/directional/south, @@ -34209,7 +34229,7 @@ /obj/machinery/camera{ c_tag = "Science - Research Director's Office"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /obj/machinery/light/directional/north, /obj/item/folder/white, @@ -34378,7 +34398,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/scrubber/huge, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "joB" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -34579,7 +34599,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "jsj" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 10 @@ -35218,6 +35238,10 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"jFU" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/science/storage) "jGh" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -35816,7 +35840,7 @@ /obj/machinery/camera{ c_tag = "Science - Toxins Burn Chamber"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/engine, /area/science/mixing/chamber) @@ -35988,7 +36012,7 @@ /obj/machinery/camera{ c_tag = "Science - Lower Power Hatch"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/plating, /area/maintenance/central/secondary) @@ -36790,7 +36814,7 @@ /obj/machinery/camera{ c_tag = "Science - Restroom"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/freezer, /area/science/research) @@ -37521,7 +37545,7 @@ /obj/machinery/camera{ c_tag = "Science - Main Lower Right"; dir = 5; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/research) @@ -37696,7 +37720,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "kxu" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -38615,7 +38639,7 @@ /obj/machinery/camera{ c_tag = "Science - Left Entry Airlock"; dir = 5; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron, /area/science/research) @@ -38625,7 +38649,7 @@ /obj/machinery/camera{ c_tag = "Science - Toxins Launch Room"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron, /area/science/mixing) @@ -39743,8 +39767,9 @@ name = "Circuit Laboratory"; req_access_txt = "47" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, -/area/maintenance/starboard/secondary) +/area/science/misc_lab) "lll" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -41330,7 +41355,7 @@ /obj/machinery/camera{ c_tag = "Science - Cytology Lab"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/cytology) @@ -41556,8 +41581,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "lWe" = ( /obj/effect/loot_site_spawner, /obj/item/relic, @@ -41875,7 +41901,7 @@ /obj/machinery/camera{ c_tag = "Science - Mech Bay"; dir = 5; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/circuit, /area/science/robotics/mechbay) @@ -42213,6 +42239,13 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"mlx" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/power/apc/auto_name/south, +/obj/structure/cable, +/turf/open/floor/iron, +/area/science/storage) "mlz" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -44455,7 +44488,7 @@ /obj/machinery/camera{ c_tag = "Science - Main Upper Left"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/research) @@ -44643,7 +44676,7 @@ /obj/machinery/camera{ c_tag = "Science - Lower Main South"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/white, @@ -45647,7 +45680,7 @@ /obj/machinery/camera{ c_tag = "Science - Experimentor Lab Testing Range"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/engine, /area/science/explab) @@ -47124,6 +47157,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/science/misc_lab) "omZ" = ( @@ -47383,7 +47417,7 @@ /obj/structure/cable, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, -/area/science/misc_lab) +/area/maintenance/starboard/secondary) "orw" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/effect/decal/cleanable/dirt, @@ -47486,7 +47520,7 @@ /obj/machinery/camera{ c_tag = "Science - Main Lower Left"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/research) @@ -47897,7 +47931,7 @@ /obj/machinery/camera{ c_tag = "Science - Cytology Pen"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/engine, /area/science/cytology) @@ -48139,7 +48173,7 @@ /obj/machinery/camera{ c_tag = "Science - Robotics North"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/dark, @@ -49072,7 +49106,7 @@ /obj/machinery/camera{ c_tag = "Science - AI Station Access"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron, /area/science/research) @@ -49422,9 +49456,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, /obj/machinery/airalarm/directional/north, /obj/structure/cable, /turf/open/floor/iron, @@ -49585,6 +49616,11 @@ dir = 10 }, /obj/machinery/module_duplicator, +/obj/machinery/camera{ + c_tag = "Circuits Lab"; + dir = 4; + network = list("ss13","rd") + }, /turf/open/floor/iron, /area/science/misc_lab) "pil" = ( @@ -50103,7 +50139,7 @@ /obj/machinery/camera{ c_tag = "Science - Upper Power Hatch"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/plating, /area/science/research) @@ -50332,6 +50368,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/science/mixing) "pwP" = ( @@ -50445,7 +50482,7 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/light/directional/west, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "pzD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50547,8 +50584,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor/heavy, +/obj/structure/cable, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "pCt" = ( /obj/structure/window/reinforced{ pixel_y = 2 @@ -54634,7 +54672,7 @@ /obj/machinery/camera{ c_tag = "Science - Main Central"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/research) @@ -55000,7 +55038,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology Kill Room"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd","xeno") }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) @@ -55037,7 +55075,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology South"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd","xeno") }, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -55045,7 +55083,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology Lower Containment Chamber"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd","xeno") }, /turf/open/floor/engine, /area/science/xenobiology) @@ -55116,7 +55154,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology Lower South"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd","xeno") }, /turf/open/floor/iron/dark, /area/science/xenobiology) @@ -55365,7 +55403,7 @@ /obj/machinery/camera{ c_tag = "Science - Toxins Misc Storage"; dir = 8; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron, /area/science/mixing) @@ -56718,7 +56756,7 @@ /obj/machinery/camera{ c_tag = "Science - Server Room"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/dark, /area/science/server) @@ -57031,7 +57069,7 @@ /obj/machinery/camera{ c_tag = "Science - Experimentor Lab"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/explab) @@ -58433,7 +58471,7 @@ /obj/machinery/camera{ c_tag = "Science - Main Upper Right"; dir = 5; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/research) @@ -58643,6 +58681,7 @@ /obj/structure/disposalpipe/junction/flip{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/science/mixing) "sOF" = ( @@ -59540,7 +59579,7 @@ /obj/machinery/camera{ c_tag = "Science - Maintenance Intersection"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd") }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 @@ -59692,10 +59731,10 @@ /obj/machinery/camera{ c_tag = "Science - Toxins Canister Storage"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "tiB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60292,8 +60331,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "tsF" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/decal/cleanable/dirt, @@ -60352,7 +60392,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology Lower West"; dir = 4; - network = list("ss13","science") + network = list("ss13","rd","xeno") }, /turf/open/floor/iron/dark, /area/science/xenobiology) @@ -61190,6 +61230,10 @@ }, /turf/open/floor/iron/dark, /area/command/gateway) +"tJT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/science/storage) "tJX" = ( /obj/machinery/lapvend, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -61234,7 +61278,7 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/light/directional/east, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "tKy" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -61862,7 +61906,7 @@ /obj/machinery/camera{ c_tag = "Science - Main AI Access Hall"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/research) @@ -62437,6 +62481,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 9 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/science/research) "ufF" = ( @@ -65486,7 +65531,7 @@ /obj/machinery/camera{ c_tag = "Science - Right Entry Airlock"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron, /area/science/research) @@ -65539,7 +65584,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron, -/area/science/mixing) +/area/science/storage) "vvI" = ( /obj/machinery/duct, /obj/structure/cable, @@ -66212,7 +66257,7 @@ /obj/machinery/camera{ c_tag = "Science - Toxins South"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron, /area/science/mixing) @@ -66801,7 +66846,7 @@ /obj/machinery/camera{ c_tag = "Science - AI Station Access Exterior"; dir = 1; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron, /area/science/research) @@ -67385,7 +67430,7 @@ /obj/machinery/camera{ c_tag = "Science - Genetics"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/dark, /area/science/genetics) @@ -67831,7 +67876,7 @@ /obj/machinery/camera{ c_tag = "Science - Xenobiology East"; dir = 9; - network = list("ss13","science") + network = list("ss13","rd","xeno") }, /turf/open/floor/iron/white, /area/science/xenobiology) @@ -68628,7 +68673,7 @@ /obj/machinery/camera{ c_tag = "Science - Research & Development"; dir = 6; - network = list("ss13","science") + network = list("ss13","rd") }, /turf/open/floor/iron/white, /area/science/lab) @@ -70614,6 +70659,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/science/mixing) "xmN" = ( @@ -71437,6 +71483,7 @@ /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/white, /area/science/mixing) "xDE" = ( @@ -118731,13 +118778,13 @@ aHI veY adS adS -mSi -mSi -mSi -mSi -mSi -mSi -mSi +hDo +hDo +hDo +hDo +hDo +hDo +hDo fbR wUd sOv @@ -118988,13 +119035,13 @@ jlO sct adS aae -mSi +hDo jor jrY pzh vvo -vvo -mSi +mlx +hDo fbR fKH pwI @@ -119010,7 +119057,7 @@ aRL aRL aRL aRL -sQi +aRL der der der @@ -119245,13 +119292,13 @@ osD exW adS aae -mSi +hDo avN -frL -hWi -hWi +jFU +hir +hir lVH -mSi +hDo plm iPd xmK @@ -119502,16 +119549,16 @@ adS adS adS aae -mSi +hDo tiz -okR -okR -okR +tJT +tJT +tJT tsp pCs -tls -tls -tls +hIv +hIv +hIv tls vVz cbi @@ -119759,13 +119806,13 @@ aae aae aae aae -mSi +hDo kxo kxo -hWi -hWi +hir +hir aiw -mSi +hDo okC ewK ako @@ -120016,13 +120063,13 @@ aae aae aae aae -mSi +hDo jor kxo eVK bYW awN -mSi +hDo mSi mSi mSi @@ -120273,13 +120320,13 @@ aae aae aae aae -mSi +hDo jor kxo tKp bYW bYW -mSi +hDo fYH fYH axo @@ -120530,13 +120577,13 @@ aae aae aae aae -mSi -mSi -mSi -mSi -mSi -mSi -mSi +hDo +hDo +hDo +hDo +hDo +hDo +hDo fYH fjs hWi diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index da0bbdc2a3f..53b2cbcef35 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -317,7 +317,7 @@ /obj/machinery/computer/security/telescreen/rd name = "\improper Research Director's telescreen" desc = "Used for watching the AI and the RD's goons from the safety of his office." - network = list("rd", "aicore", "aiupload", "minisat", "xeno", "test") + network = list("rd", "aicore", "aiupload", "minisat", "xeno", "test", "toxins") /obj/machinery/computer/security/telescreen/research name = "research telescreen"