Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Folders, Notepad and Book Icon Updates and new props #465

Merged
merged 12 commits into from
Sep 28, 2024
Merged

Folders, Notepad and Book Icon Updates and new props #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ee95219
new updated less contrast heavy sprites
AmoryBlaine Sep 22, 2024
f20a279
Revert "new updated less contrast heavy sprites"
AmoryBlaine Sep 22, 2024
9d38431
fixed
AmoryBlaine Sep 22, 2024
c20d658
book stuff
AmoryBlaine Sep 22, 2024
500d206
oops
AmoryBlaine Sep 22, 2024
58c9772
Update book.dm
AmoryBlaine Sep 22, 2024
83a843c
Update code/game/objects/prop.dm
AmoryBlaine Sep 23, 2024
bd9bf39
Merge branch 'master' into folder-icon-update
AmoryBlaine Sep 23, 2024
9b8e748
Merge branch 'master' into folder-icon-update
AmoryBlaine Sep 24, 2024
a7ba166
Update code/modules/paperwork/folders.dm
AndroBetel Sep 27, 2024
f78ee1d
Update code/game/objects/prop.dm
AndroBetel Sep 27, 2024
4be0a98
Merge branch 'master' into folder-icon-update
AndroBetel Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/items/books/book.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/obj/item/book
name = "book"
icon = 'icons/obj/items/books.dmi'
icon_state ="book"
icon_state ="book_blue"
throw_speed = SPEED_FAST
throw_range = 5
/// upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
Expand Down
34 changes: 17 additions & 17 deletions code/game/objects/items/books/manuals.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

/obj/item/book/manual/engineering_construction
name = "Station Repairs and Construction"
icon_state ="bookEngineering"
icon_state ="book_engineering"
author = "Engineering Encyclopedia"
title = "Station Repairs and Construction"

Expand All @@ -31,7 +31,7 @@

/obj/item/book/manual/engineering_hacking
name = "Hacking"
icon_state ="bookHacking"
icon_state ="book_hacking"
author = "Engineering Encyclopedia"
title = "Hacking"

Expand All @@ -51,7 +51,7 @@

/obj/item/book/manual/ripley_build_and_repair
name = "APLU \"Ripley\" Construction and Operation Manual"
icon_state ="book"
icon_state ="book_engineering"
author = "Randall Varn, Einstein Engines Senior Mechanic"
title = "APLU \"Ripley\" Construction and Operation Manual"

Expand Down Expand Up @@ -128,7 +128,7 @@

/obj/item/book/manual/research_and_development
name = "Research and Development 101"
icon_state = "rdbook"
icon_state = "book_white"
author = "Dr. L. Ight"
title = "Research and Development 101"

Expand All @@ -149,7 +149,7 @@
/obj/item/book/manual/security_space_law
name = "Standard Operating Procedure"
desc = "A set of USCM guidelines for keeping law and order on their vessels."
icon_state = "bookSpaceLaw"
icon_state = "book_sop"
author = "USCM High Command"
title = "Standard Operating Procedure"

Expand All @@ -170,7 +170,7 @@
/obj/item/book/manual/marine_law
name = "Marine Law"
desc = "A set of guidelines for keeping law and order on military vessels."
icon_state = "bookSpaceLaw"
icon_state = "book_law"
author = "USCM High Command"
title = "Marine Law"

Expand All @@ -191,7 +191,7 @@
/obj/item/book/manual/surgery
name = "Surgical Reference Manual"
desc = "A quick reference manual for surgical procedures."
icon_state = "bookMedical"
icon_state = "book_medical"
author = "Weyland-Yutani Medicine Department"
title = "Surgical Reference Manual"

Expand All @@ -212,7 +212,7 @@
/obj/item/book/manual/medical_diagnostics_manual
name = "WY Medical Diagnostics Manual"
desc = "First, do no harm. A detailed medical practitioner's guide."
icon_state = "bookMedical"
icon_state = "book_medical"
author = "Weyland-Yutani Medicine Department"
title = "WY Medical Diagnostics Manual"

Expand Down Expand Up @@ -257,7 +257,7 @@

/obj/item/book/manual/engineering_guide
name = "Engineering Textbook"
icon_state ="bookEngineering2"
icon_state ="book_engineering"
author = "Engineering Encyclopedia"
title = "Engineering Textbook"

Expand All @@ -276,7 +276,7 @@

/obj/item/book/manual/chef_recipes
name = "Chef Recipes"
icon_state = "cooked_book"
icon_state = "book_white"
author = "Victoria Ponsonby"
title = "Chef Recipes"

Expand Down Expand Up @@ -335,7 +335,7 @@

/obj/item/book/manual/barman_recipes
name = "Barman Recipes"
icon_state = "barbook"
icon_state = "book_purple"
author = "Sir John Rose"
title = "Barman Recipes"

Expand Down Expand Up @@ -390,7 +390,7 @@

