diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index bc56a399d981..7947cdf9d3cc 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -69452,20 +69452,27 @@ /area/station/commons/dorms) "nzA" = ( /obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/storage/box/disks_nanite, -/obj/item/storage/box/disks_nanite, -/obj/item/storage/box/disks_nanite, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, -/obj/item/nanite_remote, -/obj/item/nanite_remote, -/obj/item/nanite_remote, +/obj/item/storage/box/disks_nanite{ + pixel_x = 1; + pixel_y = 16 + }, +/obj/item/storage/box/disks_nanite{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/storage/box/disks_nanite{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/storage/box/nanitecontrol{ + pixel_x = 0; + pixel_y = 21 + }, /obj/structure/railing/wood, /turf/open/floor/wood/large, /area/station/science/circuits) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 1447f3f00ecd..6b434f4033dd 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8355,14 +8355,7 @@ "cMv" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/table/glass, -/obj/item/nanite_scanner{ - pixel_x = -4; - pixel_y = -2 - }, -/obj/item/nanite_remote{ - pixel_y = 6; - pixel_x = 5 - }, +/obj/item/storage/box/nanitecontrol, /turf/open/floor/iron/white, /area/station/science/research) "cMy" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 636e928a1c46..80291eaf277f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -17810,10 +17810,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table, /obj/item/mmi, -/obj/item/nanite_remote, -/obj/item/nanite_remote, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, /obj/item/multitool{ pixel_x = -4; pixel_y = 2 @@ -65379,12 +65375,22 @@ /area/station/science/xenobiology) "pDi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, /obj/structure/table, /obj/machinery/newscaster/directional/west, -/obj/item/storage/box/disks_nanite, -/obj/item/storage/box/disks_nanite, +/obj/item/storage/box/disks_nanite{ + pixel_x = -6; + pixel_y = 12 + }, +/obj/item/storage/box/disks_nanite{ + pixel_x = -7; + pixel_y = 12 + }, +/obj/item/storage/box/nanitecontrol{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, /turf/open/floor/iron/dark, /area/station/science/circuits) "pDt" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 7ab56793b048..04611d225f25 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -12443,12 +12443,18 @@ "dOK" = ( /obj/structure/sign/poster/official/random/directional/south, /obj/structure/table, -/obj/item/storage/box/disks_nanite, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, -/obj/item/nanite_remote, -/obj/item/nanite_remote, -/obj/item/storage/box/disks_nanite, +/obj/item/storage/box/disks_nanite{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/storage/box/disks_nanite{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/storage/box/nanitecontrol{ + pixel_x = 0; + pixel_y = 18 + }, /turf/open/floor/iron, /area/station/science/explab) "dOY" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index c4b77cdb3ff9..00d6056b7030 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -41855,9 +41855,14 @@ dir = 4 }, /obj/structure/table, -/obj/item/storage/box/disks_nanite, -/obj/item/nanite_scanner, -/obj/item/nanite_remote, +/obj/item/storage/box/disks_nanite{ + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/storage/box/nanitecontrol{ + pixel_x = 8; + pixel_y = 9 + }, /turf/open/floor/iron/dark, /area/station/science/research) "naG" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 34eb00157334..fdfae70b23a3 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3119,14 +3119,18 @@ network = list("ss13","rd") }, /obj/structure/table/reinforced, -/obj/item/storage/box/disks_nanite, /obj/item/storage/box/disks_nanite{ - pixel_y = 4 + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/storage/box/nanitecontrol{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/storage/box/disks_nanite{ + pixel_y = 3; + pixel_x = -6 }, -/obj/item/nanite_remote, -/obj/item/nanite_remote, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, /obj/effect/turf_decal/tile/purple/half{ dir = 1 }, diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index 0433af9e8ab1..00f0130d36b8 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -26711,13 +26711,30 @@ "hWY" = ( /obj/structure/table/glass, /obj/effect/turf_decal/stripes/line, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, -/obj/item/storage/box/disks_nanite, -/obj/item/storage/box/disks_nanite, -/obj/item/storage/box/disks_nanite, +/obj/item/storage/box/disks_nanite{ + pixel_x = -7; + pixel_y = 14 + }, +/obj/item/storage/box/disks_nanite{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/storage/box/nanitecontrol{ + pixel_x = -7; + pixel_y = 19 + }, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/folder/white{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = 8; + pixel_y = 7 + }, /turf/open/floor/iron/dark/small, /area/station/science/circuits) "hWZ" = ( @@ -32059,6 +32076,7 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/machinery/modular_computer/preset/cargochat/science, /turf/open/floor/iron/white/diagonal, /area/station/science/breakroom) "jzW" = ( @@ -35454,11 +35472,11 @@ /turf/open/floor/iron, /area/station/engineering/lobby) "kxN" = ( -/obj/machinery/photocopier, -/obj/effect/turf_decal/bot, /obj/structure/railing{ dir = 1 }, +/obj/machinery/photocopier, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/science/circuits) "kxX" = ( @@ -43545,20 +43563,8 @@ /area/station/science/xenobiology) "mMG" = ( /obj/machinery/airalarm/directional/west, -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 4 - }, /obj/machinery/light_switch/directional/north, +/obj/machinery/computer/nanite_chamber_control, /turf/open/floor/iron/dark/small, /area/station/science/circuits) "mMK" = ( @@ -75984,7 +75990,7 @@ dir = 4 }, /obj/effect/turf_decal/box, -/obj/machinery/modular_computer/preset/cargochat/science, +/obj/machinery/nanite_chamber, /turf/open/floor/iron/dark/small, /area/station/science/circuits) "wtk" = ( diff --git a/_maps/map_files/Theseus/Theseus.dmm b/_maps/map_files/Theseus/Theseus.dmm index d9275e5d8f69..21cad0721b50 100644 --- a/_maps/map_files/Theseus/Theseus.dmm +++ b/_maps/map_files/Theseus/Theseus.dmm @@ -69458,9 +69458,9 @@ pixel_y = 10; pixel_x = 6 }, -/obj/item/storage/box/disks_nanite{ - pixel_y = 2; - pixel_x = 10 +/obj/item/storage/box/nanitecontrol{ + pixel_x = 10; + pixel_y = 2 }, /turf/open/floor/iron/dark/side, /area/station/science/circuits) diff --git a/_maps/map_files/Voidraptor/VoidRaptor.dmm b/_maps/map_files/Voidraptor/VoidRaptor.dmm index 06fc443218da..94afc11a7477 100644 --- a/_maps/map_files/Voidraptor/VoidRaptor.dmm +++ b/_maps/map_files/Voidraptor/VoidRaptor.dmm @@ -620,7 +620,7 @@ /turf/open/floor/iron/white/textured_edge{ dir = 4 }, -/area/station/science/auxlab) +/area/station/science/circuits) "ail" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -635,7 +635,7 @@ "air" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, -/area/station/science/auxlab) +/area/station/science/circuits) "aiw" = ( /obj/structure/chair/office{ color = "#B11111"; @@ -4750,7 +4750,7 @@ /area/station/service/kitchen/coldroom) "bsI" = ( /turf/closed/wall/r_wall, -/area/station/science/auxlab) +/area/station/science/circuits) "btc" = ( /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -5350,6 +5350,15 @@ dir = 8 }, /area/station/hallway/secondary/command) +"bAG" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/purple/filled/line, +/turf/open/floor/iron/white/textured_edge{ + dir = 1 + }, +/area/station/science/auxlab) "bAI" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -6215,7 +6224,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/auxlab) +/area/station/science/circuits) "bPq" = ( /obj/structure/flora/grass/jungle, /obj/structure/window/fulltile, @@ -6284,6 +6293,18 @@ "bQF" = ( /turf/open/floor/iron/textured, /area/station/maintenance/department/science/ordnance_maint) +"bQR" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/nanite_chamber, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/west, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/white/textured_edge{ + dir = 4 + }, +/area/station/science/auxlab) "bQT" = ( /obj/machinery/door/airlock/public/glass{ name = "Laundry Room" @@ -7322,6 +7343,13 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/aft/greater) +"ciH" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/white/textured, +/area/station/science/auxlab) "ciL" = ( /obj/structure/railing{ dir = 1 @@ -7798,7 +7826,7 @@ /turf/open/floor/iron/white/textured_edge{ dir = 4 }, -/area/station/science/auxlab) +/area/station/science/circuits) "cqz" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8; @@ -7881,7 +7909,7 @@ /obj/machinery/holopad, /obj/effect/turf_decal/bot, /turf/open/floor/iron/white/textured_large, -/area/station/science/auxlab) +/area/station/science/circuits) "csp" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -16705,13 +16733,9 @@ }, /area/station/commons/storage/primary) "eOF" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white/textured_large, +/area/station/science/auxlab) "eOK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19854,6 +19878,14 @@ }, /turf/open/floor/iron/textured_corner, /area/station/cargo/storage) +"fOn" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/white/textured_edge{ + dir = 1 + }, +/area/station/science/auxlab) "fOp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21239,12 +21271,11 @@ /turf/closed/wall, /area/station/cargo/warehouse) "giY" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/open/floor/plating, -/area/station/science/research) +/turf/closed/wall, +/area/station/science/auxlab) "gjj" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/modular_computer/preset/research, @@ -21993,7 +22024,7 @@ /turf/open/floor/iron/white/textured_edge{ dir = 4 }, -/area/station/science/auxlab) +/area/station/science/circuits) "gtE" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -22666,7 +22697,7 @@ /turf/open/floor/iron/white/textured_edge{ dir = 1 }, -/area/station/science/auxlab) +/area/station/science/circuits) "gDf" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/artifact_spawner, @@ -24270,6 +24301,17 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/textured, /area/station/maintenance/aft/lesser) +"gZC" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/machinery/door/airlock/research{ + name = "Aux Nanite Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/textured_large, +/area/station/science/auxlab) "gZD" = ( /obj/machinery/oven/range, /turf/open/floor/iron/kitchen, @@ -24930,6 +24972,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/crew_quarters/bar) +"hiL" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/machinery/nanite_programmer, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/white/textured_edge{ + dir = 8 + }, +/area/station/science/auxlab) "hiN" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/suit_storage_unit/hos, @@ -28595,11 +28647,11 @@ /area/station/command/heads_quarters/cmo) "imh" = ( /obj/structure/sign/departments/xenobio/directional/west, -/obj/item/kirbyplants/monkey, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/effect/turf_decal/tile/purple/diagonal_centre, +/obj/item/kirbyplants/random, /turf/open/floor/iron/white/diagonal, /area/station/science/research) "imt" = ( @@ -33322,6 +33374,22 @@ dir = 4 }, /area/station/cargo/storage) +"jxf" = ( +/obj/machinery/computer/nanite_chamber_control{ + dir = 4 + }, +/obj/machinery/computer/nanite_chamber_control{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/white/textured_edge{ + dir = 4 + }, +/area/station/science/auxlab) "jxh" = ( /obj/structure/table/wood/fancy, /obj/item/flashlight/flare/candle{ @@ -34089,7 +34157,7 @@ dir = 4 }, /turf/open/floor/iron/white, -/area/station/science/auxlab) +/area/station/science/circuits) "jGM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -34830,7 +34898,7 @@ }, /obj/machinery/computer/department_orders/science, /turf/open/floor/iron/textured_large, -/area/station/science/auxlab) +/area/station/science/circuits) "jSm" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -36133,8 +36201,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, -/area/station/science/research) +/turf/open/floor/iron/white/textured_large, +/area/station/science/auxlab) "kmR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36533,12 +36601,9 @@ }, /area/station/maintenance/disposal/incinerator) "ksV" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 6 - }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/textured_large, +/area/station/science/auxlab) "kth" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -39986,14 +40051,9 @@ }, /area/station/hallway/secondary/command) "lnJ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/closet/crate, -/obj/item/binoculars, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/holopad, +/turf/open/floor/iron/white/textured_large, +/area/station/science/auxlab) "lnK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -44801,12 +44861,14 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/science/ordnance_maint) "mHy" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/maintenance/department/science/ordnance_maint) +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/machinery/nanite_program_hub, +/turf/open/floor/iron/white/textured_edge{ + dir = 8 + }, +/area/station/science/auxlab) "mHA" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/machinery/light/small/directional/east, @@ -44988,7 +45050,7 @@ dir = 1 }, /turf/open/floor/iron/white/textured_large, -/area/station/science/auxlab) +/area/station/science/circuits) "mJA" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom{ dir = 4 @@ -45407,7 +45469,7 @@ /area/station/security/execution/transfer) "mOD" = ( /turf/closed/wall, -/area/station/science/auxlab) +/area/station/science/circuits) "mOL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -46065,7 +46127,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light_switch/directional/east, -/obj/item/kirbyplants/monkey, /obj/machinery/camera/directional/east{ c_tag = "Research Division - Circuits Lab"; name = "science camera"; @@ -46074,7 +46135,7 @@ /turf/open/floor/iron/white/textured_edge{ dir = 8 }, -/area/station/science/auxlab) +/area/station/science/circuits) "mXv" = ( /obj/machinery/atmospherics/components/unary/artifact_heatingpad{ dir = 4 @@ -50767,6 +50828,17 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) +"ooO" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Research Maintenance" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/obj/machinery/door/firedoor, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/science/auxlab) "ooU" = ( /obj/machinery/door/airlock/medical{ name = "Exam Room" @@ -51419,8 +51491,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/floor/plating, -/area/station/science/research) +/turf/open/floor/iron/white/textured_large, +/area/station/science/auxlab) "oxA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -53508,6 +53580,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/textured_large, /area/station/science/ordnance/testlab) +"paQ" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 10 + }, +/obj/structure/sign/poster/random/directional/west, +/turf/open/floor/iron/white/textured, +/area/station/science/auxlab) "paS" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /obj/machinery/meter, @@ -55959,6 +56042,41 @@ /obj/effect/turf_decal/bot, /turf/open/floor/wood/large, /area/station/command/heads_quarters/nt_rep) +"pIl" = ( +/obj/structure/table, +/obj/item/poster/random_official{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/binoculars{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/binoculars{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/storage/box/disks_nanite{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/storage/box/disks_nanite{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/storage/box/nanitecontrol{ + pixel_x = 7; + pixel_y = 18 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/white/textured_edge{ + dir = 8 + }, +/area/station/science/auxlab) "pIm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58250,7 +58368,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured_large, -/area/station/science/auxlab) +/area/station/science/circuits) "qmd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58903,6 +59021,14 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/main) +"qvI" = ( +/obj/machinery/camera/autoname/directional/south, +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/iron/white/textured_edge{ + dir = 1 + }, +/area/station/science/auxlab) "qvU" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -62710,6 +62836,15 @@ /obj/effect/spawner/random/structure/table_or_rack, /turf/open/floor/iron/textured, /area/station/maintenance/department/science/xenobiology) +"rzF" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/textured_edge{ + dir = 1 + }, +/area/station/science/auxlab) "rzK" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ @@ -63895,6 +64030,13 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/security/range) +"rRD" = ( +/obj/machinery/computer/nanite_cloud_controller, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/white/textured, +/area/station/science/auxlab) "rRL" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/blue/filled/line, @@ -63924,13 +64066,9 @@ /turf/open/floor/wood/large, /area/station/commons/fitness/recreation/entertainment) "rSu" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 9 - }, -/obj/machinery/vending/coffee, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white/textured_large, +/area/station/science/auxlab) "rSz" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -64757,6 +64895,9 @@ }, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) +"seQ" = ( +/turf/open/floor/iron/white/textured_large, +/area/station/science/auxlab) "sfc" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -67023,6 +67164,13 @@ /obj/structure/table, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/service) +"sJU" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/space_heater, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/textured, +/area/station/maintenance/department/science/ordnance_maint) "sKs" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/catwalk_floor/iron_smooth, @@ -70048,7 +70196,7 @@ /obj/effect/landmark/start/scientist, /obj/structure/cable, /turf/open/floor/iron/white/textured_large, -/area/station/science/auxlab) +/area/station/science/circuits) "twB" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron/textured_large, @@ -70271,7 +70419,7 @@ /turf/open/floor/iron/white/textured_edge{ dir = 8 }, -/area/station/science/auxlab) +/area/station/science/circuits) "tzl" = ( /obj/machinery/door/airlock/security{ name = "Interrogation" @@ -72299,7 +72447,7 @@ /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/door/firedoor, /turf/open/floor/iron/white/textured_large, -/area/station/science/auxlab) +/area/station/science/circuits) "ueO" = ( /obj/structure/closet/toolcloset, /obj/item/clothing/glasses/meson/engine, @@ -73163,7 +73311,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured_edge, -/area/station/science/auxlab) +/area/station/science/circuits) "uqX" = ( /obj/structure/sign/poster/contraband/random/directional/south, /obj/effect/decal/cleanable/dirt, @@ -78121,7 +78269,7 @@ dir = 4 }, /turf/open/floor/iron/textured_large, -/area/station/science/auxlab) +/area/station/science/circuits) "vJY" = ( /obj/effect/landmark/start/scientist, /obj/structure/cable, @@ -78202,7 +78350,7 @@ /obj/effect/turf_decal/bot, /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/white, -/area/station/science/auxlab) +/area/station/science/circuits) "vLm" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/random/maintenance, @@ -78658,7 +78806,7 @@ /turf/open/floor/iron/white/textured_edge{ dir = 8 }, -/area/station/science/auxlab) +/area/station/science/circuits) "vSf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, @@ -80685,7 +80833,7 @@ /obj/structure/sign/warning/electric_shock/directional/south, /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, -/area/station/science/auxlab) +/area/station/science/circuits) "wuo" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 @@ -84041,12 +84189,14 @@ /turf/open/floor/iron/grimy, /area/station/hallway/primary/central/fore) "xsF" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/office{ + dir = 8 }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/white/textured_large, +/area/station/science/auxlab) "xsG" = ( /turf/closed/wall/r_wall, /area/station/maintenance/aft/greater) @@ -84657,6 +84807,17 @@ }, /turf/open/floor/iron/textured, /area/station/engineering/main) +"xCE" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white/textured_corner{ + dir = 8 + }, +/area/station/science/auxlab) "xCF" = ( /turf/open/floor/iron/textured_large, /area/station/cargo/miningoffice) @@ -110963,8 +111124,8 @@ kVR pkN qQb eyy -uvj -uvj +eyy +eyy lpz eFQ enW @@ -111220,10 +111381,10 @@ ogB saE xSc oxv -ttw -uvj -uvj -mHy +ciH +eyy +sJU +qwH qwH qwH opy @@ -111476,12 +111637,12 @@ eDt ogB rOA rOA -kmM -ttw -xMq -uvj -uvj -uvj +gZC +bAG +eyy +eyy +eyy +eyy bDW dHs eFQ @@ -111734,11 +111895,11 @@ uuC rOA dcd kmM -ttw -xMq -ttw -ttw -mbJ +xCE +bQR +jxf +paQ +eyy eFQ oKR vvr @@ -111991,11 +112152,11 @@ rOA rOA rOA kmM -ttw +seQ rSu xsF -xMq -uvj +rzF +ooO lKX oBd uvj @@ -112248,11 +112409,11 @@ mwP rOA rOA kmM -ttw +seQ lnJ -odJ -ttw -mbJ +ksV +fOn +eyy eFQ rcf uvj @@ -112505,11 +112666,11 @@ ogB dcd rOA kmM -ttw +seQ eOF ksV -xMq -uvj +qvI +eyy rWs uvj uvj @@ -112762,11 +112923,11 @@ ogB juQ jfZ giY -ttw -xMq -ttw -ttw -rpk +pIl +mHy +hiL +rRD +hfE aUu aiq wjI @@ -113020,10 +113181,10 @@ kZs loJ ohH hfE -wjI -wjI -wjI -wjI +hfE +hfE +hfE +hfE dTz lQf wjI diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index ea0799b0b000..ea30b723afab 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -15232,18 +15232,25 @@ pixel_y = -3 }, /obj/item/computer_disk{ - pixel_x = -5; - pixel_y = 8 + pixel_x = -9; + pixel_y = 9 }, /obj/item/computer_disk/ordnance{ - pixel_x = 1 + pixel_x = -8; + pixel_y = 5 }, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, /obj/machinery/light/directional/north, -/obj/item/storage/box/disks_nanite, -/obj/item/storage/box/disks_nanite, +/obj/item/storage/box/disks_nanite{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/storage/box/disks_nanite{ + pixel_x = 6; + pixel_y = 1 + }, /turf/open/floor/iron/white, /area/station/science/ordnance/office) "dNT" = ( @@ -56155,19 +56162,19 @@ /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) "qPX" = ( -/obj/structure/table, -/obj/item/analyzer, +/obj/item/storage/box/nanitecontrol{ + pixel_x = -5; + pixel_y = 11 + }, /obj/item/book/manual/wiki/ordnance{ pixel_x = 5; pixel_y = 1 }, +/obj/item/analyzer, +/obj/structure/table, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, -/obj/item/nanite_scanner, -/obj/item/nanite_scanner, -/obj/item/nanite_remote, -/obj/item/nanite_remote, /turf/open/floor/iron/white, /area/station/science/ordnance/office) "qQc" = ( diff --git a/monkestation/code/game/objects/items/storage/boxes.dm b/monkestation/code/game/objects/items/storage/boxes.dm index 841d07c1f004..8467095234a1 100644 --- a/monkestation/code/game/objects/items/storage/boxes.dm +++ b/monkestation/code/game/objects/items/storage/boxes.dm @@ -24,3 +24,17 @@ /obj/item/storage/fancy/popsiclestick_pack/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/popsicle_stick)) + +/obj/item/storage/box/nanitecontrol + name = "Nanite Controller Box" + illustration = "disk_kit" + +/obj/item/storage/box/nanitecontrol/PopulateContents() + new /obj/item/nanite_remote(src) + new /obj/item/nanite_remote(src) + new /obj/item/nanite_remote(src) + new /obj/item/nanite_scanner(src) + new /obj/item/nanite_scanner(src) + new /obj/item/nanite_scanner(src) + ///obj/item/nanite_injector(src) + //coded out as its been on blueshift and noones had issues with it but there probably should be a discussion before added everywhere.