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

Jump to bottom

Botany/virology disks and book storages #3576

Merged
merged 9 commits into from
Sep 30, 2024
Merged

Botany/virology disks and book storages #3576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ba01209
Allow bio bags to pick up disease disks
Gw0sty Sep 27, 2024
d5a85d0
Adds disk extrapolators to every hydroponics and virology
Gw0sty Sep 27, 2024
16de707
Moves all the botanical and chicken encyplodias into a botany bookcase
Gw0sty Sep 27, 2024
bcd4542
Added pod cloning book to the botanies bookcase
Gw0sty Sep 27, 2024
80d9ed9
The smallest of spelling mistakes
Gw0sty Sep 27, 2024
7983215
Merge remote-tracking branch 'upstream/master' into Disks
Gw0sty Sep 30, 2024
170b44b
forgot a few books
Gw0sty Sep 30, 2024
e68fd3e
Merge remote-tracking branch 'upstream/master' into Disks
Gw0sty Sep 30, 2024
d60aa51
Theseus got merged. Congrats thesus!
Gw0sty Sep 30, 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
33 changes: 17 additions & 16 deletions _maps/map_files/Blueshift/Blueshift.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,16 +1989,13 @@
/area/station/hallway/primary/central)
"auS" = (
/obj/structure/table,
/obj/machinery/smartfridge/disks,
/obj/item/stack/package_wrap,
/obj/item/hand_labeler,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/green/filled/corner{
dir = 8
},
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/turf/open/floor/iron/dark/corner{
dir = 1
},
Expand Down Expand Up @@ -3960,6 +3957,10 @@
/obj/effect/turf_decal/trimline/green/filled/end{
dir = 4
},
/obj/machinery/smartfridge/disks{
pixel_x = 8;
pixel_y = 14
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
"aOe" = (
Expand Down Expand Up @@ -6306,8 +6307,18 @@
/area/station/medical/medbay/lobby)
"bmD" = (
/obj/structure/table/glass,
/obj/item/storage/bag/plants/portaseeder,
/obj/machinery/light/directional/east,
/obj/item/seeds/grape{
pixel_x = -6
},
/obj/item/seeds/lime{
pixel_x = 6
},
/obj/item/seeds/watermelon,
/obj/item/food/grown/wheat,
/obj/item/food/grown/watermelon,
/obj/item/food/grown/banana,
/obj/item/storage/bag/plants/portaseeder,
/turf/open/floor/iron/dark/side{
dir = 4
},
Expand Down Expand Up @@ -28103,18 +28114,8 @@
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
"fqR" = (
/obj/structure/table/glass,
/obj/item/seeds/lime{
pixel_x = 6
},
/obj/item/seeds/grape{
pixel_x = -6
},
/obj/item/seeds/watermelon,
/obj/item/food/grown/wheat,
/obj/item/food/grown/watermelon,
/obj/item/food/grown/banana,
/obj/structure/extinguisher_cabinet/directional/south,
/obj/structure/bookcase/manuals/botany,
/turf/open/floor/iron/dark/side{
dir = 4
},
Expand Down
37 changes: 13 additions & 24 deletions _maps/map_files/BoxStation/BoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14845,11 +14845,6 @@
/obj/item/clothing/suit/apron,
/obj/item/clothing/accessory/armband/hydro,
/obj/item/wrench,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/dark/side{
dir = 9
Expand Down Expand Up @@ -26733,6 +26728,7 @@
pixel_y = 13;
pixel_x = -9
},
/obj/machinery/smartfridge/disks,
/turf/open/floor/iron/white,
/area/station/medical/virology)
"iQd" = (
Expand Down Expand Up @@ -44145,6 +44141,7 @@
pixel_y = 10;
pixel_x = -5
},
/obj/machinery/feed_machine,
/turf/open/floor/iron/dark/side,
/area/station/service/hydroponics)
"oMG" = (
Expand Down Expand Up @@ -45455,22 +45452,7 @@
/obj/effect/turf_decal/tile/green/half/contrasted{
dir = 1
},
/obj/structure/table,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/storage/bag/egg,
/obj/item/storage/bag/egg,
/obj/item/storage/bag/egg,
/obj/item/storage/bag/egg,
/obj/item/storage/bag/egg,
/obj/structure/bookcase/manuals/botany,
/turf/open/floor/iron/dark/side,
/area/station/service/hydroponics)
"pmr" = (
Expand Down Expand Up @@ -65933,9 +65915,16 @@
/obj/machinery/camera/autoname/directional/south,
/obj/item/radio/intercom/directional/south,
/obj/structure/table,
/obj/machinery/feed_machine{
pixel_y = 4
},
/obj/item/storage/bag/egg,
/obj/item/storage/bag/egg,
/obj/item/storage/bag/egg,
/obj/item/storage/bag/egg,
/obj/item/storage/bag/egg,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/turf/open/floor/iron/dark/side,
/area/station/service/hydroponics)
"wbA" = (
Expand Down
15 changes: 4 additions & 11 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51878,11 +51878,6 @@
/area/station/commons/storage/tools)
"mnA" = (
/obj/structure/table/glass,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
Expand Down Expand Up @@ -59760,6 +59755,7 @@
"oiZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/structure/bookcase/manuals/botany,
/turf/open/floor/iron,
/area/station/service/hydroponics)
"ojb" = (
Expand Down Expand Up @@ -66389,6 +66385,7 @@
dir = 9
},
/obj/machinery/light/small/directional/west,
/obj/item/paper_bin,
/obj/item/clothing/gloves/latex,
/obj/item/clothing/neck/stethoscope,
/turf/open/floor/iron/white,
Expand Down Expand Up @@ -72453,6 +72450,7 @@
/obj/item/radio/intercom/directional/south,
/obj/structure/table/glass,
/obj/item/food/grown/poppy/geranium,
/obj/machinery/smartfridge/disks,
/turf/open/floor/iron,
/area/station/service/hydroponics)
"rlQ" = (
Expand Down Expand Up @@ -80914,11 +80912,6 @@
/obj/machinery/light_switch/directional/south{
pixel_x = 8
},
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/turf/open/floor/iron/checker,
/area/station/service/hydroponics)
"tpE" = (
Expand Down Expand Up @@ -101123,9 +101116,9 @@
},
/obj/machinery/status_display/evac/directional/east,
/obj/structure/table/glass,
/obj/item/paper_bin,
/obj/item/folder/white,
/obj/item/pen/red,
/obj/machinery/smartfridge/disks,
/turf/open/floor/iron,
/area/station/medical/pathology)
"yeZ" = (
Expand Down
17 changes: 4 additions & 13 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5918,6 +5918,7 @@
/obj/structure/table,
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/tile/green/full,
/obj/machinery/smartfridge/disks,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/pathology)
"bPP" = (
Expand Down Expand Up @@ -19222,6 +19223,7 @@
},
/obj/machinery/light/directional/north,
/obj/structure/table/glass,
/obj/machinery/smartfridge/disks,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"gbH" = (
Expand Down Expand Up @@ -30879,11 +30881,6 @@
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/chicken_scanner,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/machinery/light/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
Expand Down Expand Up @@ -45145,17 +45142,13 @@
/obj/effect/turf_decal/siding/white{
dir = 5
},
/obj/item/watertank,
/obj/item/cultivator,
/obj/item/plant_analyzer,
/obj/effect/turf_decal/tile/green/opposingcorners{
dir = 1
},
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/turf/open/floor/iron,
/area/station/service/hydroponics)
"opu" = (
Expand Down Expand Up @@ -61088,9 +61081,7 @@
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors/nospawn)
"tCs" = (
/obj/structure/table,
/obj/item/book/manual/hydroponics_pod_people,
/obj/item/watertank,
/obj/structure/bookcase/manuals/botany,
/turf/open/floor/iron,
/area/station/service/hydroponics)
"tCx" = (
Expand Down
35 changes: 17 additions & 18 deletions _maps/map_files/KiloStation/KiloStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17666,7 +17666,6 @@
/obj/effect/turf_decal/trimline/green/end{
dir = 8
},
/obj/item/book/manual/botanical_lexicon,
/turf/open/floor/iron,
/area/station/service/hydroponics)
"fBt" = (
Expand Down Expand Up @@ -26967,6 +26966,10 @@
dir = 4
},
/obj/effect/turf_decal/bot,
/obj/machinery/smartfridge/disks{
pixel_x = -4;
pixel_y = 16
},
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"ipq" = (
Expand Down Expand Up @@ -30635,9 +30638,6 @@
/area/station/security/execution/transfer)
"jrr" = (
/obj/structure/table,
/obj/item/book/manual/hydroponics_pod_people{
pixel_y = 4
},
/obj/item/paper/guides/jobs/hydroponics,
/obj/item/reagent_containers/dropper,
/obj/effect/turf_decal/tile/green{
Expand All @@ -30648,11 +30648,6 @@
},
/obj/effect/turf_decal/bot,
/obj/item/toy/figure/botanist,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/item/book/manual/botanical_lexicon,
/obj/machinery/plantgenes,
/turf/open/floor/iron,
/area/station/service/hydroponics)
Expand Down Expand Up @@ -40519,10 +40514,6 @@
"mFm" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/obj/structure/table/glass,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/book/manual/chicken_encyclopedia,
/obj/item/chicken_scanner{
pixel_x = 6
},
Expand Down Expand Up @@ -46530,15 +46521,18 @@
/turf/open/floor/carpet/green,
/area/station/maintenance/port/greater)
"oFC" = (
/obj/structure/table,
/obj/item/storage/box/syringes{
pixel_y = 2
pixel_y = 23;
pixel_x = -7
},
/obj/item/storage/box/beakers{
pixel_x = 4;
pixel_y = 6
pixel_x = -1;
pixel_y = 22
},
/obj/item/hand_labeler{
pixel_x = 7;
pixel_y = 17
},
/obj/item/hand_labeler,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
Expand All @@ -46551,6 +46545,7 @@
name = "hydroponics camera"
},
/obj/effect/turf_decal/bot,
/obj/structure/bookcase/manuals/botany,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"oGo" = (
Expand Down Expand Up @@ -64838,6 +64833,10 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/obj/machinery/smartfridge/disks{
pixel_x = -7;
pixel_y = 15
},
/turf/open/floor/iron/dark,
/area/station/medical/pathology)
"upt" = (
Expand Down
Loading
Loading