From 774d5fd0e3bc76caec3a766afdaf484a46e21426 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Thu, 25 Jan 2024 04:28:06 -0300 Subject: [PATCH 1/5] init commit --- code/datums/traits/negative.dm | 14 +- code/game/objects/items/gift.dm | 2 +- code/game/objects/items/manuals.dm | 287 ++++++++++++++++------------- code/modules/library/lib_items.dm | 24 +-- 4 files changed, 174 insertions(+), 153 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index dccd4e87877d..8cb9f50008f4 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -123,20 +123,20 @@ //Security/Command if("Captain") heirloom_type = /obj/item/reagent_containers/food/drinks/flask/gold - if("Head of Security") - heirloom_type = /obj/item/book/manual/wiki/security_space_law +// if("Head of Security") +// heirloom_type = /obj/item/book/manual/wiki/security_space_law if("Head of Personnel") heirloom_type = /obj/item/reagent_containers/food/drinks/trophy/silver_cup - if("Warden") - heirloom_type = /obj/item/book/manual/wiki/security_space_law +// if("Warden") +// heirloom_type = /obj/item/book/manual/wiki/security_space_law if("Security Officer") - heirloom_type = pick(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec) + heirloom_type = pick(/obj/item/clothing/head/beret/sec) if("Detective") heirloom_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey if("Lawyer") - heirloom_type = pick(/obj/item/gavelhammer, /obj/item/book/manual/wiki/security_space_law) + heirloom_type = pick(/obj/item/gavelhammer) if("Brig Physician") //WS edit - Brig Physicians - heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/roller, /obj/item/book/manual/wiki/security_space_law) //WS edit - Brig Physicians + heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/roller) //WS edit - Brig Physicians if("Prisoner") heirloom_type = /obj/item/pen/blue //RnD diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index b32169951c46..8ec4353d1ca2 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) /obj/item/grown/corncob, /obj/item/poster/random_contraband, /obj/item/poster/random_official, - /obj/item/book/manual/wiki/barman_recipes, + /obj/item/book/manual/wiki/drinks, /obj/item/book/manual/chef_recipes, /obj/item/bikehorn, /obj/item/toy/beach_ball, diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index da1906143abc..693858bf1b2e 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -360,156 +360,177 @@ /obj/item/book/manual/wiki/chemistry name = "Chemistry Textbook" - icon_state ="chemistrybook" - author = "Nanotrasen" + icon_state = "chemistrybook" + author = "GREMLIN" title = "Chemistry Textbook" page_link = "Guide_to_Chemistry" -/obj/item/book/manual/wiki/engineering_construction - name = "Station Repairs and Construction" - icon_state ="bookEngineering" - author = "Engineering Encyclopedia" - title = "Station Repairs and Construction" - page_link = "Guide_to_Construction" - -/obj/item/book/manual/wiki/engineering_guide - name = "Engineering Textbook" - icon_state ="bookEngineering2" - author = "Engineering Encyclopedia" - title = "Engineering Textbook" +/obj/item/book/manual/wiki/command + name = "Command and Delegate" + icon_state = "book" + author = "Frontier Assistance Program" + title = "Command and Delegate: The Entreprising Captain's Guide" + page_link = "Guide_to_Command" + +/obj/item/book/manual/wiki/piloting + name = "You and Helm Consoles" + icon_state = "book" + author = "Frontier Assistance Program" + title = "You and Helm Consoles: The Bold Helmsman's Manual" + page_link = "Guide_to_the_Overmap" + +/obj/item/book/manual/wiki/ghetto_chemistry + name = "Ghetto Chemistry Textbook" + icon_state = "chemistrybook" + author = "GREMLIN" + title = "Less Legal Chemistry Textbook" + page_link = "Guide_to_Ghetto_Chemistry" + +/obj/item/book/manual/wiki/cooking + name = "Cookbook" + desc = "It's a cookbook!" + icon_state = "cooked_book" + author = "Frontier Assistance Program" + title = "To Serve Man" + page_link = "Guide_to_Food_and_Drinks" + +/obj/item/book/manual/wiki/construction + name = "Ship Repairs and Construction" + icon_state = "bookEngineering" + author = "Frontier Assistance Program" + title = "Ship Repairs and Construction" + page_link = "Construction" + +/obj/item/book/manual/wiki/engineering + name = "Engineering Guide" + icon_state = "bookEngineering2" + author = "Frontier Assistance Program" + title = "The Ship Engineer's Guide to Mechanical and Electrical Engineering" page_link = "Guide_to_Engineering" -/obj/item/book/manual/wiki/engineering_singulo_tesla - name = "Singularity and Tesla for Dummies" - icon_state ="bookEngineeringSingularitySafety" - author = "Engineering Encyclopedia" - title = "Singularity and Tesla for Dummies" - page_link = "Singularity_and_Tesla_engines" - -/obj/item/book/manual/wiki/security_space_law - name = "Space Law" - desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations." - icon_state = "bookSpaceLaw" - author = "Nanotrasen" - title = "Space Law" - page_link = "Space_Law" - -/obj/item/book/manual/wiki/infections - name = "Infections - Making your own pandemic!" - icon_state = "bookInfections" - author = "Infections Encyclopedia" - title = "Infections - Making your own pandemic!" - page_link = "Infections" - -/obj/item/book/manual/wiki/telescience - name = "Teleportation Science - Bluespace for dummies!" - icon_state = "book7" - author = "University of Bluespace" - title = "Teleportation Science - Bluespace for dummies!" - page_link = "Guide_to_telescience" - -/obj/item/book/manual/wiki/engineering_hacking +/obj/item/book/manual/wiki/hacking name = "Hacking" - icon_state ="bookHacking" - author = "Engineering Encyclopedia" + icon_state = "bookHacking" + author = "Frontier Assistance Program" title = "Hacking" page_link = "Hacking" -/obj/item/book/manual/wiki/detective - name = "The Film Noir: Proper Procedures for Investigations" - icon_state ="bookDetective" - author = "Nanotrasen" - title = "The Film Noir: Proper Procedures for Investigations" - page_link = "Detective" - -/obj/item/book/manual/wiki/barman_recipes +/obj/item/book/manual/wiki/drinks name = "Barman Recipes: Mixing Drinks and Changing Lives" icon_state = "barbook" author = "Sir John Rose" title = "Barman Recipes: Mixing Drinks and Changing Lives" - page_link = "Guide_to_food_and_drinks" - -/obj/item/book/manual/wiki/robotics_cyborgs - name = "Robotics for Dummies" - icon_state = "borgbook" - author = "XISC" - title = "Robotics for Dummies" - page_link = "Guide_to_robotics" - -/obj/item/book/manual/wiki/research_and_development - name = "Research and Development 101" - icon_state = "rdbook" - author = "Dr. L. Ight" - title = "Research and Development 101" - page_link = "Guide_to_Research_and_Development" - -/obj/item/book/manual/wiki/experimentor - name = "Mentoring your Experiments" - icon_state = "rdbook" - author = "Dr. H.P. Kritz" - title = "Mentoring your Experiments" - page_link = "E.X.P.E.R.I-MENTOR" - -/obj/item/book/manual/wiki/cooking_to_serve_man - name = "To Serve Man" - desc = "It's a cookbook!" - icon_state ="cooked_book" - author = "the Kanamitan Empire" - title = "To Serve Man" - page_link = "Guide_to_food_and_drinks" - -/obj/item/book/manual/wiki/tcomms - name = "Subspace Telecommunications And You" - icon_state = "book3" - author = "Engineering Encyclopedia" - title = "Subspace Telecommunications And You" - page_link = "Guide_to_Telecommunications" - -/obj/item/book/manual/wiki/atmospherics - name = "Lexica Atmosia" - icon_state = "book5" - author = "the City-state of Atmosia" - title = "Lexica Atmosia" - page_link = "Guide_to_Atmospherics" + page_link = "Guide_to_Food_and_Drinks" /obj/item/book/manual/wiki/medicine - name = "Medical Space Compendium, Volume 638" + name = "Guide to Medical Aid" icon_state = "book8" - author = "Medical Journal" - title = "Medical Space Compendium, Volume 638" - page_link = "Guide_to_medicine" + author = "Frontier Assistance Program" + title = "The Crewman's Guide to Medical Aid" + page_link = "Guide_to_Medical" /obj/item/book/manual/wiki/surgery - name = "Brain Surgery for Dummies" + name = "Guide to Surgery" icon_state = "book4" - author = "Dr. F. Fran" - title = "Brain Surgery for Dummies" - page_link = "Surgery" + author = "Frontier Assistance Program" + title = "Guide to Surgery: Scalpel, Hemostat, Wristwatch" + page_link = "Guide_to_Surgery" -/obj/item/book/manual/wiki/grenades - name = "DIY Chemical Grenades" - icon_state = "book2" - author = "W. Powell" - title = "DIY Chemical Grenades" - page_link = "Grenade" - -/obj/item/book/manual/wiki/toxins - name = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap" - icon_state = "book6" - author = "Cuban Pete" - title = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap" - page_link = "Guide_to_toxins" - -/obj/item/book/manual/wiki/plumbing - name = "Chemical Factories Without Narcotics" - icon_state ="plumbingbook" - author = "Nanotrasen" - title = "Chemical Factories Without Narcotics" - page_link = "Guide_to_plumbing" - -/obj/item/book/manual/wiki/medical_cloning - name = "Cloning techniques of the 26th century" - icon_state ="bookCloning" - author = "Medical Journal, volume 3" - title = "Cloning techniques of the 26th century" - page_link = "Guide_to_genetics#Cloning" +/obj/item/book/manual/wiki/robotics + name = "Robotics for Dummies" + icon_state = "borgbook" + author = "XISC" + title = "Robotics for Dummies" + page_link = "Guide_to_Robotics" + +// /obj/item/book/manual/wiki/engineering_singulo_tesla +// name = "Singularity and Tesla for Dummies" +// icon_state ="bookEngineeringSingularitySafety" +// author = "Engineering Encyclopedia" +// title = "Singularity and Tesla for Dummies" +// page_link = "Singularity_and_Tesla_engines" + +// /obj/item/book/manual/wiki/security_space_law +// name = "Space Law" +// desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations." +// icon_state = "bookSpaceLaw" +// author = "Nanotrasen" +// title = "Space Law" +// page_link = "Space_Law" + +// /obj/item/book/manual/wiki/infections +// name = "Infections - Making your own pandemic!" +// icon_state = "bookInfections" +// author = "Infections Encyclopedia" +// title = "Infections - Making your own pandemic!" +// page_link = "Infections" + +// /obj/item/book/manual/wiki/telescience +// name = "Teleportation Science - Bluespace for dummies!" +// icon_state = "book7" +// author = "University of Bluespace" +// title = "Teleportation Science - Bluespace for dummies!" +// page_link = "Guide_to_telescience" + +// /obj/item/book/manual/wiki/detective +// name = "The Film Noir: Proper Procedures for Investigations" +// icon_state ="bookDetective" +// author = "Nanotrasen" +// title = "The Film Noir: Proper Procedures for Investigations" +// page_link = "Detective" + +// /obj/item/book/manual/wiki/research_and_development +// name = "Research and Development 101" +// icon_state = "rdbook" +// author = "Dr. L. Ight" +// title = "Research and Development 101" +// page_link = "Guide_to_Research_and_Development" + +// /obj/item/book/manual/wiki/experimentor +// name = "Mentoring your Experiments" +// icon_state = "rdbook" +// author = "Dr. H.P. Kritz" +// title = "Mentoring your Experiments" +// page_link = "E.X.P.E.R.I-MENTOR" + +// /obj/item/book/manual/wiki/tcomms +// name = "Subspace Telecommunications And You" +// icon_state = "book3" +// author = "Engineering Encyclopedia" +// title = "Subspace Telecommunications And You" +// page_link = "Guide_to_Telecommunications" + +// /obj/item/book/manual/wiki/atmospherics +// name = "Lexica Atmosia" +// icon_state = "book5" +// author = "the City-state of Atmosia" +// title = "Lexica Atmosia" +// page_link = "Guide_to_Atmospherics" + +// /obj/item/book/manual/wiki/grenades +// name = "DIY Chemical Grenades" +// icon_state = "book2" +// author = "W. Powell" +// title = "DIY Chemical Grenades" +// page_link = "Grenade" + +// /obj/item/book/manual/wiki/toxins +// name = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap" +// icon_state = "book6" +// author = "Cuban Pete" +// title = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap" +// page_link = "Guide_to_toxins" + +// /obj/item/book/manual/wiki/plumbing +// name = "Chemical Factories Without Narcotics" +// icon_state ="plumbingbook" +// author = "Nanotrasen" +// title = "Chemical Factories Without Narcotics" +// page_link = "Guide_to_plumbing" + +// /obj/item/book/manual/wiki/medical_cloning +// name = "Cloning techniques of the 26th century" +// icon_state ="bookCloning" +// author = "Medical Journal, volume 3" +// title = "Cloning techniques of the 26th century" +// page_link = "Guide_to_genetics#Cloning" diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index dd664843ed41..6685fa9ff617 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -181,21 +181,20 @@ /obj/structure/bookcase/manuals/engineering/Initialize() . = ..() - new /obj/item/book/manual/wiki/engineering_construction(src) - new /obj/item/book/manual/wiki/engineering_hacking(src) - new /obj/item/book/manual/wiki/engineering_guide(src) - new /obj/item/book/manual/wiki/engineering_singulo_tesla(src) - new /obj/item/book/manual/wiki/robotics_cyborgs(src) + new /obj/item/book/manual/wiki/construction(src) + new /obj/item/book/manual/wiki/hacking(src) + new /obj/item/book/manual/wiki/engineering(src) + new /obj/item/book/manual/wiki/robotics(src) update_appearance() -/obj/structure/bookcase/manuals/research_and_development - name = "\improper R&D manuals bookcase" +// /obj/structure/bookcase/manuals/research_and_development +// name = "\improper R&D manuals bookcase" -/obj/structure/bookcase/manuals/research_and_development/Initialize() - . = ..() - new /obj/item/book/manual/wiki/research_and_development(src) - update_appearance() +// /obj/structure/bookcase/manuals/research_and_development/Initialize() +// . = ..() +// new /obj/item/book/manual/wiki/research_and_development(src) +// update_appearance() /* @@ -378,7 +377,8 @@ /obj/structure/bookcase/manuals/medical/Initialize() . = ..() - new /obj/item/book/manual/wiki/medical_cloning(src) + new /obj/item/book/manual/wiki/medicine(src) + new /obj/item/book/manual/wiki/surgery(src) update_appearance() #undef BOOKCASE_UNANCHORED From 5a23e144dc9da4e30bf7ae6079aac04d24bf4f8a Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Thu, 25 Jan 2024 04:53:21 -0300 Subject: [PATCH 2/5] map edits --- .../BeachRuins/beach_crashed_engineer.dmm | 6 +++--- .../RandomRuins/BeachRuins/beach_ocean_town.dmm | 4 ++-- .../IceRuins/icemoon_surface_engioutpost.dmm | 4 ++-- .../IceRuins/icemoon_underground_oldstation.dmm | 1 - .../JungleRuins/jungle_abandoned_library.dmm | 14 +++++++------- .../RandomRuins/JungleRuins/jungle_cavecrew.dmm | 12 ++++-------- .../RandomRuins/JungleRuins/jungle_paradise.dmm | 6 +----- .../jungle_surface_bombmakers_cabin.dmm | 5 ----- .../RockRuins/rockplanet_budgetcuts.dmm | 4 ---- _maps/RandomRuins/SpaceRuins/astraeus.dmm | 2 +- _maps/RandomRuins/SpaceRuins/clericden.dmm | 2 +- .../SpaceRuins/dangerous_research.dmm | 2 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 1 - _maps/RandomRuins/SpaceRuins/singularity_lab.dmm | 2 +- _maps/RandomRuins/SpaceRuins/spacemall.dmm | 2 +- _maps/map_files/generic/CentCom.dmm | 13 ++----------- _maps/outpost/nanotrasen_asteroid.dmm | 8 -------- _maps/outpost/nanotrasen_ice.dmm | 8 -------- _maps/shuttles/independent/independent_nemo.dmm | 2 +- .../independent/independent_tranquility.dmm | 2 +- _maps/shuttles/inteq/inteq_talos.dmm | 2 -- _maps/shuttles/minutemen/minutemen_asclepius.dmm | 2 +- _maps/shuttles/minutemen/minutemen_cepheus.dmm | 8 ++------ _maps/shuttles/minutemen/minutemen_vela.dmm | 4 ---- _maps/shuttles/nanotrasen/nanotrasen_heron.dmm | 16 ++-------------- _maps/shuttles/pirate/pirate_ember.dmm | 4 ++-- _maps/shuttles/syndicate/syndicate_aegis.dmm | 2 +- .../syndicate/syndicate_twinkleshine.dmm | 2 +- _maps/templates/shelter_3.dmm | 2 +- 29 files changed, 38 insertions(+), 104 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm index 4e47f54d4970..998e43b9085a 100644 --- a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm @@ -230,7 +230,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "kH" = ( -/obj/item/book/manual/wiki/engineering_construction, +/obj/item/book/manual/wiki/construction, /turf/open/floor/plating/beach/sand{ light_range = 2 }, @@ -453,7 +453,7 @@ /turf/open/floor/plasteel/tech, /area/ruin/unpowered) "sB" = ( -/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering, /turf/open/floor/plating/beach/sand{ light_range = 2 }, @@ -858,7 +858,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Kl" = ( /obj/effect/radiation, -/obj/item/book/manual/wiki/engineering_singulo_tesla, +/obj/item/book/manual/wiki/engineering, /turf/open/water/beach/deep, /area/overmap_encounter/planetoid/beachplanet/explored) "Ko" = ( diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm index c65fe197ed88..583c196e3dc3 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm @@ -3308,7 +3308,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "MY" = ( /obj/structure/table, -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /turf/open/floor/wood{ light_range = 2 }, @@ -3321,7 +3321,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Ni" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/medical_cloning, +/obj/item/book/manual/wiki/medicine, /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/ruin/beach/oceantown) diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm index 4e44e6fb41e0..b514b1c40f9c 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm @@ -617,7 +617,7 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/item/book/manual/wiki/engineering_singulo_tesla, +/obj/item/book/manual/wiki/engineering, /turf/open/floor/plasteel/icemoon, /area/ruin) "bE" = ( @@ -828,7 +828,7 @@ /turf/open/floor/plasteel/icemoon, /area/ruin) "cc" = ( -/obj/item/book/manual/wiki/atmospherics, +/obj/item/book/manual/wiki/engineering, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm index b63742662227..162934ae538b 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm @@ -1416,7 +1416,6 @@ "ex" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/book/manual/wiki/security_space_law, /obj/effect/turf_decal/corner/opaque/red{ dir = 1 }, diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm index 71b31e40d1fd..b368bc8059d8 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm @@ -597,7 +597,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/medical_cloning{ +/obj/item/book/manual/wiki/medicine{ pixel_x = 14 }, /obj/structure/fluff/paper/stack{ @@ -1305,7 +1305,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering{ pixel_x = -6; pixel_y = 9 }, @@ -1581,7 +1581,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/plumbing{ +/obj/item/book/manual/wiki/piloting{ pixel_y = 7; pixel_x = 5 }, @@ -2058,7 +2058,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/telescience{ +/obj/item/book/manual/wiki/surgery{ pixel_y = 11; pixel_x = -4 }, @@ -2760,7 +2760,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/robotics_cyborgs{ +/obj/item/book/manual/wiki/robotics{ pixel_x = -5; pixel_y = 4 }, @@ -2929,7 +2929,7 @@ /turf/open/floor/wood, /area/ruin/jungle) "SN" = ( -/obj/item/book/manual/wiki/research_and_development{ +/obj/item/book/manual/wiki/command{ pixel_y = 5; pixel_x = -5 }, @@ -3254,7 +3254,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/item/book/manual/wiki/infections{ +/obj/item/book/manual/wiki/piloting{ pixel_x = 2; pixel_y = 10 }, diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index cca97a317ce2..76f29663708d 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm @@ -2332,14 +2332,10 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood/corner, -/obj/item/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering{ pixel_x = 5; pixel_y = -7 }, -/obj/item/book/manual/wiki/grenades{ - pixel_x = -3; - pixel_y = 1 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/wrapping, /turf/open/floor/wood, @@ -2818,11 +2814,11 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, -/obj/item/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/hacking{ pixel_x = -8; pixel_y = 6 }, -/obj/item/book/manual/wiki/cooking_to_serve_man{ +/obj/item/book/manual/wiki/cooking{ pixel_x = 5; pixel_y = -6 }, @@ -3782,7 +3778,7 @@ color = "#66b266"; dir = 4 }, -/obj/item/book/manual/wiki/experimentor{ +/obj/item/book/manual/wiki/surgery{ pixel_x = 10; pixel_y = -5 }, diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm index cc5902f26a82..5aff7b4501b5 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm @@ -5802,7 +5802,7 @@ /area/overmap_encounter/planetoid/cave/explored) "Lv" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/tcomms{ +/obj/item/book/manual/wiki/construction{ pixel_x = -7; pixel_y = 4 }, @@ -6376,10 +6376,6 @@ /obj/item/radio/intercom/directional/south{ name = "Station Intercom (General)" }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -4; - pixel_y = 4 - }, /turf/open/floor/mineral/plastitanium/red/brig, /area/overmap_encounter/planetoid/cave/explored) "OC" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm b/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm index 1952fa3e16c8..ca1c8dc0794f 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_surface_bombmakers_cabin.dmm @@ -219,11 +219,6 @@ /area/overmap_encounter/planetoid/jungle/explored) "wK" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/grenades{ - desc = "Some kind of manual about making hellish grenades and explosives. Completely unreadable, but you feel as though you've gained a level in explosives."; - name = "Pete's Lesson"; - pixel_y = 3 - }, /turf/open/floor/wood{ icon_state = "wood-broken5" }, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm index 9cf2b5a40bae..1157f6a25701 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm @@ -1608,10 +1608,6 @@ /area/ruin/powered) "AY" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 12; - pixel_y = 2 - }, /obj/item/flashlight/lamp{ pixel_y = 4 }, diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm index bafc48460b64..adf957299b7a 100644 --- a/_maps/RandomRuins/SpaceRuins/astraeus.dmm +++ b/_maps/RandomRuins/SpaceRuins/astraeus.dmm @@ -937,7 +937,7 @@ name = "paper - Munitions Inventory"; pixel_x = 7 }, -/obj/item/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/hacking{ pixel_x = -6 }, /turf/open/floor/plasteel/airless, diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm index b70a3ada2857..f6a972e01e39 100644 --- a/_maps/RandomRuins/SpaceRuins/clericden.dmm +++ b/_maps/RandomRuins/SpaceRuins/clericden.dmm @@ -650,7 +650,7 @@ /turf/open/floor/carpet/airless, /area/ruin/unpowered/no_grav) "Fz" = ( -/obj/item/book/manual/wiki/engineering_construction, +/obj/item/book/manual/wiki/construction, /obj/structure/fluff/paper/stack{ dir = 9 }, diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index f477717d9b81..1e51a734834f 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -192,7 +192,7 @@ "gC" = ( /obj/structure/table, /obj/effect/turf_decal/corner/opaque/green/border, -/obj/item/book/manual/wiki/infections, +/obj/item/book/manual/wiki/ghetto_chemistry, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav) "gH" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 1b9136861194..635321fa9d4b 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -1507,7 +1507,6 @@ "ex" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/book/manual/wiki/security_space_law, /obj/effect/turf_decal/corner/opaque/red{ dir = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm index 486cbbce85fd..97330ae8074f 100644 --- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm +++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm @@ -11252,7 +11252,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/item/book/manual/wiki/engineering_singulo_tesla, +/obj/item/book/manual/wiki/engineering, /turf/open/space/basic, /area/space/nearstation) "Rp" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm index 276292022795..c2efbe90506d 100644 --- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm @@ -1085,7 +1085,7 @@ /area/ruin/space/has_grav/spacemall/dorms) "eb" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/engineering_hacking, +/obj/item/book/manual/wiki/hacking, /turf/open/floor/plasteel, /area/ruin/space/has_grav/spacemall/shop) "ed" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index e2b1ff97158c..3beb848e4ed7 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1504,7 +1504,6 @@ /area/centcom/ferry) "arZ" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) @@ -4435,7 +4434,7 @@ "aOO" = ( /obj/item/reagent_containers/food/condiment/enzyme, /obj/item/reagent_containers/food/drinks/shaker, -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /obj/structure/closet/crate, /turf/open/floor/plasteel, /area/centcom/holding) @@ -6205,7 +6204,6 @@ "bbL" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, /obj/effect/turf_decal/corner/transparent/neutral{ @@ -6528,7 +6526,6 @@ /area/centcom/control) "bRK" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -8155,7 +8152,6 @@ /turf/open/floor/plasteel/dark, /area/centcom/supply) "fsQ" = ( -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/structure/table/wood, /obj/effect/turf_decal/corner/transparent/neutral{ @@ -9011,7 +9007,6 @@ "hzR" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, /obj/effect/turf_decal/corner/transparent/neutral{ @@ -10115,7 +10110,6 @@ /area/centcom/evac) "kel" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -10774,7 +10768,6 @@ "lDl" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/book/manual/wiki/security_space_law, /obj/item/restraints/handcuffs, /obj/item/assembly/flash/handheld, /obj/machinery/airalarm/directional/south, @@ -12606,7 +12599,7 @@ /area/centcom/holding) "pDx" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/machinery/newscaster/directional/north{ @@ -13002,7 +12995,6 @@ /area/centcom/control) "qHN" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 @@ -13786,7 +13778,6 @@ /turf/open/floor/plasteel, /area/centcom/control) "sow" = ( -/obj/item/book/manual/wiki/security_space_law, /obj/structure/table/wood, /obj/effect/turf_decal/corner/transparent/neutral{ dir = 1 diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index 8f5c38ded0ea..1e7e6da790db 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -7054,10 +7054,6 @@ pixel_y = 4; pixel_x = 5 }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -6; - pixel_y = -10 - }, /turf/open/floor/plasteel/dark, /area/outpost/security) "yI" = ( @@ -14782,10 +14778,6 @@ /area/outpost/crew/dorm) "ZD" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 4; - pixel_y = 2 - }, /obj/machinery/door/window/brigdoor/southright{ req_access_txt = "101" }, diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm index bc92fdbc20c0..86b7908e0f9c 100644 --- a/_maps/outpost/nanotrasen_ice.dmm +++ b/_maps/outpost/nanotrasen_ice.dmm @@ -1250,10 +1250,6 @@ pixel_x = -5; pixel_y = 3 }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 13; - pixel_y = 1 - }, /turf/open/floor/plasteel/telecomms_floor, /area/outpost/security) "jl" = ( @@ -7835,10 +7831,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/item/book/manual/wiki/security_space_law{ - pixel_y = 17; - pixel_x = 3 - }, /obj/machinery/light/directional/west, /turf/open/floor/plasteel/telecomms_floor, /area/outpost/security/checkpoint) diff --git a/_maps/shuttles/independent/independent_nemo.dmm b/_maps/shuttles/independent/independent_nemo.dmm index f693cbcbdc27..fd2b1785c0d1 100644 --- a/_maps/shuttles/independent/independent_nemo.dmm +++ b/_maps/shuttles/independent/independent_nemo.dmm @@ -2241,7 +2241,7 @@ /turf/open/floor/plating, /area/ship/crew/dorm) "GX" = ( -/obj/item/book/manual/wiki/tcomms, +/obj/item/book/manual/wiki/engineering, /obj/effect/turf_decal/number/five{ dir = 8 }, diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm index 4a8f4e5ed30b..098509fd01e3 100644 --- a/_maps/shuttles/independent/independent_tranquility.dmm +++ b/_maps/shuttles/independent/independent_tranquility.dmm @@ -4801,7 +4801,7 @@ pixel_x = -6; pixel_y = 26 }, -/obj/item/book/manual/wiki/tcomms{ +/obj/item/book/manual/wiki/engineering{ pixel_x = -8; pixel_y = -1 }, diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index dfc829d40320..7b01398b2187 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -4700,8 +4700,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, /obj/item/book/manual/srmlore, -/obj/item/book/manual/wiki/detective, -/obj/item/book/manual/wiki/security_space_law, /obj/structure/bookcase, /obj/item/book/random, /obj/item/book/random, diff --git a/_maps/shuttles/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm index b2d763063f39..c8697cc70b9d 100644 --- a/_maps/shuttles/minutemen/minutemen_asclepius.dmm +++ b/_maps/shuttles/minutemen/minutemen_asclepius.dmm @@ -3752,7 +3752,7 @@ pixel_x = 1; pixel_y = 1 }, -/obj/item/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering{ pixel_x = 5; pixel_y = 2 }, diff --git a/_maps/shuttles/minutemen/minutemen_cepheus.dmm b/_maps/shuttles/minutemen/minutemen_cepheus.dmm index 9686aff53035..b38100b4e847 100644 --- a/_maps/shuttles/minutemen/minutemen_cepheus.dmm +++ b/_maps/shuttles/minutemen/minutemen_cepheus.dmm @@ -189,7 +189,7 @@ pixel_x = -4; pixel_y = 1 }, -/obj/item/book/manual/wiki/engineering_singulo_tesla{ +/obj/item/book/manual/wiki/engineering{ pixel_x = 5; pixel_y = 14 }, @@ -3036,10 +3036,6 @@ /area/ship/engineering/atmospherics) "FC" = ( /obj/structure/table, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 9; - pixel_y = 4 - }, /obj/item/flashlight/lamp{ pixel_x = -7; pixel_y = 1 @@ -4338,7 +4334,7 @@ /obj/effect/turf_decal/steeldecal/steel_decals_central2{ pixel_y = 2 }, -/obj/item/book/manual/wiki/robotics_cyborgs{ +/obj/item/book/manual/wiki/robotics{ pixel_x = -3; pixel_y = 3 }, diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm index ab5b6c7e8a1f..b3075c126f50 100644 --- a/_maps/shuttles/minutemen/minutemen_vela.dmm +++ b/_maps/shuttles/minutemen/minutemen_vela.dmm @@ -5893,10 +5893,6 @@ }, /obj/structure/table, /obj/machinery/firealarm/directional/south, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 9; - pixel_y = 4 - }, /obj/item/flashlight/lamp{ pixel_x = -7; pixel_y = 4 diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index 669e1df22ab8..a83b48f95a9d 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -1365,7 +1365,7 @@ pixel_x = 6; pixel_y = -3 }, -/obj/item/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering{ pixel_x = -3; pixel_y = -8 }, @@ -6508,7 +6508,7 @@ /obj/item/survey_handheld{ pixel_x = -2 }, -/obj/item/book/manual/wiki/robotics_cyborgs{ +/obj/item/book/manual/wiki/robotics{ pixel_y = -1; pixel_x = 5 }, @@ -11794,10 +11794,6 @@ /area/ship/engineering/electrical) "Se" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 5; - pixel_y = 2 - }, /obj/item/cigbutt/cigarbutt{ pixel_x = 8; pixel_y = -1 @@ -12200,10 +12196,6 @@ /area/ship/engineering/engine) "TE" = ( /obj/structure/table, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -5; - pixel_y = 16 - }, /obj/machinery/light/directional/west{ light_color = "#e8eaff" }, @@ -13955,10 +13947,6 @@ /area/ship/crew/canteen) "ZX" = ( /obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 4; - pixel_y = 2 - }, /obj/machinery/door/window/brigdoor/southright, /obj/machinery/door/window/brigdoor/southright{ dir = 1; diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm index f114c64f153f..cd144acc7094 100644 --- a/_maps/shuttles/pirate/pirate_ember.dmm +++ b/_maps/shuttles/pirate/pirate_ember.dmm @@ -8676,7 +8676,7 @@ /obj/structure/closet/crate/trashcart, /obj/item/trash/candy, /obj/effect/decal/cleanable/vomit/old, -/obj/item/book/manual/wiki/chemistry{ +/obj/item/book/manual/wiki/ghetto_chemistry{ pixel_x = 6; pixel_y = -5 }, @@ -9360,7 +9360,7 @@ /obj/structure/table/reinforced{ color = "#c1b6a5" }, -/obj/item/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/hacking{ pixel_x = 5; pixel_y = 4 }, diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index 12dbcaea4daa..3c2766b5725f 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -2367,7 +2367,7 @@ name = "Cooks Clothing"; pixel_x = -30 }, -/obj/item/book/manual/wiki/cooking_to_serve_man, +/obj/item/book/manual/wiki/cooking, /obj/item/clothing/under/rank/civilian/chef, /obj/item/clothing/under/rank/civilian/chef/skirt, /obj/item/clothing/suit/toggle/chef, diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 6c14c9503772..6fc3fcca1110 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -2791,7 +2791,7 @@ pixel_y = 4; pixel_x = -5 }, -/obj/item/book/manual/wiki/tcomms{ +/obj/item/book/manual/wiki/engineering{ pixel_x = 9; pixel_y = 3 }, diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm index 164018096972..402c5f04923c 100644 --- a/_maps/templates/shelter_3.dmm +++ b/_maps/templates/shelter_3.dmm @@ -39,7 +39,7 @@ /turf/open/floor/pod/dark, /area/survivalpod) "i" = ( -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /obj/item/reagent_containers/food/drinks/shaker, /obj/item/reagent_containers/glass/rag, /obj/structure/table/wood/fancy/black, From 6e108bf69db88ac4adea94bf6f93fc26af873342 Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Thu, 25 Jan 2024 04:58:49 -0300 Subject: [PATCH 3/5] sigh --- _maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm | 2 +- _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm | 4 ++-- _maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm | 2 +- _maps/RandomRuins/RockRuins/rockplanet_saloon.dmm | 2 +- _maps/RandomRuins/SpaceRuins/clericden.dmm | 2 +- _maps/RandomRuins/SpaceRuins/singularity_lab.dmm | 2 +- _maps/shuttles/independent/independent_nemo.dmm | 2 +- _maps/shuttles/minutemen/minutemen_vela.dmm | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm index b368bc8059d8..507c1866e111 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm @@ -2980,7 +2980,7 @@ /turf/closed/mineral/random/jungle, /area/ruin/jungle) "TE" = ( -/obj/structure/bookcase/manuals/research_and_development, +/obj/structure/bookcase/manuals/ghetto_chemistry, /turf/open/floor/wood, /area/ruin/jungle) "TH" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm index c8cd0dfd8964..1d6e3082f5bc 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm @@ -544,7 +544,7 @@ /area/overmap_encounter/planetoid/jungle/explored) "dZ" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering, /obj/machinery/light/small/broken/directional/west, /turf/open/floor/wood, /area/ruin/jungle/starport) @@ -1939,7 +1939,7 @@ /area/overmap_encounter/planetoid/jungle/explored) "nI" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/toxins, +/obj/item/book/manual/wiki/ghetto_chemistry, /obj/machinery/light/small/broken/directional/east, /turf/open/floor/wood{ icon_state = "wood-broken3" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm index 1bbc1b76a834..1ff358a4dd8b 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm @@ -545,7 +545,7 @@ /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/storage) "gz" = ( -/obj/structure/bookcase/manuals/research_and_development, +/obj/structure/bookcase/manuals/chemistry, /turf/open/floor/plasteel/white, /area/ruin/unpowered/codelab/reception) "gC" = ( diff --git a/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm b/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm index a7af51d9a489..13bdccd50d69 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm @@ -291,7 +291,7 @@ /area/overmap_encounter/planetoid/rockplanet/explored) "hj" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/barman_recipes{ +/obj/item/book/manual/wiki/drinks{ pixel_x = -2; pixel_y = 12 }, diff --git a/_maps/RandomRuins/SpaceRuins/clericden.dmm b/_maps/RandomRuins/SpaceRuins/clericden.dmm index f6a972e01e39..e163b6f46cea 100644 --- a/_maps/RandomRuins/SpaceRuins/clericden.dmm +++ b/_maps/RandomRuins/SpaceRuins/clericden.dmm @@ -578,7 +578,7 @@ /turf/open/floor/plasteel/dark/airless, /area/ruin/unpowered/no_grav) "Cb" = ( -/obj/item/book/manual/wiki/barman_recipes, +/obj/item/book/manual/wiki/drinks, /obj/structure/fluff/paper/stack{ dir = 5 }, diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm index 97330ae8074f..3175796cd159 100644 --- a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm +++ b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm @@ -7011,7 +7011,7 @@ "Cb" = ( /obj/structure/table, /obj/structure/spacevine, -/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 6 }, diff --git a/_maps/shuttles/independent/independent_nemo.dmm b/_maps/shuttles/independent/independent_nemo.dmm index fd2b1785c0d1..123c84a58f24 100644 --- a/_maps/shuttles/independent/independent_nemo.dmm +++ b/_maps/shuttles/independent/independent_nemo.dmm @@ -3248,7 +3248,7 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm) "VK" = ( -/obj/structure/bookcase/manuals/research_and_development, +/obj/structure/bookcase/manuals/ghetto_chemistry, /obj/effect/turf_decal/siding/wood{ dir = 8 }, diff --git a/_maps/shuttles/minutemen/minutemen_vela.dmm b/_maps/shuttles/minutemen/minutemen_vela.dmm index b3075c126f50..f21bc373c5c3 100644 --- a/_maps/shuttles/minutemen/minutemen_vela.dmm +++ b/_maps/shuttles/minutemen/minutemen_vela.dmm @@ -9111,7 +9111,7 @@ /area/ship/hallway/fore) "XC" = ( /obj/structure/table, -/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering, /turf/open/floor/wood, /area/ship/hallway/central) "XJ" = ( From 862a718dbd34a84a326c66a0fba0d77e048e0c8f Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:39:54 -0300 Subject: [PATCH 4/5] frdfffdfd --- _maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm | 2 +- _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm | 2 +- _maps/RandomRuins/SpaceRuins/dangerous_research.dmm | 2 +- _maps/shuttles/independent/independent_nemo.dmm | 2 +- code/modules/library/lib_items.dm | 6 ++++++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm index 507c1866e111..007b969e0985 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm @@ -2980,7 +2980,7 @@ /turf/closed/mineral/random/jungle, /area/ruin/jungle) "TE" = ( -/obj/structure/bookcase/manuals/ghetto_chemistry, +/obj/structure/bookcase/manuals/chemistry, /turf/open/floor/wood, /area/ruin/jungle) "TH" = ( diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm index 1d6e3082f5bc..645aa9e6d127 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm @@ -1939,7 +1939,7 @@ /area/overmap_encounter/planetoid/jungle/explored) "nI" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/ghetto_chemistry, +/obj/item/book/manual/wiki/chemistry, /obj/machinery/light/small/broken/directional/east, /turf/open/floor/wood{ icon_state = "wood-broken3" diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm index 1e51a734834f..28695ad57a80 100644 --- a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm +++ b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm @@ -192,7 +192,7 @@ "gC" = ( /obj/structure/table, /obj/effect/turf_decal/corner/opaque/green/border, -/obj/item/book/manual/wiki/ghetto_chemistry, +/obj/item/book/manual/wiki/chemistry, /turf/open/floor/plasteel/white, /area/ruin/space/has_grav) "gH" = ( diff --git a/_maps/shuttles/independent/independent_nemo.dmm b/_maps/shuttles/independent/independent_nemo.dmm index 123c84a58f24..44a34b5be1cc 100644 --- a/_maps/shuttles/independent/independent_nemo.dmm +++ b/_maps/shuttles/independent/independent_nemo.dmm @@ -3248,7 +3248,7 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm) "VK" = ( -/obj/structure/bookcase/manuals/ghetto_chemistry, +/obj/structure/bookcase/manuals/chemistry, /obj/effect/turf_decal/siding/wood{ dir = 8 }, diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 6685fa9ff617..c8d95482a837 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -196,6 +196,12 @@ // new /obj/item/book/manual/wiki/research_and_development(src) // update_appearance() +/obj/structure/bookcase/manuals/chemistry + name = "chemistry manuals bookcase" + +/obj/structure/bookcase/manuals/chemistry/Initialize() + new /obj/item/book/manual/wiki/chemistry(src) + new /obj/item/book/manual/wiki/ghetto_chemistry(src) /* * Book From bd50c4aabff737c12eaaa78a358d5eb98e91510c Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:46:56 -0300 Subject: [PATCH 5/5] sigh --- code/modules/library/lib_items.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index c8d95482a837..55d33ee80d20 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -200,6 +200,7 @@ name = "chemistry manuals bookcase" /obj/structure/bookcase/manuals/chemistry/Initialize() + . = ..() new /obj/item/book/manual/wiki/chemistry(src) new /obj/item/book/manual/wiki/ghetto_chemistry(src)