Some more tool inhands (#8633)

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

@@ -8,6 +8,11 @@
 	name = "multitool"
 	desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
 	icon_state = "multitool"
+	item_state = "multitool"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi',
+		)
 	flags = CONDUCT
 	force = 5.0
 	w_class = 2.0

code/game/objects/items/weapons/tools.dm

@@ -19,7 +19,12 @@
 	name = "wrench"
 	desc = "An adjustable tool used for gripping and turning nuts or bolts."
 	icon = 'icons/obj/tools.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi',
+		)
 	icon_state = "wrench"
+	item_state = "wrench"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 8
@@ -41,7 +46,12 @@
 	name = "screwdriver"
 	desc = "A tool with a flattened or cross-shaped tip that fits into the head of a screw to turn it."
 	icon = 'icons/obj/tools.dmi'
-	icon_state = "screwdriver"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi',
+		)
+	icon_state = "screwdriver2"
+	item_state = "screwdriver"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT | SLOT_EARS
 	center_of_mass = list("x" = 13,"y" = 7)
@@ -57,7 +67,6 @@
 	drop_sound = 'sound/items/drop/scrap.ogg'
 	usesound = 'sound/items/Screwdriver.ogg'
 
-
 /obj/item/screwdriver/Initialize()
 	. = ..()
 	if(!random_icon)
@@ -108,7 +117,12 @@
 	name = "wirecutters"
 	desc = "A tool used to cut wires in electrical work."
 	icon = 'icons/obj/tools.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi',
+		)
 	icon_state = "cutters"
+	item_state = "cutters"
 	flags = CONDUCT
 	center_of_mass = list("x" = 18,"y" = 10)
 	slot_flags = SLOT_BELT
@@ -157,6 +171,7 @@
 	. = ..()
 	if(prob(50))
 		icon_state = "[initial(icon_state)]-yellow"
