New "in_hands" and "onmob" icon sprites for objects, book import from PVE (thanks Amory), small changes and fixes

code/game/objects/items.dm

@@ -914,8 +914,8 @@ cases. Override_icon_state should be a list.*/
 
 	SEND_SIGNAL(src, COMSIG_ITEM_ZOOM, user)
 	var/zoom_device = zoomdevicename ? "\improper [zoomdevicename] of [src]" : "\improper [src]"
-	user.visible_message(SPAN_NOTICE("[user] peers through \the [zoom_device]."),
-	SPAN_NOTICE("You peer through \the [zoom_device]."))
+	user.visible_message(SPAN_NOTICE("[user] peers through [zoom_device]."),
+	SPAN_NOTICE("You peer through [zoom_device]."))
 	zoom = !zoom
 
 /obj/item/proc/get_icon_state(mob/user_mob, slot)

code/game/objects/items/bodybag.dm

@@ -5,6 +5,7 @@
 	desc = "A folded bag designed for the storage and transportation of cadavers."
 	icon = 'icons/obj/bodybag.dmi'
 	icon_state = "bodybag_folded"
+	item_state = "bodybag"
 	w_class = SIZE_SMALL
 	var/unfolded_path = /obj/structure/closet/bodybag
 
@@ -33,6 +34,7 @@
 	desc = "A folded, reusable bag designed to prevent additional damage to an occupant."
 	icon = 'icons/obj/cryobag.dmi'
 	icon_state = "bodybag_folded"
+	item_state = "cryobag"
 	unfolded_path = /obj/structure/closet/bodybag/cryobag
 	matter = list("plastic" = 7500)
 	var/used = 0

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

@@ -5,6 +5,10 @@
 	name = "book"
 	icon = 'icons/obj/items/books.dmi'
 	icon_state ="book"
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_1.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_1.dmi'
+		)
 	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,8 @@
 
 /obj/item/book/manual/engineering_construction
 	name = "Station Repairs and Construction"
-	icon_state ="bookEngineering"
+	icon_state = "book_engineering"
+	item_state = "book_engineering"
 	author = "Engineering Encyclopedia"
 	title = "Station Repairs and Construction"
 
@@ -31,7 +32,8 @@
 
 /obj/item/book/manual/engineering_hacking
 	name = "Hacking"
-	icon_state ="bookHacking"
+	icon_state = "book_hacking"
+	item_state = "book_hacking"
 	author = "Engineering Encyclopedia"
 	title = "Hacking"
 
@@ -51,7 +53,8 @@
 
 /obj/item/book/manual/ripley_build_and_repair
 	name = "APLU \"Ripley\" Construction and Operation Manual"
-	icon_state ="book"
+	icon_state = "book_dark"
+	item_state = "book_dark"
 	author = "Randall Varn, Einstein Engines Senior Mechanic"
 	title = "APLU \"Ripley\" Construction and Operation Manual"
 
@@ -128,7 +131,8 @@
 
 /obj/item/book/manual/research_and_development
 	name = "Research and Development 101"
-	icon_state = "rdbook"
+	icon_state = "book_white"
+	item_state = "book_white"
 	author = "Dr. L. Ight"
 	title = "Research and Development 101"
 
@@ -149,7 +153,8 @@
 /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"
+	item_state = "book_sop"
 	author = "USCM High Command"
 	title = "Standard Operating Procedure"
 
@@ -170,7 +175,8 @@
 /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"
+	item_state = "book_law"
 	author = "USCM High Command"
 	title = "Marine Law"
 
@@ -191,7 +197,8 @@
 /obj/item/book/manual/surgery
 	name = "Surgical Reference Manual"
 	desc = "A quick reference manual for surgical procedures."
-	icon_state = "bookMedical"
+	icon_state = "book_medical"
+	item_state = "book_medical"
 	author = "Weyland-Yutani Medicine Department"
 	title = "Surgical Reference Manual"
 
@@ -212,7 +219,8 @@
 /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"
+	item_state = "book_medical"
 	author = "Weyland-Yutani Medicine Department"
 	title = "WY Medical Diagnostics Manual"
 
@@ -257,7 +265,8 @@
 
 /obj/item/book/manual/engineering_guide
 	name = "Engineering Textbook"
-	icon_state ="bookEngineering2"
+	icon_state = "book_engineering"
+	item_state = "book_engineering"
 	author = "Engineering Encyclopedia"
 	title = "Engineering Textbook"
 
@@ -276,7 +285,8 @@
 
 /obj/item/book/manual/chef_recipes
 	name = "Chef Recipes"
