diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index c324a6f092..07440ae5f5 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -180,7 +180,12 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," /obj/item/weapon/book/tome name = "arcane tome" icon = 'icons/obj/weapons.dmi' + item_icons = list( + icon_l_hand = 'icons/mob/items/lefthand_books.dmi', + icon_r_hand = 'icons/mob/items/righthand_books.dmi', + ) icon_state ="tome" + item_state = "tome" throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 7978115ca2..1ac3dcf013 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -9,6 +9,7 @@ /obj/item/weapon/book/manual/engineering_construction name = "Station Repairs and Construction" icon_state ="bookEngineering" + item_state = "book3" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Station Repairs and Construction" @@ -30,6 +31,7 @@ /obj/item/weapon/book/manual/engineering_particle_accelerator name = "Particle Accelerator User's Guide" icon_state ="bookParticleAccelerator" + item_state = "book15" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Particle Accelerator User's Guide" @@ -77,6 +79,7 @@ /obj/item/weapon/book/manual/supermatter_engine name = "Supermatter Engine Operating Manual" icon_state = "bookSupermatter" + item_state = "book15" author = "Central Engineering Division" title = "Supermatter Engine Operating Manual" @@ -160,6 +163,7 @@ /obj/item/weapon/book/manual/tesla_engine name = "Tesla Operating Manual" icon_state ="bookTesla" + item_state = "book15" author = "Engineering Encyclopedia" title = "Tesla Engine User's Guide" dat = {" @@ -229,6 +233,7 @@ /obj/item/weapon/book/manual/rust_engine name = "R-UST Operating Manual" icon_state = "bookSupermatter" + item_state = "book15" author = "Cindy Crawfish" title = "R-UST Operating Manual" @@ -269,6 +274,7 @@ /obj/item/weapon/book/manual/engineering_hacking name = "Hacking" icon_state ="bookHacking" + item_state = "book2" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Hacking" @@ -291,6 +297,7 @@ /obj/item/weapon/book/manual/engineering_singularity_safety name = "Singularity Safety in Special Circumstances" icon_state ="bookEngineeringSingularitySafety" + item_state = "book15" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Singularity Safety in Special Circumstances" @@ -343,6 +350,7 @@ /obj/item/weapon/book/manual/hydroponics_pod_people name = "The Diona Harvest - From Seed to Market" icon_state ="bookHydroponicsPodPeople" + item_state = "book5" author = "Farmer John" title = "The Diona Harvest - From Seed to Market" @@ -381,6 +389,7 @@ /obj/item/weapon/book/manual/medical_cloning name = "Cloning Techniques of the 26th Century" icon_state ="bookCloning" + item_state = "book9" author = "Medical Journal, volume 3" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Cloning Techniques of the 26th Century" @@ -474,6 +483,7 @@ /obj/item/weapon/book/manual/ripley_build_and_repair name = "APLU \"Ripley\" Construction and Operation Manual" icon_state ="book" + item_state = "book" author = "Randall Varn, Einstein Engines Senior Mechanic" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "APLU \"Ripley\" Construction and Operation Manual" @@ -551,6 +561,7 @@ /obj/item/weapon/book/manual/research_and_development name = "Research and Development 101" icon_state = "rdbook" + item_state = "book7" author = "Dr. L. Ight" title = "Research and Development 101" @@ -620,6 +631,7 @@ /obj/item/weapon/book/manual/robotics_cyborgs name = "Cyborgs for Dummies" icon_state = "borgbook" + item_state = "book1" author = "XISC" title = "Cyborgs for Dummies" @@ -826,6 +838,7 @@ name = "Corporate Regulations" desc = "A set of corporate guidelines for keeping law and order on privately-owned space stations." icon_state = "bookSpaceLaw" + item_state = "book13" author = "The Company" title = "Corporate Regulations" @@ -850,6 +863,7 @@ name = "Medical Diagnostics Manual" desc = "First, do no harm. A detailed medical practitioner's guide." icon_state = "bookMedical" + item_state = "book12" author = "Medical Department" title = "Medical Diagnostics Manual" @@ -897,6 +911,7 @@ /obj/item/weapon/book/manual/engineering_guide name = "Engineering Textbook" icon_state ="bookEngineering2" + item_state = "book3" author = "Engineering Encyclopedia" title = "Engineering Textbook" @@ -918,6 +933,7 @@ /obj/item/weapon/book/manual/chef_recipes name = "Chef Recipes" icon_state = "cooked_book" + item_state = "book16" author = "Victoria Ponsonby" title = "Chef Recipes" @@ -978,6 +994,7 @@ name = "Barman Recipes" desc = "For the enterprising drink server." icon_state = "barbook" + item_state = "book14" author = "Sir John Rose" title = "Barman Recipes" @@ -1033,6 +1050,7 @@ /obj/item/weapon/book/manual/detective name = "The Film Noir: Proper Procedures for Investigations" icon_state ="bookDetective" + item_state = "book8" author = "The Company" title = "The Film Noir: Proper Procedures for Investigations" @@ -1076,6 +1094,7 @@ /obj/item/weapon/book/manual/nuclear name = "Fission Mailed: Nuclear Sabotage 101" icon_state ="bookNuclear" + item_state = "book8" author = "Syndicate" title = "Fission Mailed: Nuclear Sabotage 101" @@ -1127,6 +1146,7 @@ /obj/item/weapon/book/manual/atmospipes name = "Pipes and You: Getting To Know Your Scary Tools" icon_state = "pipingbook" + item_state = "book3" author = "Maria Crash, Senior Atmospherics Technician" title = "Pipes and You: Getting To Know Your Scary Tools" dat = {" @@ -1235,6 +1255,7 @@ /obj/item/weapon/book/manual/evaguide name = "EVA Gear and You: Not Spending All Day Inside, 2nd Edition" icon_state = "evabook" + item_state = "book14" author = "Maria Crash, Senior Atmospherics Technician" title = "EVA Gear and You: Not Spending All Day Inside, 2nd Edition" dat = {" diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 639a1e9bc6..8119de19e0 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -3,6 +3,10 @@ desc = "A scroll for moving around." icon = 'icons/obj/wizard.dmi' icon_state = "scroll" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_books.dmi' + ) var/uses = 4.0 w_class = ITEMSIZE_TINY item_state = "paper" diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 75cbc2297e..62c70457c0 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -2,6 +2,11 @@ name = "bible" desc = "Apply to head repeatedly." icon_state ="bible" + item_state = "bible" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_books.dmi' + ) throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 9273ece79e..879c7595a4 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -167,6 +167,11 @@ Book Cart End name = "book" icon = 'icons/obj/library.dmi' icon_state ="book" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_books.dmi' + ) + item_state = "book" throw_speed = 1 throw_range = 5 flags = NOCONDUCT diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index aec3b1a9c1..6ddeb9a804 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -446,7 +446,8 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f B.title = title B.author = author B.dat = content - B.icon_state = "book[rand(1,7)]" + B.icon_state = "book[rand(1,16)]" + B.item_state = B.icon_state src.visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?") break if(href_list["orderbyid"]) diff --git a/code/modules/lore_codex/codex.dm b/code/modules/lore_codex/codex.dm index 8aae028a20..366dc95a61 100644 --- a/code/modules/lore_codex/codex.dm +++ b/code/modules/lore_codex/codex.dm @@ -3,6 +3,7 @@ name = "Generic Codex: Electric Bugaloo" desc = "If you can read this, something is broken!" icon_state = "codex" + item_state = "book4" unique = TRUE var/datum/codex_tree/tree = null var/root_type = /datum/lore/codex/category/main_vir_lore //Runtimes on codex_tree.dm, line 18 with a null here @@ -29,6 +30,7 @@ name = "A Buyer's Guide to Artificial Bodies" desc = "Recommended reading for the newly cyborgified, new positronics, and the upwardly-mobile FBP." icon_state = "codex_robutt" + item_state = "book6" root_type = /datum/lore/codex/category/main_robutts libcategory = "Reference" @@ -36,6 +38,7 @@ name = "Daedalus Pocket Newscaster" desc = "A regularly-updating compendium of articles on current events. Essential for new arrivals in the Vir system and anyone interested in politics." icon_state = "newscodex" + item_state = "book1" w_class = ITEMSIZE_SMALL root_type = /datum/lore/codex/category/main_news libcategory = "Reference" @@ -46,6 +49,7 @@ desc = "Contains large amounts of information on Standard Operating Procedure, Corporate Regulations, and important regional laws. The best friend of \ Internal Affairs." icon_state = "corp_regs" + item_state = "book10" root_type = /datum/lore/codex/category/main_corp_regs throwforce = 5 // Throw the book at 'em. libcategory = "Reference" diff --git a/code/modules/xenoarcheaology/manuals.dm b/code/modules/xenoarcheaology/manuals.dm index 63bcce9218..da2a9fb0dc 100644 --- a/code/modules/xenoarcheaology/manuals.dm +++ b/code/modules/xenoarcheaology/manuals.dm @@ -2,6 +2,7 @@ /obj/item/weapon/book/manual/excavation name = "Out on the Dig" icon_state = "excavation" + item_state = "book6" author = "Professor Patrick Mason, Curator of the Antiquities Museum on Ichar VII" title = "Out on the Dig" dat = {" @@ -115,6 +116,7 @@ /obj/item/weapon/book/manual/mass_spectrometry name = "High Power Mass Spectrometry: A Comprehensive Guide" icon_state = "analysis" + item_state = "book6" author = "Winton Rice, Chief Mass Spectrometry Technician at the Institute of Applied Sciences on Arcadia" title = "High powered mass spectrometry, a comprehensive guide" dat = {" @@ -186,6 +188,7 @@ /obj/item/weapon/book/manual/anomaly_spectroscopy name = "Spectroscopy: Analysing the Anomalies of the Cosmos" icon_state = "anomaly" + item_state = "book6" author = "Doctor Martin Boyle, Director Research at the Lower Hydrolian Sector Listening Array" title = "Spectroscopy: Analysing the Anomalies of the Cosmos" dat = {" @@ -211,6 +214,7 @@ /obj/item/weapon/book/manual/materials_chemistry_analysis name = "Materials Analysis and the Chemical Implications" icon_state = "chemistry" + item_state = "book6" author = "Jasper Pascal, Senior Lecturer in Materials Analysis at the University of Jol'Nar" title = "Materials Analysis and the Chemical Implications" dat = {" @@ -238,6 +242,7 @@ /obj/item/weapon/book/manual/anomaly_testing name = "Anomalous Materials and Energies" icon_state = "triangulate" + item_state = "book6" author = "Norman York, formerly of the Tyrolion Institute on Titan" title = "Anomalous Materials and Energies" dat = {" @@ -316,6 +321,7 @@ /obj/item/weapon/book/manual/stasis name = "Cellular Suspension, the New Cryogenics?" icon_state = "stasis" + item_state = "book6" author = "Elvin Schmidt" title = "Cellular Suspension, the New Cryogenics?" dat = {" diff --git a/html/changelogs/cerebulon - booksprites.yml b/html/changelogs/cerebulon - booksprites.yml new file mode 100644 index 0000000000..95bd5fd49c --- /dev/null +++ b/html/changelogs/cerebulon - booksprites.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Cerebulon + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added inhand sprites for books." + -imageadd: "Added new book sprites, replaced old book sprites." diff --git a/icons/mob/items/lefthand_books.dmi b/icons/mob/items/lefthand_books.dmi new file mode 100644 index 0000000000..4b9d9fe481 Binary files /dev/null and b/icons/mob/items/lefthand_books.dmi differ diff --git a/icons/mob/items/righthand_books.dmi b/icons/mob/items/righthand_books.dmi new file mode 100644 index 0000000000..666e304aad Binary files /dev/null and b/icons/mob/items/righthand_books.dmi differ diff --git a/icons/obj/custom_books.dmi b/icons/obj/custom_books.dmi index 2be098e848..f60a15fc1a 100644 Binary files a/icons/obj/custom_books.dmi and b/icons/obj/custom_books.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 5bc1d782ab..40cde48d26 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