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

code/game/objects/items.dm

@@ -911,8 +911,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/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 = ""
 	pickup_sound = 'sound/handling/wirecutter_pickup.ogg'
 	drop_sound = 'sound/handling/wirecutter_drop.ogg'
 	flags_atom = FPRINT|CONDUCT
@@ -14,6 +15,8 @@
 	throw_speed = SPEED_VERY_FAST
 	/// If FALSE won't change icon_state to a camo marine bino.
 	var/uses_camo = TRUE
+	var/raised = FALSE
+	var/base_item_state = "binoculars"
 
 
 	//matter = list("metal" = 50,"glass" = 50)
@@ -30,8 +33,27 @@
 	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/H)
+	if(!istype(H))
+		return
+
+	if(!to_raise)
+		raised = FALSE
+		item_state = "[base_item_state]"
+	else
+		raised = TRUE
+		item_state = "[base_item_state]_eyes"
+
+	H.update_inv_r_hand()
+	H.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/reagent_containers/glass.dm

@@ -486,7 +486,7 @@
 	desc = "A canister containing pressurized hydrogen. Can be used to refill storage tanks."
 	icon = 'icons/obj/items/tank.dmi'
 	icon_state = "canister_hydrogen"
-	item_state = "anesthetic"
+	item_state = "canister_hydrogen"
 	amount_per_transfer_from_this = 100
 	possible_transfer_amounts = list(50,100,200,300,400)
 	volume = 400
@@ -506,24 +506,28 @@
 	name = "Ammonia canister"
 	desc = "A canister containing pressurized ammonia. Can be used to refill storage tanks."
 	icon_state = "canister_ammonia"
+	item_state = "canister_ammonia"
 	reagent = "ammonia"
 
 /obj/item/reagent_container/glass/canister/methane
 	name = "Methane canister"
 	desc = "A canister containing pressurized methane. Can be used to refill storage tanks."
 	icon_state = "canister_methane"
+	item_state = "canister_methane"
 	reagent = "methane"
 
 /obj/item/reagent_container/glass/canister/pacid
 	name = "Polytrinic acid canister"
 	desc = "A canister containing pressurized polytrinic acid. Can be used to refill storage tanks."
 	icon_state = "canister_pacid"
+	item_state = "canister_pacid"
 	reagent = "pacid"
 
 /obj/item/reagent_container/glass/canister/oxygen
 	name = "Oxygen canister"
 	desc = "A canister containing pressurized oxygen. Can be used to refill storage tanks."
 	icon_state = "canister_oxygen"
+	item_state = "canister_oxygen"
 	reagent = "oxygen"
 
 /obj/item/reagent_container/glass/pressurized_canister // See the Pressurized Reagent Canister Pouch

code/modules/cm_marines/equipment/gear.dm

@@ -6,8 +6,8 @@
 	name = "combat flashlight"
 	desc = "A Flashlight designed to be held in the hand, or attached to a rifle"
 	icon_state = "flashlight"
-	item_state = "flashlight"
-	light_range = 5 //Pretty luminous, but still a flashlight that fits in a pocket
+	item_state = ""
+	light_range = 6 //Pretty luminous, but still a flashlight that fits in a pocket
 
 //MARINE SNIPER TARPS
 

code/modules/cm_marines/equipment/mortar/mortar_shells.dm

@@ -29,6 +29,7 @@
 	name = "\improper 80mm high explosive mortar shell"
 	desc = "An 80mm mortar shell, loaded with a high explosive charge."
 	icon_state = "mortar_ammo_he"
+	item_state = "mortar_ammo_he"
 
 /obj/item/mortar_shell/he/detonate(turf/T)
 	explosion(T, 0, 3, 5, 7, explosion_cause_data = cause_data)
@@ -37,6 +38,7 @@
 	name = "\improper 80mm fragmentation mortar shell"
 	desc = "An 80mm mortar shell, loaded with a fragmentation charge."
 	icon_state = "mortar_ammo_frag"
+	item_state = "mortar_ammo_frag"
 
 /obj/item/mortar_shell/frag/detonate(turf/T)
 	create_shrapnel(T, 60, cause_data = cause_data)
@@ -47,6 +49,7 @@
 	name = "\improper 80mm incendiary mortar shell"
 	desc = "An 80mm mortar shell, loaded with a Type B napalm charge. Perfect for long-range area denial."
 	icon_state = "mortar_ammo_inc"
+	item_state = "mortar_ammo_inc"
 	var/radius = 5
 	var/flame_level = BURN_TIME_TIER_5 + 5 //Type B standard, 50 base + 5 from chemfire code.
 	var/burn_level = BURN_LEVEL_TIER_2
@@ -62,6 +65,7 @@
 	name = "\improper 80mm flare/camera mortar shell"
 	desc = "An 80mm mortar shell, loaded with an illumination flare / camera combo, attached to a parachute."
 	icon_state = "mortar_ammo_flr"
+	item_state = "mortar_ammo_flr"
 
 /obj/item/mortar_shell/flare/detonate(turf/T)
 	new /obj/item/device/flashlight/flare/on/illumination(T)
@@ -72,6 +76,7 @@
 	name = "\improper 80mm custom mortar shell"
 	desc = "An 80mm mortar shell."
 	icon_state = "mortar_ammo_custom"
+	item_state = "mortar_ammo_custom_locked"
 	matter = list("metal" = 18750) //5 sheets
 	var/obj/item/explosive/warhead/mortar/warhead
 	var/obj/item/reagent_container/glass/fuel
@@ -168,7 +173,7 @@
 
 /obj/item/mortar_shell/flamer_fire_act(dam, datum/cause_data/flame_cause_data)
 	addtimer(VARSET_CALLBACK(src, burning, FALSE), 5 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_DELETE_ME)
-	
+
 	if(burning)
 		return
 	burning = TRUE
@@ -200,7 +205,7 @@
 
 		addtimer(CALLBACK(src, PROC_REF(explode), cause_data), 5 SECONDS)
 		addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), (src)), 5.5 SECONDS)
-		
+
 
 /obj/item/mortar_shell/proc/explode(flame_cause_data)
 	cell_explosion(src, 100, 25, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, flame_cause_data)

code/modules/cm_marines/equipment/mortar/mortars.dm

@@ -43,6 +43,18 @@
 	targ_y = deobfuscate_y(0)
 	internal_camera = new(loc)
 
+	var/new_icon_state
+	switch(SSmapping.configs[GROUND_MAP].camouflage_type)
+		if("classic")
+			icon_state = new_icon_state ? new_icon_state : "c_" + icon_state
+		if("desert")
+			icon_state = new_icon_state ? new_icon_state : "d_" + icon_state
+		if("snow")
+			icon_state = new_icon_state ? new_icon_state : "s_" + icon_state
+		if("urban")
+			icon_state = new_icon_state ? new_icon_state : "u_" + icon_state
+
+
 /obj/structure/mortar/Destroy()
 	QDEL_NULL(internal_camera)
 	return ..()
@@ -400,6 +412,10 @@
 	unacidable = TRUE
 	w_class = SIZE_HUGE //No dumping this in a backpack. Carry it, fatso
 
+/obj/item/mortar_kit/Initialize(...)
+	. = ..()
+	select_gamemode_skin(type)
+
 /obj/item/mortar_kit/ex_act(severity)
 	switch(severity)
 		if(EXPLOSION_THRESHOLD_MEDIUM to INFINITY)