Merge branch 'master' into MRE-no-water

code/game/machinery/vending/vendor_types/medical.dm

@@ -268,6 +268,7 @@
 	)
 
 /obj/structure/machinery/cm_vending/sorted/medical/Destroy()
+	STOP_PROCESSING(SSslowobj, src)
 	QDEL_NULL(last_health_display)
 	. = ..()
 

code/game/objects/items/books/book.dm

@@ -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)

code/game/objects/items/books/manuals.dm

@@ -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"
 
@@ -31,7 +31,7 @@
 
 /obj/item/book/manual/engineering_hacking
 	name = "Hacking"
-	icon_state ="bookHacking"
+	icon_state ="book_hacking"
 	author = "Engineering Encyclopedia"
 	title = "Hacking"
 
@@ -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"
 
@@ -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"
 
@@ -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"
 
@@ -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"
 
@@ -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"
 
@@ -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"
 
@@ -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"
 
@@ -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"
 
@@ -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"
 
@@ -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"
 
@@ -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"
 
@@ -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>
@@ -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>
@@ -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>
@@ -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"
 

code/game/objects/prop.dm

@@ -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"
@@ -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"

code/game/objects/structures/gun_rack.dm

@@ -53,6 +53,9 @@
 /obj/structure/gun_rack/m41/unloaded
 	populate_type = /obj/item/weapon/gun/rifle/m41aMK1/unloaded
 
+/obj/structure/gun_rack/m41/empty
+	initial_stored = 0
+
 /obj/structure/gun_rack/type71
 	icon_state = "type71"
 	desc = "Some off-branded gun rack. Per SOF and UPPA regulations, weapons should be stored in secure safes and only given out when necessary. Of course, most (but not all!) units overlook this regulation, only storing their firearms in safes when inspection arrives."
@@ -64,6 +67,9 @@
 /obj/structure/gun_rack/type71/unloaded
 	populate_type = /obj/item/weapon/gun/rifle/type71/unloaded
 
+/obj/structure/gun_rack/type71/empty
+	initial_stored = 0
+
 /obj/structure/gun_rack/apc
 	name = "APC ammo compartment"
 	icon_state = "frontal"
@@ -104,6 +110,9 @@
 /obj/structure/gun_rack/flamer/unloaded
 	populate_type = /obj/item/weapon/gun/flamer/unloaded
 
+/obj/structure/gun_rack/flamer/empty
+	initial_stored = 0
+
 /obj/structure/gun_rack/mk221
 	name = "M120 shotgun rack"
 	icon_state = "mk221"
@@ -112,3 +121,6 @@
 	initial_stored = 2
 	allowed_type = /obj/item/weapon/gun/shotgun/combat
 	populate_type = /obj/item/weapon/gun/shotgun/combat
+
+/obj/structure/gun_rack/mk221/empty
+	initial_stored = 0

code/modules/paperwork/folders.dm

@@ -26,6 +26,10 @@
 	desc = "A black folder."
 	icon_state = "folder_black"
 
+/obj/item/folder/green
+	desc = "A green folder."
+	icon_state = "folder_green"
+
 /obj/item/folder/black_random
 	desc = "A black folder. It is decorated with stripes."
 	icon_state = "folder_black_green"

code/modules/projectiles/ammo_boxes/magazine_boxes.dm

@@ -557,7 +557,7 @@
 /obj/item/ammo_box/magazine/mk1
 	name = "magazine box (M41A MK1 x 10)"
 	overlay_ammo_type = "_reg_mk1"
-	overlay_gun_type = "_mk1"
+	overlay_gun_type = "_m41"
 	overlay_content = "_reg"
 	magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1
 	allowed_magazines = list(/obj/item/ammo_magazine/rifle/m41aMK1/recon)