-	icon_state = "cooked_book"
+	icon_state = "book_green"
+	item_state = "book_green"
 	author = "Victoria Ponsonby"
 	title = "Chef Recipes"
 
@@ -335,7 +345,8 @@
 
 /obj/item/book/manual/barman_recipes
 	name = "Barman Recipes"
-	icon_state = "barbook"
+	icon_state = "book_red"
+	item_state = "book_red"
 	author = "Sir John Rose"
 	title = "Barman Recipes"
 
@@ -434,7 +445,8 @@
 
 /obj/item/book/manual/nuclear
 	name = "Fission Mailed: Nuclear Sabotage 101"
-	icon_state ="bookNuclear"
+	icon_state = "book_particle"
+	item_state = "book_particle"
 	author = "The Colonial Liberation Front"
 	title = "Fission Mailed: Nuclear Sabotage 101"
 
@@ -486,7 +498,8 @@
 
 /obj/item/book/manual/atmospipes
 	name = "Pipes and You: Getting To Know Your Scary Tools"
-	icon_state = "pipingbook"
+	icon_state = "book_piping"
+	item_state = "book_piping"
 	author = "Maria Crash, Senior Atmospherics Technician"
 	title = "Pipes and You: Getting To Know Your Scary Tools"
 	dat = {"<html>
@@ -594,7 +607,8 @@
 
 /obj/item/book/manual/evaguide
 	name = "EVA Gear and You: Not Spending All Day Inside"
-	icon_state = "evabook"
+	icon_state = "book_blue"
+	item_state = "book_blue"
 	author = "Maria Crash, Senior Atmospherics Technician"
 	title = "EVA Gear and You: Not Spending All Day Inside"
 	dat = {"<html>
@@ -666,7 +680,8 @@
 
 /obj/item/book/manual/hydroponics_beekeeping
 	name = "The Ins and Outs of Apiculture - A Precise Art"
-	icon_state ="bookHydroponicsBees"
+	icon_state = "book_green"
+	item_state = "book_green"
 	author = "Beekeeper Dave"
 	title = "The Ins and Outs of Apiculture - A Precise Art"
 	dat = {"<html>
@@ -698,7 +713,8 @@
 
 /obj/item/book/manual/orbital_cannon_manual
 	name = "USCM Orbital Bombardment System Manual"
-	icon_state = "bookEngineering"
+	icon_state = "book_engineering"
+	item_state = "book_engineering"
 	author = "USCM R&D"
 	title = "USCM Orbital Bombardment System Manual"
 

code/game/objects/items/devices/binoculars.dm

@@ -4,6 +4,7 @@
 	desc = "A military-issued pair of binoculars."
 	icon = 'icons/obj/items/binoculars.dmi'
 	icon_state = "binoculars"
+	item_state = "binoculars"
 	pickup_sound = 'sound/handling/wirecutter_pickup.ogg'
 	drop_sound = 'sound/handling/wirecutter_drop.ogg'
 	flags_atom = FPRINT|CONDUCT
@@ -14,6 +15,7 @@
 	throw_speed = SPEED_VERY_FAST
 	/// If FALSE won't change icon_state to a camo marine bino.
 	var/uses_camo = TRUE
+	var/raised = FALSE
 
 
 	//matter = list("metal" = 50,"glass" = 50)
@@ -30,8 +32,29 @@
 	if(SEND_SIGNAL(user, COMSIG_BINOCULAR_ATTACK_SELF, src))
 		return
 
+	if(raised)
+		set_raised(FALSE, user)
+	else
+		set_raised(TRUE, user)
+
 	zoom(user, 11, 12)
 
+/obj/item/device/binoculars/proc/set_raised(to_raise, mob/living/carbon/human/user)
+	if(!istype(user))
+		return
+
+	if(!to_raise)
+		raised = FALSE
+		item_state = icon_state
+	else if(!COOLDOWN_FINISHED(user, zoom_cooldown))
+		item_state = icon_state
+	else
+		raised = TRUE
+		item_state = item_state + "_eyes"
+
+	user.update_inv_r_hand()
+	user.update_inv_l_hand()
+
 /obj/item/device/binoculars/dropped(/obj/item/item, mob/user)
 	. = ..()
 	on_unset_interaction(user)

code/game/objects/items/devices/flashlight.dm

@@ -3,7 +3,7 @@
 	desc = "A hand-held emergency light."
 	icon = 'icons/obj/items/lighting.dmi'
 	icon_state = "flashlight"
-	item_state = "flashlight"
+	item_state = ""
 	w_class = SIZE_SMALL
 	flags_atom = FPRINT|CONDUCT
 	flags_equip_slot = SLOT_WAIST
@@ -518,8 +518,13 @@
 /obj/item/device/flashlight/lantern
 	name = "lantern"
 	icon_state = "lantern"
+	item_state = ""
 	desc = "A mining lantern."
 	light_range = 6 // luminosity when on
+	light_color = "#d69c46"
+
+/obj/item/device/flashlight/lantern/on
+	on = TRUE
 
 //Signal Flare
 /obj/item/device/flashlight/flare/signal

code/game/objects/items/explosives/explosive.dm

@@ -29,6 +29,10 @@
 	var/use_dir = FALSE
 	var/angle = 360
 	var/has_blast_wave_dampener = FALSE; //Whether or not the casing can be toggle between different falloff_mode
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_1.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_1.dmi'
+		)
 
 /obj/item/explosive/Initialize()
 	. = ..()

code/game/objects/items/explosives/grenades/grenade.dm

@@ -5,6 +5,10 @@
 	icon = 'icons/obj/items/weapons/grenade.dmi'
 	icon_state = "grenade"
 	item_state = "grenade"
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_1.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_1.dmi'
+		)
 	throw_speed = SPEED_VERY_FAST
 	throw_range = 7
 	flags_atom = FPRINT|CONDUCT

code/game/objects/items/explosives/plastic.dm

@@ -316,6 +316,7 @@
 	name = "breaching charge"
 	desc = "An explosive device used to break into areas while protecting the user from the blast as well as deploying deadly shrapnel on the other side."
 	icon_state = "satchel-charge"
+	item_state = "satchel-charge"
 	overlay_image = "satchel-active"
 	w_class = SIZE_SMALL
 	angle = 55

code/game/objects/items/frames/table_rack.dm

@@ -81,6 +81,7 @@
 	desc = "A kit for a table, including a large, flat metal surface and four legs. This kit has side panels. Some assembly required."
 	icon = 'icons/obj/items/items.dmi'
 	icon_state = "reinf_tableparts"
+	item_state = "reinf_tableparts"
 	matter = list("metal" = 15000) //A reinforced table. Two sheets of metal and four rods
 	table_type = /obj/structure/surface/table/reinforced
 
@@ -102,6 +103,7 @@
 	name = "wooden table parts"
 	desc = "A kit for a table, including a large, flat wooden surface and four legs. Some assembly required."
 	icon_state = "wood_tableparts"
+	item_state = "wood_tableparts"
 	flags_atom = FPRINT
 	matter = null
 	table_type = /obj/structure/surface/table/woodentable
@@ -127,12 +129,14 @@
 	name = "poor wooden table parts"
 	desc = "A kit for a poorly crafted table, including a large, flat wooden surface and four legs. Some assembly required."
 	icon_state = "pwood_tableparts"
+	item_state = "pwood_tableparts"
 	table_type = /obj/structure/surface/table/woodentable/poor
 
 /obj/item/frame/table/wood/fancy
 	name = "fancy wooden table parts"
 	desc = "A kit for a finely crafted mahogany table, including a large, flat wooden surface and four legs. Some assembly required."
 	icon_state = "fwood_tableparts"
+	item_state = "fwood_tableparts"
 	table_type = /obj/structure/surface/table/woodentable/fancy
 
 /*
@@ -143,6 +147,7 @@
 	name = "gamble table parts"
 	desc = "A kit for a table, including a large, flat wooden and carpet surface and four legs. Some assembly required."
 	icon_state = "gamble_tableparts"
+	item_state = "gamble_tableparts"
 	flags_atom = null
 	matter = null
 	table_type = /obj/structure/surface/table/gamblingtable
@@ -169,6 +174,7 @@
 /obj/item/frame/table/almayer
 	name = "gray table parts"
 	icon_state = "table_parts"
+	item_state = "tableparts"
 	table_type = /obj/structure/surface/table/almayer
 
 

code/game/objects/items/reagent_containers/dropper.dm

@@ -65,6 +65,7 @@
 					if (src.reagents.total_volume<=0)
 						filled = 0
 						icon_state = "dropper[filled]"
+						item_state = "dropper0"
 					return
 
 			for(var/mob/O in viewers(GLOB.world_view_size, user))
@@ -86,6 +87,7 @@
 		if (src.reagents.total_volume<=0)
 			filled = 0
 			icon_state = "dropper[filled]"
+			item_state = "dropper0"
 
 	else
 
@@ -107,6 +109,7 @@
 
 		filled = 1
 		icon_state = "dropper[filled]"
+		item_state = "dropper1"
 
 	return