TGS Test Merge (#6951)

code/game/machinery/ARES/apollo_pda.dm

@@ -1,8 +1,13 @@
 /obj/item/device/working_joe_pda
-	icon = 'icons/obj/items/synth/wj_pda.dmi'
 	name = "KN5500 PDA"
 	desc = "A portable interface used by Working-Joes, capable of connecting to the local command AI to relay tasking information. Built to withstand a nuclear bomb."
 	icon_state = "karnak_off"
+	item_state = "wj_pda"
+	icon = 'icons/obj/items/synth/wj_pda.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_righthand.dmi',
+	)
 	unacidable = TRUE
 	explo_proof = TRUE
 	req_one_access = list(ACCESS_MARINE_AI_TEMP, ACCESS_MARINE_AI, ACCESS_ARES_DEBUG)

code/game/machinery/kitchen/smartfridge.dm

@@ -117,7 +117,7 @@
 		var/plants_loaded = 0
 		for(var/obj/G in P.contents)
 			if(accept_check(G))
-				P.remove_from_storage(G,src)
+				P.remove_from_storage(G, src)
 				add_local_item(G)
 				plants_loaded++
 		if(plants_loaded)

code/game/objects/items.dm

@@ -335,7 +335,7 @@
 
 	if(isstorage(loc))
 		var/obj/item/storage/S = loc
-		S.remove_from_storage(src, user.loc)
+		S.remove_from_storage(src, user.loc, user)
 
 	throwing = 0
 
@@ -943,8 +943,8 @@
 
 	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/ashtray.dm

@@ -1,5 +1,9 @@
 /obj/item/ashtray
 	icon = 'icons/obj/items/smoking/ashtray.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items/smoking_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items/smoking_righthand.dmi'
+	)
 
 	var/max_butts = 0
 	var/empty_desc = ""

code/game/objects/items/bodybag.dm

@@ -4,7 +4,12 @@
 	name = "body bag"
 	desc = "A folded bag designed for the storage and transportation of cadavers."
 	icon = 'icons/obj/bodybag.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/medical_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/medical_righthand.dmi',
+	)
 	icon_state = "bodybag_folded"
+	item_state = "bodybag"
 	w_class = SIZE_SMALL
 	var/unfolded_path = /obj/structure/closet/bodybag
 
@@ -33,6 +38,7 @@
 	desc = "A folded, reusable bag designed to prevent additional damage to an occupant."
 	icon = 'icons/obj/bodybag.dmi'
 	icon_state = "cryobag_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

@@ -4,11 +4,12 @@
 /obj/item/book
 	name = "book"
 	icon = 'icons/obj/items/books.dmi'
+	icon_state = "book"
+	item_state = "book_dark"
 	item_icons = list(
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items/books_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items/books_righthand.dmi',
 	)
-	icon_state ="book"
 	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 = "rdbook"
+	item_state = "book_dark"
 	author = "Randall Varn, Einstein Engines Senior Mechanic"
 	title = "APLU \"Ripley\" Construction and Operation Manual"
 
@@ -129,6 +132,7 @@
 /obj/item/book/manual/research_and_development
 	name = "Research and Development 101"
 	icon_state = "rdbook"
+	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"
 
@@ -171,6 +176,7 @@
 	name = "Marine Law"
 	desc = "A set of guidelines for keeping law and order on military vessels."
 	icon_state = "bookSpaceLaw"
+	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_engineering2"
+	item_state = "book_engineering2"
 	author = "Engineering Encyclopedia"
 	title = "Engineering Textbook"
 
@@ -277,6 +286,7 @@
 /obj/item/book/manual/chef_recipes
 	name = "Chef Recipes"
 	icon_state = "cooked_book"
+	item_state = "book_green"
 	author = "Victoria Ponsonby"
 	title = "Chef Recipes"
 
@@ -336,6 +346,7 @@
 /obj/item/book/manual/barman_recipes
 	name = "Barman Recipes"
 	icon_state = "barbook"
+	item_state = "book_red"
 	author = "Sir John Rose"
 	title = "Barman Recipes"
 
@@ -391,6 +402,7 @@
 /obj/item/book/manual/detective
 	name = "The Film Noir: Proper Procedures for Investigations"
 	icon_state ="bookDetective"
+	item_state ="book_red"
 	author = "Weyland-Yutani"
 	title = "The Film Noir: Proper Procedures for Investigations"
 
@@ -434,7 +446,8 @@
 
 /obj/item/book/manual/nuclear
 	name = "Fission Mailed: Nuclear Sabotage 101"
-	icon_state ="bookNuclear"
+	icon_state = "bookNuclear"
+	item_state = "book_particle"
 	author = "The Colonial Liberation Front"
 	title = "Fission Mailed: Nuclear Sabotage 101"
 
@@ -487,6 +500,7 @@
 /obj/item/book/manual/atmospipes
 	name = "Pipes and You: Getting To Know Your Scary Tools"
 	icon_state = "pipingbook"
