Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Voidraptor nanites #3609

Merged
merged 17 commits into from
Oct 15, 2024
Merged

Voidraptor nanites #3609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7444349
Pass one on voidraptor nanites
Gw0sty Sep 29, 2024
56c5447
Pass two + adding a remote box
Gw0sty Sep 29, 2024
7dbdaaf
adds controller boxes in place of all nanite remotes + missing nanite…
Gw0sty Sep 29, 2024
6f8aefe
Maybe not injectors yet
Gw0sty Sep 29, 2024
a988493
Undoing admin plushie commit
Gw0sty Sep 29, 2024
1dac0a1
Sorry Ben
Gw0sty Sep 29, 2024
bb4aee7
its too late
Gw0sty Sep 29, 2024
58a09b8
Well I got sleep
Gw0sty Sep 29, 2024
4cba271
If I had a knickle for every back slash I forgot
Gw0sty Sep 29, 2024
db215b4
Deleting someones else code is actually a bad thing
Gw0sty Sep 29, 2024
586f4b2
Firelocks
Gw0sty Sep 29, 2024
2d6c768
please
Gw0sty Sep 29, 2024
237c61c
lightbulb
Gw0sty Sep 29, 2024
4f57cba
Its done
Gw0sty Sep 29, 2024
54c3dd9
Merge remote-tracking branch 'upstream/master' into Voidraptor-nanites
Gw0sty Sep 30, 2024
b0ae86d
Woo theseus
Gw0sty Sep 30, 2024
3ff3320
Modularization
Gw0sty Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions _maps/map_files/Blueshift/Blueshift.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 1 addition & 8 deletions _maps/map_files/BoxStation/BoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
22 changes: 14 additions & 8 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" = (
Expand Down
18 changes: 12 additions & 6 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
11 changes: 8 additions & 3 deletions _maps/map_files/KiloStation/KiloStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
16 changes: 10 additions & 6 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
52 changes: 29 additions & 23 deletions _maps/map_files/Ouroboros/Ouroboros.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Theseus/Theseus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading
Loading