diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index a450fa3b8d..7dee7eeaed 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -638,6 +638,23 @@ "} +/obj/item/weapon/book/manual/robotics_manual + name = "Guide to Robotics" + icon_state ="evabook" + item_state = "book3" + author = "Simple Robotics" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + title = "Guide to Robotics" + +/obj/item/weapon/book/manual/robotics_manual/New() + ..() + dat = {" + + + + + + + "} /obj/item/weapon/book/manual/robotics_cyborgs name = "Cyborgs for Dummies" diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index d624ce5e1a..7db48bb910 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -20372,7 +20372,25 @@ /obj/structure/bookcase{ name = "bookcase (Non-Fiction)" }, +<<<<<<< HEAD /obj/item/weapon/book/codex/lore/robutt, +======= +/obj/item/weapon/book/manual/hydroponics_pod_people, +/obj/item/weapon/book/manual/mass_spectrometry, +/obj/item/weapon/book/manual/materials_chemistry_analysis, +/obj/item/weapon/book/manual/medical_cloning, +/obj/item/weapon/book/manual/medical_diagnostics_manual, +/obj/item/weapon/book/manual/research_and_development, +/obj/item/weapon/book/manual/resleeving, +/obj/item/weapon/book/manual/ripley_build_and_repair, +/obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/weapon/book/manual/robotics_manual, +/obj/item/weapon/book/manual/rust_engine, +/obj/item/weapon/book/manual/security_space_law, +/obj/item/weapon/book/manual/standard_operating_procedure, +/obj/item/weapon/book/manual/stasis, +/obj/item/weapon/book/manual/supermatter_engine, +>>>>>>> 09a9819f20... Merge pull request #13295 from FirstSgtDan/Books /turf/simulated/floor/wood, /area/library) "aGx" = ( @@ -36890,6 +36908,7 @@ "bkS" = ( /obj/structure/table/standard, /obj/item/weapon/book/manual/robotics_cyborgs, +/obj/item/weapon/book/manual/robotics_manual, /obj/item/clothing/glasses/omnihud/rnd, /obj/machinery/light{ dir = 8