+		item_state = "[initial(icon_state)]_yellow"
 
 /*
  * Welding Tool
@@ -165,11 +180,16 @@
 	name = "welding tool"
 	desc = "A welding tool with a built-in fuel tank, designed for welding and cutting metal."
 	icon = 'icons/obj/tools.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi',
+		)
 	icon_state = "welder_off"
-	flags = CONDUCT
-	slot_flags = SLOT_BELT
+	item_state = "welder_off"
 	var/base_iconstate = "welder"//These are given an _on/_off suffix before being used
 	var/base_itemstate = "welder"
+	flags = CONDUCT
+	slot_flags = SLOT_BELT
 	drop_sound = 'sound/items/drop/scrap.ogg'
 
 	//Amount of OUCH when it's thrown
@@ -196,29 +216,31 @@
 /obj/item/weldingtool/largetank
 	name = "industrial welding tool"
 	desc = "A welding tool with an extended-capacity built-in fuel tank, standard issue for engineers."
+	base_iconstate = "ind_welder"
+	base_itemstate = "ind_welder"
 	max_fuel = 40
 	matter = list(DEFAULT_WALL_MATERIAL = 100, MATERIAL_GLASS = 60)
-	base_iconstate = "ind_welder"
 	origin_tech = list(TECH_ENGINEERING = 2)
 
-
 /obj/item/weldingtool/hugetank
 	name = "advanced welding tool"
 	desc = "A rare and powerful welding tool with a super-extended fuel tank."
+	base_iconstate = "adv_welder"
+	base_itemstate = "adv_welder"
 	max_fuel = 80
 	matter = list(DEFAULT_WALL_MATERIAL = 200, MATERIAL_GLASS = 120)
-	base_iconstate = "adv_welder"
 	origin_tech = list(TECH_ENGINEERING = 3)
 
 //The Experimental Welding Tool!
 /obj/item/weldingtool/experimental
 	name = "experimental welding tool"
 	desc = "A scientifically-enhanced welding tool that uses fuel-producing microbes to gradually replenish its fuel supply."
+	base_iconstate = "exp_welder"
+	base_itemstate = "exp_welder"
 	max_fuel = 40
 	matter = list(DEFAULT_WALL_MATERIAL = 100, MATERIAL_GLASS = 120)
-	base_iconstate = "exp_welder"
 	origin_tech = list(TECH_ENGINEERING = 4, TECH_BIO = 4)
-	base_itemstate = "exp_welder"
+	
 
 	var/last_gen = 0
 	var/fuelgen_delay = 400 //The time, in deciseconds, required to regenerate one unit of fuel
@@ -550,12 +572,16 @@
 	name = "crowbar"
 	desc = "An iron bar with a flattened end, used as a lever to remove floors and pry open doors."
 	icon = 'icons/obj/tools.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi',
+		)
 	icon_state = "crowbar"
+	item_state = "crowbar"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 8
 	throwforce = 7
-	item_state = "crowbar"
 	w_class = 2.0
 	origin_tech = list(TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
@@ -568,7 +594,7 @@
 
 /obj/item/crowbar/red
 	icon = 'icons/obj/tools.dmi'
-	icon_state = "red_crowbar"
+	icon_state = "crowbar_red"
 	item_state = "crowbar_red"
 
 // Pipe wrench
@@ -576,7 +602,12 @@
 	name = "pipe wrench"
 	desc = "A big wrench that is made for working with pipes."
 	icon = 'icons/obj/tools.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi',
+		)
 	icon_state = "pipewrench"
+	item_state = "pipewrench"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 8
@@ -597,8 +628,14 @@
 	desc = "It even has one of those nubbins for doing the thingy."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "combitool"
+	item_state = "combitool"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi',
+		)
 	force = 3
 	w_class = ITEMSIZE_SMALL
+	drop_sound = 'sound/items/drop/scrap.ogg'
 
 	var/list/tools = list(
 		"crowbar",
@@ -649,12 +686,16 @@
 	update_tool()
 	return 1
 
-
 /obj/item/powerdrill
 	name = "impact wrench"
 	desc = " The screwdriver's big brother."
 	icon = 'icons/obj/tools.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi',
+		)
 	icon_state = "powerdrillyellow"
+	item_state = "powerdrillyellow"
 	var/drillcolor = null
 	force = 8
 	attack_verb = list("gored", "drilled", "screwed", "punctured")
@@ -681,6 +722,7 @@
 		if ("yellow")
 			drillcolor = "yellow"
 	icon_state = "powerdrill[drillcolor]"
+	item_state = "powerdrill[drillcolor]"
 
 /obj/item/powerdrill/examine(var/mob/user)
 	. = ..()

code/modules/mining/mine_items.dm

@@ -35,9 +35,13 @@
 
 /obj/item/device/flashlight/lantern
 	name = "lantern"
+	desc = "A mining lantern."
 	icon_state = "lantern"
 	item_state = "lantern"
-	desc = "A mining lantern."
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_mining.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_mining.dmi',
+		)
 	light_power = 1
 	brightness_on = 6
 	light_wedge = LIGHT_OMNI
@@ -49,12 +53,16 @@
 	name = "pickaxe"
 	desc = "The most basic of mining implements. Surely this is a joke?"
 	icon = 'icons/obj/tools.dmi'
+	icon_state = "pickaxe"
+	item_state = "pickaxe"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_mining.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_mining.dmi',
+		)
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throwforce = 4.0
 	force = 10.0
-	icon_state = "pickaxe"
-	item_state = "pickaxe"
 	w_class = 4.0
 	matter = list(DEFAULT_WALL_MATERIAL = 3750)
 	var/digspeed //moving the delay to an item var so R&D can make improved picks. --NEO
@@ -224,8 +232,8 @@
 
 /obj/item/pickaxe/drill
 	name = "mining drill" // Can dig sand as well!
-	icon_state = "handdrill"
-	item_state = "jackhammer"
+	icon_state = "miningdrill"
+	item_state = "miningdrill"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
 	desc = "Yours is the drill that will pierce through the rock walls."
 	drill_verb = "drilling"
@@ -287,7 +295,7 @@
 /obj/item/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
 	name = "diamond mining drill"
 	icon_state = "diamonddrill"
-	item_state = "jackhammer"
+	item_state = "diamonddrill"
 	digspeed = 3 //Digs through walls, girders, and can dig up sand
 	origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 5)
 	desc = "Yours is the drill that will pierce the heavens!"
@@ -327,12 +335,16 @@
 	name = "shovel"
 	desc = "A large tool for digging and moving dirt."
 	icon = 'icons/obj/tools.dmi'
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_mining.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_mining.dmi',
+		)
 	icon_state = "shovel"
+	item_state = "shovel"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 8.0
 	throwforce = 4.0
-	item_state = "shovel"
 	w_class = 3.0
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 50)

code/modules/organs/subtypes/autakh.dm

@@ -333,7 +333,8 @@
 	name = "robotic combitool"
 	desc = "An integrated combitool module."
 	icon_state = "digitool"
-
+	item_state = "digitool"
+	
 /obj/item/combitool/robotic/throw_at()
 	usr.drop_from_inventory(src)
 

html/changelogs/wezzy_tool_inhands_again.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - imageadd: "Adds inhands for some welders, drills, and combitools."