From 21043942c0b10a41a870dfdbeac0d31879316532 Mon Sep 17 00:00:00 2001 From: Lucy Date: Wed, 25 Sep 2024 21:59:03 -0400 Subject: [PATCH] Make the botany and chicken encyclopedias proper books (#3560) * Make the botanical lexicon and chicken encyclopedia proper /obj/item/book subtypes * Properly update paths in all maps --- .../LavaRuins/lavaland_surface_seed_vault.dmm | 2 +- _maps/map_files/Blueshift/Blueshift.dmm | 40 +++++++++---------- _maps/map_files/BoxStation/BoxStation.dmm | 22 +++++----- .../map_files/Deltastation/DeltaStation2.dmm | 22 +++++----- .../map_files/IceBoxStation/IceBoxStation.dmm | 22 +++++----- _maps/map_files/KiloStation/KiloStation.dmm | 22 +++++----- _maps/map_files/MetaStation/MetaStation.dmm | 22 +++++----- _maps/map_files/NorthStar/north_star.dmm | 10 ++--- _maps/map_files/Ouroboros/Ouroboros.dmm | 12 +++--- _maps/map_files/Voidraptor/VoidRaptor.dmm | 20 +++++----- _maps/map_files/generic/CentCom.dmm | 8 ++-- _maps/map_files/tramstation/tramstation.dmm | 22 +++++----- .../modules/hydroponics/botanical_lexicon.dm | 15 +++---- monkestation/code/modules/library/bookcase.dm | 9 +++++ .../code/modules/ranching/chicken_book.dm | 15 +++---- tgstation.dme | 1 + tools/UpdatePaths/botany_manual_repath.txt | 2 + 17 files changed, 136 insertions(+), 130 deletions(-) create mode 100644 monkestation/code/modules/library/bookcase.dm create mode 100644 tools/UpdatePaths/botany_manual_repath.txt diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 3085ce48ea2f..aaff4461f127 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -452,7 +452,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) "bj" = ( diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index 585b1c2ad635..2fa7fb819903 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -93,8 +93,8 @@ dir = 9 }, /obj/structure/closet/secure_closet/hydroponics, -/obj/item/botanical_lexicon, -/obj/item/chicken_book, +/obj/item/book/manual/botanical_lexicon, +/obj/item/book/manual/chicken_encyclopedia, /turf/open/floor/iron/dark/herringbone, /area/station/common/night_club/back_stage) "abG" = ( @@ -1995,10 +1995,10 @@ /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 8 }, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/corner{ dir = 1 }, @@ -13469,7 +13469,7 @@ /obj/structure/closet/secure_closet/hydroponics, /obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "cCM" = ( @@ -28434,7 +28434,7 @@ "fuX" = ( /obj/structure/window/spawner/directional/south, /obj/structure/closet/secure_closet/hydroponics, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "fuY" = ( @@ -41549,7 +41549,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "hZP" = ( @@ -65653,8 +65653,8 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 }, -/obj/item/botanical_lexicon, -/obj/item/chicken_book, +/obj/item/book/manual/botanical_lexicon, +/obj/item/book/manual/chicken_encyclopedia, /turf/open/floor/iron/dark/herringbone, /area/station/common/night_club/back_stage) "mKX" = ( @@ -72671,7 +72671,7 @@ /area/station/security/checkpoint/supply) "ofS" = ( /obj/structure/closet/secure_closet/hydroponics, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "ofT" = ( @@ -78596,8 +78596,8 @@ dir = 10 }, /obj/structure/closet/secure_closet/hydroponics, -/obj/item/botanical_lexicon, -/obj/item/chicken_book, +/obj/item/book/manual/botanical_lexicon, +/obj/item/book/manual/chicken_encyclopedia, /turf/open/floor/iron/dark/herringbone, /area/station/common/night_club/back_stage) "pmq" = ( @@ -83799,8 +83799,8 @@ "qoo" = ( /obj/structure/window/reinforced/tinted/spawner/directional/north, /obj/structure/closet/secure_closet/hydroponics, -/obj/item/botanical_lexicon, -/obj/item/chicken_book, +/obj/item/book/manual/botanical_lexicon, +/obj/item/book/manual/chicken_encyclopedia, /turf/open/floor/iron/dark/herringbone, /area/station/common/night_club/back_stage) "qow" = ( @@ -84644,10 +84644,10 @@ name = "hallway camera" }, /obj/machinery/feed_machine, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, +/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/iron/dark/side{ dir = 1 }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 3ac184f28c47..1447f3f00ecd 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -14845,11 +14845,11 @@ /obj/item/clothing/suit/apron, /obj/item/clothing/accessory/armband/hydro, /obj/item/wrench, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/item/book/manual/botanical_lexicon, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark/side{ dir = 9 @@ -45456,11 +45456,11 @@ dir = 1 }, /obj/structure/table, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, +/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, @@ -58129,7 +58129,7 @@ /area/station/medical/treatment_center) "tyX" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /obj/item/seeds/tree, /obj/effect/spawner/random/contraband/prison, /obj/item/seeds/pumpkin, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 941c007a0dd3..2722d1256f0f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -51877,11 +51877,11 @@ /area/station/commons/storage/tools) "mnA" = ( /obj/structure/table/glass, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, +/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, @@ -80905,11 +80905,11 @@ /obj/machinery/light_switch/directional/south{ pixel_x = 8 }, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/item/book/manual/botanical_lexicon, /turf/open/floor/iron/checker, /area/station/service/hydroponics) "tpE" = ( @@ -86990,7 +86990,7 @@ /area/station/maintenance/starboard/aft) "uMc" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /obj/item/seeds/tree, /obj/effect/spawner/random/contraband/prison, /obj/item/seeds/pumpkin, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 6cc3cb4d187f..7ab56793b048 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1684,7 +1684,7 @@ spawn_all_loot = 1; spawn_random_offset = 1 }, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/iron, /area/station/security/prison/garden) "aCA" = ( @@ -30879,11 +30879,11 @@ /obj/item/chicken_scanner, /obj/item/chicken_scanner, /obj/item/chicken_scanner, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, +/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) @@ -45151,11 +45151,11 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/item/book/manual/botanical_lexicon, /turf/open/floor/iron, /area/station/service/hydroponics) "opu" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 7849f9737e50..ce9cebdf54a8 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -12091,7 +12091,7 @@ /obj/item/seeds/onion, /obj/item/paper/guides/jobs/hydroponics, /obj/item/seeds/tree, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "dRF" = ( @@ -17655,7 +17655,7 @@ /obj/effect/turf_decal/trimline/green/end{ dir = 8 }, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/iron, /area/station/service/hydroponics) "fBt" = ( @@ -30629,11 +30629,11 @@ }, /obj/effect/turf_decal/bot, /obj/item/toy/figure/botanist, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/item/book/manual/botanical_lexicon, /obj/machinery/plantgenes, /turf/open/floor/iron, /area/station/service/hydroponics) @@ -40489,10 +40489,10 @@ "mFm" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/table/glass, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, +/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 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 3791227c5ace..34eb00157334 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -54852,7 +54852,7 @@ /obj/item/seeds/onion, /obj/item/paper/guides/jobs/hydroponics, /obj/item/seeds/tree, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /turf/open/floor/iron, /area/station/security/prison/garden) "tja" = ( @@ -61371,11 +61371,11 @@ /obj/item/clothing/suit/apron, /obj/item/clothing/accessory/armband/hydro, /obj/item/wrench, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/item/book/manual/botanical_lexicon, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -66507,11 +66507,11 @@ /obj/item/chicken_scanner, /obj/item/chicken_scanner, /obj/item/chicken_scanner, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, +/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/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 2dbec2c4c201..8e1df5b162d1 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -77234,11 +77234,11 @@ }, /obj/item/storage/box/syringes, /obj/machinery/light/directional/north, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/item/book/manual/botanical_lexicon, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "uQD" = ( diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index 47f0ae71e1b4..0433af9e8ab1 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -69965,12 +69965,12 @@ /obj/machinery/light/directional/west, /mob/living/basic/pet/bumbles, /obj/item/chicken_feed, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, +/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 80008621a472..06fc443218da 100644 --- a/_maps/map_files/Voidraptor/VoidRaptor.dmm +++ b/_maps/map_files/Voidraptor/VoidRaptor.dmm @@ -5055,11 +5055,11 @@ /obj/item/storage/bag/egg, /obj/item/storage/bag/egg, /obj/item/storage/bag/egg, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, +/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" = ( @@ -63966,11 +63966,11 @@ name = "service camera" }, /obj/effect/turf_decal/bot, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/item/book/manual/botanical_lexicon, /turf/open/floor/iron/edge{ dir = 8 }, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 12d1a7338d79..c238b517a6ab 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -10073,10 +10073,10 @@ "aAy" = ( /obj/structure/railing/wood, /obj/structure/table/reinforced, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/trimline/green/line, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 6f038baa4afc..410b5b4c822e 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -17338,11 +17338,11 @@ /obj/item/chicken_scanner, /obj/item/chicken_scanner, /obj/item/chicken_scanner, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, -/obj/item/chicken_book, +/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) @@ -37288,7 +37288,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/closet/crate/hydroponics, -/obj/item/botanical_lexicon, +/obj/item/book/manual/botanical_lexicon, /obj/item/seeds/tree, /obj/effect/spawner/random/contraband/prison, /obj/item/seeds/pumpkin, @@ -43203,11 +43203,11 @@ }, /obj/effect/turf_decal/tile/green/fourcorners, /obj/machinery/plantgenes, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/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/item/book/manual/botanical_lexicon, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "mJh" = ( diff --git a/monkestation/code/modules/hydroponics/botanical_lexicon.dm b/monkestation/code/modules/hydroponics/botanical_lexicon.dm index c81ee38a940e..eb88065f8f69 100644 --- a/monkestation/code/modules/hydroponics/botanical_lexicon.dm +++ b/monkestation/code/modules/hydroponics/botanical_lexicon.dm @@ -1,26 +1,23 @@ -/obj/item/botanical_lexicon +/obj/item/book/manual/botanical_lexicon name = "Botanical Lexicon" - desc = "A transcribed list of all known plant mutations and how to aquire them" + desc = "A transcribed list of all known plant mutations and how to acquire them" icon = 'monkestation/icons/obj/ranching.dmi' icon_state = "chicken_book" + unique = TRUE -/obj/item/botanical_lexicon/ui_interact(mob/user, datum/tgui/ui) +/obj/item/book/manual/botanical_lexicon/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "BotanicalLexicon") ui.set_autoupdate(FALSE) ui.open() -/obj/item/botanical_lexicon/ui_act(action, list/params) - if(..()) - return - -/obj/item/botanical_lexicon/ui_assets(mob/user) +/obj/item/book/manual/botanical_lexicon/ui_assets(mob/user) return list( get_asset_datum(/datum/asset/spritesheet/botanical_lexicon), ) -/obj/item/botanical_lexicon/ui_static_data(mob/user) +/obj/item/book/manual/botanical_lexicon/ui_static_data(mob/user) var/list/data = list() var/list/plant_list = list() for(var/datum/hydroponics/plant_mutation/mutation as anything in (subtypesof(/datum/hydroponics/plant_mutation) - /datum/hydroponics/plant_mutation/spliced_mutation - /datum/hydroponics/plant_mutation/infusion)) diff --git a/monkestation/code/modules/library/bookcase.dm b/monkestation/code/modules/library/bookcase.dm new file mode 100644 index 000000000000..97955d01a8da --- /dev/null +++ b/monkestation/code/modules/library/bookcase.dm @@ -0,0 +1,9 @@ +/obj/structure/bookcase/manuals/botany + name = "botany manuals bookcase" + +/obj/structure/bookcase/manuals/botany/Initialize(mapload) + . = ..() + 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) + update_appearance() diff --git a/monkestation/code/modules/ranching/chicken_book.dm b/monkestation/code/modules/ranching/chicken_book.dm index f4643491f8b3..228358068b67 100644 --- a/monkestation/code/modules/ranching/chicken_book.dm +++ b/monkestation/code/modules/ranching/chicken_book.dm @@ -1,26 +1,23 @@ -/obj/item/chicken_book +/obj/item/book/manual/chicken_encyclopedia name = "chicken encyclopedia" - desc = "The exciting sequel to the encyclopedia of twenty first century trains!" + desc = "The exciting sequel to the encyclopedia of 21st century trains!" icon = 'monkestation/icons/obj/ranching.dmi' icon_state = "chicken_book" + unique = TRUE -/obj/item/chicken_book/ui_interact(mob/user, datum/tgui/ui) +/obj/item/book/manual/chicken_encyclopedia/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "RanchingEncyclopedia") ui.set_autoupdate(FALSE) ui.open() -/obj/item/chicken_book/ui_act(action, list/params) - if(..()) - return - -/obj/item/chicken_book/ui_assets(mob/user) +/obj/item/book/manual/chicken_encyclopedia/ui_assets(mob/user) return list( get_asset_datum(/datum/asset/spritesheet/chicken_book), ) -/obj/item/chicken_book/ui_static_data(mob/user) +/obj/item/book/manual/chicken_encyclopedia/ui_static_data(mob/user) var/list/data = list() var/list/chicken_list = list() for(var/datum/mutation/ranching/chicken/chicken as anything in subtypesof(/datum/mutation/ranching/chicken)) diff --git a/tgstation.dme b/tgstation.dme index 11f2e43d652e..f2ec99a120be 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7100,6 +7100,7 @@ #include "monkestation\code\modules\jobs\job_types\security_assistant.dm" #include "monkestation\code\modules\jobs\job_types\skeleton.dm" #include "monkestation\code\modules\jobs\job_types\yellowclown.dm" +#include "monkestation\code\modules\library\bookcase.dm" #include "monkestation\code\modules\library\skill_learning\job_skillchips\shaft_miner.dm" #include "monkestation\code\modules\liquids\drains.dm" #include "monkestation\code\modules\liquids\height_floors.dm" diff --git a/tools/UpdatePaths/botany_manual_repath.txt b/tools/UpdatePaths/botany_manual_repath.txt new file mode 100644 index 000000000000..33ab4dca9324 --- /dev/null +++ b/tools/UpdatePaths/botany_manual_repath.txt @@ -0,0 +1,2 @@ +/obj/item/botanical_lexicon : /obj/item/book/manual/botanical_lexicon{@OLD} +/obj/item/chicken_book : /obj/item/book/manual/chicken_encyclopedia{@OLD}