From ba01209d4de8d46e1cf8a668c0c028a4e9040812 Mon Sep 17 00:00:00 2001 From: Gw0sty <83688318+Gw0sty@users.noreply.github.com> Date: Thu, 26 Sep 2024 21:01:46 -0500 Subject: [PATCH 1/7] Allow bio bags to pick up disease disks So that way you can conveniently carry a lot of them as a pathologist --- code/game/objects/items/storage/bags.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 659de1d476ca..dc35fcbab53c 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -483,6 +483,7 @@ /obj/item/reagent_containers/syringe, /obj/item/weapon/virusdish,//Monkestation Addition /obj/item/food/monkeycube/mouse,//Monkestation Addition + /obj/item/disk/disease, )) /* From d5a85d0a28b95378d8f4111e7a8b3e09abdaa6f0 Mon Sep 17 00:00:00 2001 From: Gw0sty <83688318+Gw0sty@users.noreply.github.com> Date: Thu, 26 Sep 2024 21:25:05 -0500 Subject: [PATCH 2/7] Adds disk extrapolators to every hydroponics and virology This should hopefully increase colobration as having a common spot to put datadisks would allow for folks to share and collaborate more. --- _maps/map_files/Blueshift/Blueshift.dmm | 5 +++++ _maps/map_files/BoxStation/BoxStation.dmm | 1 + .../map_files/Deltastation/DeltaStation2.dmm | 4 +++- .../map_files/IceBoxStation/IceBoxStation.dmm | 2 ++ _maps/map_files/KiloStation/KiloStation.dmm | 8 ++++++++ _maps/map_files/MetaStation/MetaStation.dmm | 19 ++++++++++++------- _maps/map_files/Ouroboros/Ouroboros.dmm | 7 ++++++- _maps/map_files/Voidraptor/VoidRaptor.dmm | 16 +++++++++++++--- _maps/map_files/tramstation/tramstation.dmm | 11 +++++++---- 9 files changed, 57 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index bc56a399d981..0a217b2b3073 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -1989,6 +1989,7 @@ /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, @@ -3960,6 +3961,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" = ( diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 1447f3f00ecd..46cde8fad143 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -26733,6 +26733,7 @@ pixel_y = 13; pixel_x = -9 }, +/obj/machinery/smartfridge/disks, /turf/open/floor/iron/white, /area/station/medical/virology) "iQd" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2722d1256f0f..42ffb5e72ed4 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -66384,6 +66384,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, @@ -72444,6 +72445,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" = ( @@ -101106,9 +101108,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" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 7ab56793b048..7d5d8bafa97e 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -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" = ( @@ -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" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index c4b77cdb3ff9..794f7218596b 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -26967,6 +26967,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" = ( @@ -64838,6 +64842,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" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 34eb00157334..23a958350ebd 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -52223,6 +52223,10 @@ pixel_y = 18; pixel_x = 8 }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_y = 21; + pixel_x = -1 + }, /turf/open/floor/wood/parquet, /area/station/medical/pathology) "soW" = ( @@ -53793,6 +53797,7 @@ dir = 4 }, /obj/machinery/status_display/ai/directional/west, +/obj/machinery/smartfridge/disks, /turf/open/floor/iron, /area/station/service/hydroponics) "sRf" = ( @@ -64450,16 +64455,16 @@ }, /obj/machinery/smartfridge/chemistry/virology/preloaded, /obj/item/reagent_containers/cup/bottle/synaptizine{ - pixel_y = 17; - pixel_x = -9 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_y = 21; - pixel_x = -1 + pixel_y = 19; + pixel_x = -10 }, /obj/item/reagent_containers/cup/bottle/sugar{ pixel_y = 17; - pixel_x = 6 + pixel_x = -5 + }, +/obj/machinery/smartfridge/disks{ + pixel_x = 8; + pixel_y = 15 }, /turf/open/floor/wood/parquet, /area/station/medical/pathology) diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index 0433af9e8ab1..45a44ccd61b7 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -39209,6 +39209,7 @@ /obj/structure/table, /obj/item/wrench, /obj/item/crowbar, +/obj/item/watertank, /turf/open/floor/iron/large, /area/station/service/hydroponics) "lBx" = ( @@ -41783,11 +41784,11 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "mmM" = ( -/obj/item/watertank, /obj/structure/table, /obj/item/radio/intercom/directional/north, /obj/machinery/light/directional/north, /obj/machinery/light_switch/directional/west, +/obj/machinery/smartfridge/disks, /turf/open/floor/iron/large, /area/station/service/hydroponics) "mmP" = ( @@ -79020,6 +79021,10 @@ /area/station/medical/surgery/theatre) "xoS" = ( /obj/machinery/disease2/incubator, +/obj/machinery/smartfridge/disks{ + pixel_x = -4; + pixel_y = 14 + }, /turf/open/floor/iron/dark, /area/station/medical/virology) "xoT" = ( diff --git a/_maps/map_files/Voidraptor/VoidRaptor.dmm b/_maps/map_files/Voidraptor/VoidRaptor.dmm index 06fc443218da..7177cb692fa8 100644 --- a/_maps/map_files/Voidraptor/VoidRaptor.dmm +++ b/_maps/map_files/Voidraptor/VoidRaptor.dmm @@ -37013,9 +37013,15 @@ /obj/structure/table/glass, /obj/effect/turf_decal/trimline/dark_green/filled/line, /obj/item/stack/sheet/mineral/plasma{ - amount = 5 + amount = 5; + pixel_x = 11; + pixel_y = 0 + }, +/obj/item/stack/sheet/mineral/uranium/five{ + pixel_x = 15; + pixel_y = 0 }, -/obj/item/stack/sheet/mineral/uranium/five, +/obj/machinery/smartfridge/disks, /turf/open/floor/iron/white/textured_edge{ dir = 1 }, @@ -61075,7 +61081,11 @@ /obj/machinery/smartfridge, /obj/machinery/splicer{ pixel_y = 12; - pixel_x = -6 + pixel_x = -8 + }, +/obj/machinery/smartfridge/disks{ + pixel_x = 9; + pixel_y = 14 }, /turf/open/floor/iron/dark/textured_large, /area/station/service/hydroponics) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 410b5b4c822e..0c61442f7e85 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -8648,6 +8648,10 @@ }, /obj/structure/table, /obj/item/stack/sheet/cardboard, +/obj/item/paper{ + default_raw_text = "buy more donk pockets"; + name = "To-Do List" + }, /obj/item/food/donkpocket/pizza, /obj/machinery/camera/directional/east{ c_tag = "Medical - Virology Break Room"; @@ -41615,10 +41619,7 @@ }, /obj/structure/table, /obj/item/radio/intercom/directional/east, -/obj/item/paper{ - default_raw_text = "buy more donk pockets"; - name = "To-Do List" - }, +/obj/machinery/smartfridge/disks, /turf/open/floor/iron/dark, /area/station/medical/pathology) "miE" = ( @@ -49280,6 +49281,8 @@ /obj/machinery/light/directional/north, /obj/structure/sign/clock/directional/north, /obj/structure/cable, +/obj/structure/table, +/obj/machinery/smartfridge/disks, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "oIo" = ( From 16de707105fae5914ef09378212dd07394f82743 Mon Sep 17 00:00:00 2001 From: Gw0sty <83688318+Gw0sty@users.noreply.github.com> Date: Thu, 26 Sep 2024 22:50:11 -0500 Subject: [PATCH 3/7] Moves all the botanical and chicken encyplodias into a botany bookcase --- _maps/map_files/Blueshift/Blueshift.dmm | 24 ++++++------- _maps/map_files/BoxStation/BoxStation.dmm | 36 +++++++------------ .../map_files/Deltastation/DeltaStation2.dmm | 11 +----- .../map_files/IceBoxStation/IceBoxStation.dmm | 15 ++------ _maps/map_files/KiloStation/KiloStation.dmm | 27 +++++--------- _maps/map_files/MetaStation/MetaStation.dmm | 14 +------- _maps/map_files/Ouroboros/Ouroboros.dmm | 34 ++++++++---------- _maps/map_files/Voidraptor/VoidRaptor.dmm | 20 +++-------- _maps/map_files/tramstation/tramstation.dmm | 26 +++++--------- 9 files changed, 64 insertions(+), 143 deletions(-) diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index 0a217b2b3073..b039dec5d944 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -6311,8 +6311,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 }, @@ -28108,18 +28118,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 }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 46cde8fad143..5cf957c84783 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -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 @@ -44146,6 +44141,7 @@ pixel_y = 10; pixel_x = -5 }, +/obj/machinery/feed_machine, /turf/open/floor/iron/dark/side, /area/station/service/hydroponics) "oMG" = ( @@ -45456,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" = ( @@ -65934,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" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 42ffb5e72ed4..7a69da2547b7 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -51877,11 +51877,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, @@ -59757,6 +59752,7 @@ "oiZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/structure/bookcase/manuals/botany, /turf/open/floor/iron, /area/station/service/hydroponics) "ojb" = ( @@ -80907,11 +80903,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" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 7d5d8bafa97e..c78a3fb21d3c 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -30881,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) @@ -45147,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" = ( @@ -61090,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" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 794f7218596b..846577f0c85f 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -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" = ( @@ -30639,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{ @@ -30652,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) @@ -40523,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 }, @@ -46534,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 @@ -46555,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" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 23a958350ebd..c18f458d1ca5 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -11571,7 +11571,6 @@ /obj/item/stack/package_wrap, /obj/item/hand_labeler, /obj/structure/table/glass, -/obj/item/book/manual/hydroponics_pod_people, /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, @@ -53792,7 +53791,6 @@ /area/station/science/cytology) "sRb" = ( /obj/structure/table, -/obj/item/book/manual/hydroponics_pod_people, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -61376,11 +61374,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/effect/turf_decal/stripes/line{ dir = 4 }, @@ -63311,7 +63304,7 @@ }, /obj/effect/turf_decal/tile/blue, /obj/structure/extinguisher_cabinet/directional/south, -/obj/item/kirbyplants/random, +/obj/structure/bookcase/manuals/botany, /turf/open/floor/iron, /area/station/service/hydroponics) "wlt" = ( @@ -66512,11 +66505,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, /turf/open/floor/grass, /area/station/service/hydroponics) "xsn" = ( diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index 45a44ccd61b7..bafe34f6628b 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -23481,17 +23481,22 @@ dir = 1 }, /obj/structure/table/glass, -/obj/item/book/manual/hydroponics_pod_people{ - pixel_x = -6 - }, /obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 4; - pixel_y = 6 + pixel_x = -3; + pixel_y = 11 }, /obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 7; - pixel_y = 2 + pixel_x = -8; + pixel_y = 7 + }, +/obj/item/hand_labeler{ + pixel_x = 4; + pixel_y = 5 }, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, /turf/open/floor/iron/dark/smooth_edge, /area/station/service/hydroponics) "hao" = ( @@ -39207,9 +39212,9 @@ /area/station/cargo/drone_bay) "lBs" = ( /obj/structure/table, +/obj/item/watertank, /obj/item/wrench, /obj/item/crowbar, -/obj/item/watertank, /turf/open/floor/iron/large, /area/station/service/hydroponics) "lBx" = ( @@ -43914,17 +43919,12 @@ /turf/open/floor/wood, /area/station/commons/dorms) "mRw" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, /obj/item/radio/intercom/directional/west, /obj/machinery/light/directional/west, +/obj/structure/bookcase/manuals/botany, /turf/open/floor/iron/dark/smooth_edge, /area/station/service/hydroponics) "mRD" = ( @@ -69966,12 +69966,6 @@ /obj/machinery/light/directional/west, /mob/living/basic/pet/bumbles, /obj/item/chicken_feed, -/obj/item/book/manual/chicken_encyclopedia, -/obj/item/book/manual/chicken_encyclopedia, -/obj/item/book/manual/chicken_encyclopedia, -/obj/item/book/manual/botanical_lexicon, -/obj/item/book/manual/botanical_lexicon, -/obj/item/book/manual/botanical_lexicon, /turf/open/openspace, /area/station/service/hydroponics/upper) "uKn" = ( diff --git a/_maps/map_files/Voidraptor/VoidRaptor.dmm b/_maps/map_files/Voidraptor/VoidRaptor.dmm index 7177cb692fa8..50aa94940f4d 100644 --- a/_maps/map_files/Voidraptor/VoidRaptor.dmm +++ b/_maps/map_files/Voidraptor/VoidRaptor.dmm @@ -5055,11 +5055,6 @@ /obj/item/storage/bag/egg, /obj/item/storage/bag/egg, /obj/item/storage/bag/egg, -/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, /turf/open/floor/wood, /area/station/service/hydroponics/upper) "bwv" = ( @@ -18952,6 +18947,10 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/carpet/stellar, /area/station/service/chapel/funeral) +"fyh" = ( +/obj/structure/bookcase/manuals/botany, +/turf/open/floor/wood, +/area/station/service/hydroponics/upper) "fys" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 @@ -53822,10 +53821,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, -/obj/item/book/manual/hydroponics_pod_people{ - pixel_x = 7; - pixel_y = 3 - }, /obj/effect/turf_decal/bot, /obj/item/pen{ pixel_x = -6; @@ -63976,11 +63971,6 @@ name = "service camera" }, /obj/effect/turf_decal/bot, -/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/edge{ dir = 8 }, @@ -126427,7 +126417,7 @@ cqI xiF kVo fYs -eKx +fyh jpR uKN kAB diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 0c61442f7e85..4a2b9aadce20 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -14780,11 +14780,14 @@ /area/station/security/checkpoint/supply) "dGd" = ( /obj/structure/table/glass, -/obj/item/chicken_feed, -/obj/item/chicken_feed, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 }, +/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, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "dGh" = ( @@ -17342,11 +17345,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/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron/dark, /area/station/service/hydroponics) @@ -34690,6 +34688,8 @@ dir = 10 }, /obj/structure/disposalpipe/segment, +/obj/item/chicken_feed, +/obj/item/chicken_feed, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "kaD" = ( @@ -43204,11 +43204,6 @@ }, /obj/effect/turf_decal/tile/green/fourcorners, /obj/machinery/plantgenes, -/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/dark, /area/station/service/hydroponics) "mJh" = ( @@ -75762,12 +75757,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 }, -/obj/structure/table/glass, -/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, /area/station/service/hydroponics) "wUL" = ( From bcd45429b72e7c184f13da50199f798d8cc5032b Mon Sep 17 00:00:00 2001 From: Gw0sty <83688318+Gw0sty@users.noreply.github.com> Date: Thu, 26 Sep 2024 23:32:34 -0500 Subject: [PATCH 4/7] Added pod cloning book to the botanies bookcase --- monkestation/code/modules/library/bookcase.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/monkestation/code/modules/library/bookcase.dm b/monkestation/code/modules/library/bookcase.dm index 97955d01a8da..fb434a6ad589 100644 --- a/monkestation/code/modules/library/bookcase.dm +++ b/monkestation/code/modules/library/bookcase.dm @@ -6,4 +6,5 @@ for(var/i = 1 to /datum/job/botanist::total_positions) new /obj/item/book/manual/botanical_lexicon(src) new /obj/item/book/manual/chicken_encyclopedia(src) + new obj/item/book/manual/hydroponics_pod_people(src) update_appearance() From 80d9ed96838b554a86b746766ded82f955607110 Mon Sep 17 00:00:00 2001 From: Gw0sty <83688318+Gw0sty@users.noreply.github.com> Date: Fri, 27 Sep 2024 00:13:35 -0500 Subject: [PATCH 5/7] The smallest of spelling mistakes I lose --- monkestation/code/modules/library/bookcase.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkestation/code/modules/library/bookcase.dm b/monkestation/code/modules/library/bookcase.dm index fb434a6ad589..c0ea5ef04899 100644 --- a/monkestation/code/modules/library/bookcase.dm +++ b/monkestation/code/modules/library/bookcase.dm @@ -6,5 +6,5 @@ for(var/i = 1 to /datum/job/botanist::total_positions) new /obj/item/book/manual/botanical_lexicon(src) new /obj/item/book/manual/chicken_encyclopedia(src) - new obj/item/book/manual/hydroponics_pod_people(src) + new /obj/item/book/manual/hydroponics_pod_people(src) update_appearance() From 170b44b2c17f32de9d86c9481a017e77b1d7eeeb Mon Sep 17 00:00:00 2001 From: Gw0sty <83688318+Gw0sty@users.noreply.github.com> Date: Sun, 29 Sep 2024 21:44:58 -0500 Subject: [PATCH 6/7] forgot a few books whoopsies --- _maps/map_files/Blueshift/Blueshift.dmm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index b039dec5d944..3ee4aab3d22e 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -1996,10 +1996,6 @@ /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 }, From d60aa511a154591a5b1b43dee4470cab4acabb92 Mon Sep 17 00:00:00 2001 From: Gw0sty <83688318+Gw0sty@users.noreply.github.com> Date: Sun, 29 Sep 2024 22:24:04 -0500 Subject: [PATCH 7/7] Theseus got merged. Congrats thesus! Same changes but for thesus --- _maps/map_files/Theseus/Theseus.dmm | 38 +++++++++++++---------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/_maps/map_files/Theseus/Theseus.dmm b/_maps/map_files/Theseus/Theseus.dmm index d9275e5d8f69..a17f185b4e68 100644 --- a/_maps/map_files/Theseus/Theseus.dmm +++ b/_maps/map_files/Theseus/Theseus.dmm @@ -12896,17 +12896,9 @@ /turf/open/floor/grass, /area/space/nearstation) "dRD" = ( -/obj/structure/table/glass, -/obj/item/food/grown/pumpkin{ - pixel_y = 5 - }, -/obj/item/food/grown/wheat, -/obj/item/food/grown/wheat, -/obj/item/food/grown/carrot, -/obj/item/grown/corncob, -/obj/item/seeds/potato, -/obj/item/seeds/wheat, /obj/effect/decal/cleanable/dirt, +/obj/structure/table/glass, +/obj/machinery/smartfridge/disks, /turf/open/floor/grass, /area/station/service/hydroponics) "dRL" = ( @@ -18324,7 +18316,6 @@ /obj/structure/flora/bush/grassy/style_random, /obj/effect/turf_decal/bot, /obj/structure/closet/crate/hydroponics, -/obj/item/botanical_lexicon, /obj/item/secateurs, /obj/item/secateurs, /obj/item/plant_analyzer, @@ -18340,6 +18331,7 @@ /obj/item/seeds/ambrosia, /obj/item/seeds/wheat, /obj/item/seeds/pumpkin, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/grass, /area/station/security/prison/garden) "fAt" = ( @@ -64436,6 +64428,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/smartfridge/disks{ + pixel_x = -1; + pixel_y = 4 + }, /turf/open/floor/iron/dark, /area/station/medical/pathology) "tjt" = ( @@ -70087,8 +70083,8 @@ /obj/structure/railing{ dir = 1 }, -/obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/green, +/obj/structure/bookcase/manuals/botany, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/service/hydroponics) @@ -80714,21 +80710,21 @@ pixel_x = 5 }, /obj/structure/table/glass, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon{ - pixel_y = 5; - pixel_x = -4 - }, /obj/item/toy/figure/botanist{ pixel_y = 14; pixel_x = 5 }, -/obj/item/botanical_lexicon{ - pixel_y = 3; - pixel_x = 3 - }, /obj/item/radio/intercom/directional/east, /obj/machinery/light/directional/east, +/obj/item/food/grown/pumpkin{ + pixel_y = 5 + }, +/obj/item/food/grown/wheat, +/obj/item/food/grown/wheat, +/obj/item/food/grown/carrot, +/obj/item/grown/corncob, +/obj/item/seeds/potato, +/obj/item/seeds/wheat, /turf/open/floor/grass, /area/station/service/hydroponics) "xUS" = (