+	item_state = "book_piping"
 	author = "Maria Crash, Senior Atmospherics Technician"
 	title = "Pipes and You: Getting To Know Your Scary Tools"
 	dat = {"<html>
@@ -595,6 +609,7 @@
 /obj/item/book/manual/evaguide
 	name = "EVA Gear and You: Not Spending All Day Inside"
 	icon_state = "evabook"
+	item_state = "book_blue"
 	author = "Maria Crash, Senior Atmospherics Technician"
 	title = "EVA Gear and You: Not Spending All Day Inside"
 	dat = {"<html>
@@ -666,7 +681,8 @@
 
 /obj/item/book/manual/hydroponics_beekeeping
 	name = "The Ins and Outs of Apiculture - A Precise Art"
-	icon_state ="bookHydroponicsBees"
+	icon_state = "bookHydroponicsBees"
+	item_state = "book_green"
 	author = "Beekeeper Dave"
 	title = "The Ins and Outs of Apiculture - A Precise Art"
 	dat = {"<html>
@@ -698,7 +714,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/circuitboards/circuitboard.dm

@@ -7,7 +7,7 @@
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_righthand.dmi',
 	)
 	icon_state = "id_mod"
-	item_state = "electronic"
+	item_state = "circuitboard"
 	flags_atom = FPRINT|CONDUCT
 	matter = list("metal" = 50, "glass" = 50)
 	var/build_path = null

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|MAP_COLOR_INDEX
@@ -12,6 +13,9 @@
 	throwforce = 5
 	throw_range = 15
 	throw_speed = SPEED_VERY_FAST
+	/// If FALSE won't change icon_state to a camo marine bino.
+	var/uses_camo = TRUE
+	var/raised = FALSE
 	item_icons = list(
 		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_lefthand.dmi',
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/devices_righthand.dmi',
@@ -30,11 +34,33 @@
 
 	if(SEND_SIGNAL(user, COMSIG_BINOCULAR_ATTACK_SELF, src))
 		return
+
+	if(raised)
+		set_raised(FALSE, user)
+	else
+		set_raised(TRUE, user)
+
 	if(MODE_HAS_MODIFIER(/datum/gamemode_modifier/disable_long_range_sentry))
 		zoom(user, hvh_tile_offset, hvh_zoom_viewsize)
 	else
 		zoom(user, tile_offset, viewsize)
 
+/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)
@@ -46,6 +72,7 @@
 /obj/item/device/binoculars/on_unset_interaction(mob/user)
 	flags_atom &= ~RELAY_CLICK
 	UnregisterSignal(user, COMSIG_HUMAN_MOVEMENT_CANCEL_INTERACTION)
+	set_raised(FALSE, user)
 
 /obj/item/device/binoculars/proc/interaction_handler()
 	return COMPONENT_HUMAN_MOVEMENT_KEEP_USING
@@ -61,6 +88,7 @@
 	gender = NEUTER
 	desc = "A pair of binoculars with a rangefinding function. Ctrl + Click turf to acquire it's coordinates. Ctrl + Click rangefinder to stop lasing."
 	icon_state = "rangefinder"
+	item_state = "rangefinder"
 	var/laser_cooldown = 0
 	var/cooldown_duration = 200 //20 seconds
 	var/obj/effect/overlay/temp/laser_coordinate/coord

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

@@ -2,6 +2,10 @@
 	name = "emergency defibrillator"
 	desc = "A handheld emergency defibrillator, used to restore fibrillating patients. Can optionally bring people back from the dead."
 	icon_state = "defib"
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/medical_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/medical_righthand.dmi',
+	)
 	item_state = "defib"
 	icon = 'icons/obj/items/medical_tools.dmi'
 	flags_atom = FPRINT|CONDUCT
@@ -320,7 +324,7 @@
 	desc = "Result of collaboration between Hyperdyne and Weyland-Yutani, this device can fix major glitches or programming errors of synthetic units, as well as being able to restart a synthetic that has suffered critical failure. It can only be used once before being reset."
 	icon = 'icons/obj/items/synth/synth_reset_key.dmi'
 	icon_state = "reset_key"
-	item_state = "defib"
+	item_state = "synth_reset_key"
 	w_class = SIZE_SMALL
 	charge_cost = 1000
 	force = 0

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

@@ -2,7 +2,7 @@
 	name = "flash"
 	desc = "Used for blinding and being an asshole. Recharges one flash every 30 seconds. You must wait 1 second between uses for the capacitor to recharge."
 	icon_state = "flash"
-	item_state = "flash_device" //Replace me later
+	item_state = "flash_device1" //Replace me later (Yes sir! *Salute*)
 	throwforce = 5
 	w_class = SIZE_SMALL
 	throw_speed = SPEED_VERY_FAST
@@ -21,6 +21,7 @@
 /obj/item/device/flash/update_icon()
 	if(broken)
 		icon_state = "[icon_state]_burnt"
+		item_state = "flashburnt1"
 
 /obj/item/device/flash/get_examine_text(mob/user)
 	. = ..()

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

@@ -7,7 +7,7 @@
 		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items/lighting_righthand.dmi',
 	)
 	icon_state = "flashlight"
-	item_state = "flashlight"
+	item_state = ""
 	w_class = SIZE_SMALL
 	flags_atom = FPRINT|CONDUCT
 	flags_equip_slot = SLOT_WAIST
@@ -576,8 +576,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/devices/lightreplacer.dm

@@ -45,7 +45,11 @@
 
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "lightreplacer0"
-	item_state = "electronic"
+	item_state = "light_replacer"
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/equipment/tools_righthand.dmi',
+	)
 
 	flags_atom = FPRINT|CONDUCT
 	flags_equip_slot = SLOT_WAIST