/obj/item/book/manual/detective
name = "The Film Noir: Proper Procedures for Investigations"
icon_state ="bookDetective"
icon_state ="book_black"
author = "Weyland-Yutani"
title = "The Film Noir: Proper Procedures for Investigations"

Expand Down Expand Up @@ -434,7 +434,7 @@

/obj/item/book/manual/nuclear
name = "Fission Mailed: Nuclear Sabotage 101"
icon_state ="bookNuclear"
icon_state ="book_sop"
author = "The Colonial Liberation Front"
title = "Fission Mailed: Nuclear Sabotage 101"

Expand Down Expand Up @@ -486,7 +486,7 @@

/obj/item/book/manual/atmospipes
name = "Pipes and You: Getting To Know Your Scary Tools"
icon_state = "pipingbook"
icon_state = "book_piping"
author = "Maria Crash, Senior Atmospherics Technician"
title = "Pipes and You: Getting To Know Your Scary Tools"
dat = {"<html>
Expand Down Expand Up @@ -594,7 +594,7 @@

/obj/item/book/manual/evaguide
name = "EVA Gear and You: Not Spending All Day Inside"
icon_state = "evabook"
icon_state = "book_engineering"
author = "Maria Crash, Senior Atmospherics Technician"
title = "EVA Gear and You: Not Spending All Day Inside"
dat = {"<html>
Expand Down Expand Up @@ -666,7 +666,7 @@

/obj/item/book/manual/hydroponics_beekeeping
name = "The Ins and Outs of Apiculture - A Precise Art"
icon_state ="bookHydroponicsBees"
icon_state ="book_green"
author = "Beekeeper Dave"
title = "The Ins and Outs of Apiculture - A Precise Art"
dat = {"<html>
Expand Down Expand Up @@ -698,7 +698,7 @@

/obj/item/book/manual/orbital_cannon_manual
name = "USCM Orbital Bombardment System Manual"
icon_state = "bookEngineering"
icon_state = "book_dark"
author = "USCM R&D"
title = "USCM Orbital Bombardment System Manual"

Expand Down
28 changes: 25 additions & 3 deletions code/game/objects/prop.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,10 @@

//books
/obj/item/prop/magazine/book
name = "generic prop book"
desc = "some generic hardcover book, probably sucked"
name = "book"
desc = "A generic hardcore novel. Really boring. Probably. Too bored to read."
icon = 'icons/obj/items/books.dmi'
icon_state = "bookSpaceLaw"
icon_state = "book_blue"

/obj/item/prop/magazine/book/spacebeast
name = "\improper Space Beast, by Robert Morse"
Expand All @@ -302,6 +302,28 @@
name = "The Art of War"
desc = "A treatise on war written by Sun Tzu a great general, strategist, and philosopher from ancient Earth. This book is on the Commandant of the United States Colonial Marine Corps reading list and most officers can be found in possession of a copy. Most officers who've read it claim to know a little bit more about fighting than most enlisted but results may vary. "

/obj/item/prop/magazine/book/uppbooklet
name = "UPP Party Doctrine Booklet"
desc = "A booklet provided to every single citizen of the Union of Progressive Peoples. The first page is stamped with the Party's insignia followed by a emphatic dedication to the working class; past, present, and future. Aside from being an easily digestible summary of the collective ideology of the Union, the booklet provides you with an outline of the Union's history and a good chunk is dedicated to listing and summarizing each of the Union's many member states."
icon_state = "book_upp"

/obj/item/prop/magazine/book/warisaracket
name = "War is a Racket"
desc = "A book critical of the United States Marine Corps by Marine Corps legend, Major General Smedley Butler. In short, the book outlines the function which the historical Marine Corps had in establishing and enforcing American global hegemony. Good thing its critiques have no contemporary application. Right?"

/obj/item/prop/magazine/book/littleredbook
name = "Quotations from Chairman Mao Tse-tung"
desc = "A tiny red book that fits in the palm of your hand. While not required reading, it provides the reader with easy access to- as the name implies- Quotations from Chairman Mao Tse-tung."
icon_state = "littleredbook"

/obj/item/prop/magazine/book/communistmanifesto
name = "Communist Manifesto"
desc = "The bare minimum in communist reading."

/obj/item/prop/magazine/book/inframaterialism
name = "A Brief Look at Infra-Materialism"
desc = "A concise introduction to the esoteric communist theory of infra-materialism by Ignus Nilsen."

//boots magazine
/obj/item/prop/magazine/boots
name = "generic Boots! magazine"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/paperwork/folders.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
desc = "A black folder."
icon_state = "folder_black"

/obj/item/folder/green
desc = "A green folder."
icon_state = "folder_green"
AndroBetel marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/folder/black_random
desc = "A black folder. It is decorated with stripes."
icon_state = "folder_black_green"
Expand Down
Binary file modified icons/obj/items/books.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/notepads.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/paper.dmi
View file
Open in desktop
Binary file not shown.
Loading