refactor: split items_lefthand items_righthand dmi

code/datums/outfits/outfit_admin.dm

@@ -1212,7 +1212,7 @@
 	suit = /obj/item/clothing/suit/space/hardsuit/singuloth
 	back = /obj/item/storage/backpack/satchel
 	l_hand = /obj/item/twohanded/knighthammer
-	belt = /obj/item/claymore/ceremonial
+	belt = /obj/item/melee/claymore/ceremonial
 	gloves = /obj/item/clothing/gloves/combat/swat
 	shoes = /obj/item/clothing/shoes/magboots
 	mask = /obj/item/clothing/mask/breath

code/game/gamemodes/wizard/artefact.dm

@@ -596,23 +596,23 @@ GLOBAL_LIST_EMPTY(multiverse)
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), ITEM_SLOT_CLOTH_INNER)
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), ITEM_SLOT_FEET)
 			H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), ITEM_SLOT_HAND_LEFT)
-			H.equip_to_slot_or_del(new /obj/item/claymore(H), ITEM_SLOT_HAND_RIGHT)
+			H.equip_to_slot_or_del(new /obj/item/melee/claymore(H), ITEM_SLOT_HAND_RIGHT)
 			H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), ITEM_SLOT_BACK)
 		if("pirate")
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(H), ITEM_SLOT_CLOTH_INNER)
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(H),  ITEM_SLOT_CLOTH_OUTER)
 			H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(H), ITEM_SLOT_HEAD)
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), ITEM_SLOT_FEET)
 			H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), ITEM_SLOT_EYES)
-			H.equip_to_slot_or_del(new /obj/item/claymore(H), ITEM_SLOT_HAND_RIGHT)
+			H.equip_to_slot_or_del(new /obj/item/melee/claymore(H), ITEM_SLOT_HAND_RIGHT)
 			H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), ITEM_SLOT_BACK)
 			H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), ITEM_SLOT_HAND_LEFT)
 		if("yand")//mine is an evil laugh
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), ITEM_SLOT_FEET)
 			H.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(H), ITEM_SLOT_HEAD)
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl(H), ITEM_SLOT_CLOTH_INNER)
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H),  ITEM_SLOT_CLOTH_OUTER)
-			H.equip_to_slot_or_del(new /obj/item/katana(H), ITEM_SLOT_HAND_RIGHT)
+			H.equip_to_slot_or_del(new /obj/item/melee/katana(H), ITEM_SLOT_HAND_RIGHT)
 			H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), ITEM_SLOT_HAND_LEFT)
 			H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), ITEM_SLOT_BACK)
 		if("clown")
@@ -621,7 +621,7 @@ GLOBAL_LIST_EMPTY(multiverse)
 			H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), ITEM_SLOT_MASK)
 			H.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(H), ITEM_SLOT_HEAD)
 			H.equip_to_slot_or_del(new /obj/item/bikehorn(H), ITEM_SLOT_POCKET_LEFT)
-			H.equip_to_slot_or_del(new /obj/item/claymore(H), ITEM_SLOT_HAND_RIGHT)
+			H.equip_to_slot_or_del(new /obj/item/melee/claymore(H), ITEM_SLOT_HAND_RIGHT)
 			H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), ITEM_SLOT_HAND_LEFT)
 			H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), ITEM_SLOT_BACK)
 
@@ -647,7 +647,7 @@ GLOBAL_LIST_EMPTY(multiverse)
 	H.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(H), ITEM_SLOT_HEAD)
 	H.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl(H), ITEM_SLOT_CLOTH_INNER)
 	H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H),  ITEM_SLOT_CLOTH_OUTER)
-	H.equip_to_slot_or_del(new /obj/item/katana(H), ITEM_SLOT_HAND_RIGHT)
+	H.equip_to_slot_or_del(new /obj/item/melee/katana(H), ITEM_SLOT_HAND_RIGHT)
 	H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), ITEM_SLOT_HAND_LEFT)
 	H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), ITEM_SLOT_BACK)
 	if(!H.real_name || H.real_name == "unknown")

code/game/objects/items.dm

@@ -108,7 +108,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g
 	var/list/allowed = null //suit storage stuff.
 	var/obj/item/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers.
 
-	var/needs_permit = 0			//Used by security bots to determine if this item is safe for public use.
+	var/needs_permit = FALSE //Used by security bots to determine if this item is safe for public use.
 
 	var/strip_delay = DEFAULT_ITEM_STRIP_DELAY
 	var/put_on_delay = DEFAULT_ITEM_PUTON_DELAY

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

@@ -5,6 +5,8 @@
 	desc = "An advanced autopainter preprogrammed with several paintjobs for airlocks. Use it on a completed airlock to change its paintjob."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "airlock_painter"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	item_state = "airlock_painter"
 	flags = CONDUCT
 	item_flags = NOBLUDGEON

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

@@ -4,6 +4,8 @@
 	name = "floor painter"
 	icon = 'icons/obj/device.dmi'
 	icon_state = "floor_painter"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	item_state = "floor_painter"
 	usesound = 'sound/effects/spray2.ogg'
 

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

@@ -3,7 +3,6 @@
 	desc = "If you see this, you're not likely to remember it any time soon."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "memorizer"
-	item_state = "nullrod"
 	throwforce = 0
 	w_class = WEIGHT_CLASS_TINY
 	throw_speed = 3

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

@@ -2,6 +2,8 @@
 	name = "pipe painter"
 	icon = 'icons/obj/device.dmi'
 	icon_state = "pipe_painter"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	item_state = "pipe_painter"
 	usesound = 'sound/effects/spray2.ogg'
 	var/list/modes

code/game/objects/items/stacks/sheets/glass.dm

@@ -30,6 +30,7 @@ GLOBAL_LIST_INIT(glass_recipes, list(
 	desc = "HOLY SHEET! That is a lot of glass."
 	singular_name = "glass sheet"
 	icon_state = "sheet-glass"
+	item_state = "sheet-glass"
 	materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
 	resistance_flags = ACID_PROOF

code/game/objects/items/stacks/sheets/mineral.dm

@@ -475,7 +475,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list(
 	name = "mythril"
 	desc = "A rare mineral used in construction of chitin armor."
 	icon_state = "sheet-mythril"
-	item_state = "sheet-mythril"
+	//item_state = "sheet-mythril"
 	singular_name = "mythril sheet"
 	origin_tech = "materials=7"
 	merge_type = /obj/item/stack/sheet/mineral/mythril
@@ -487,7 +487,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list(
 /obj/item/stack/sheet/mineral/snow
 	name = "snow"
 	icon_state = "sheet-snow"
-	item_state = "sheet-snow"
+	//item_state = "sheet-snow"
 	singular_name = "snow block"
 	force = 1
 	throwforce = 2

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -335,7 +335,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list(
 	desc = "A fabric sown from incredibly durable threads, known for its usefulness in armor production."
 	singular_name = "durathread roll"
 	icon_state = "sheet-durathread"
-	item_state = "sheet-cloth"
+	//item_state = "sheet-cloth"
 	resistance_flags = FLAMMABLE
 	force = 0
 	throwforce = 0
@@ -773,7 +773,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list(
 	desc = "Finely cut bamboo sticks."
 	singular_name = "cut bamboo"
 	icon_state = "sheet-bamboo"
-	item_state = "sheet-bamboo"
+	//item_state = "sheet-bamboo"
 	icon = 'icons/obj/items.dmi'
 	sheettype = "bamboo"
 	force = 10
@@ -799,7 +799,7 @@ GLOBAL_LIST_INIT(cheese_recipes, list(
 	name = "reinforced cheese"
 	desc = "A stack of cheese that seems sturdier than regular cheese."
 	icon_state = "sheet-cheese"
-	item_state = "sheet-cheese"
+	//item_state = "sheet-cheese"
 	icon = 'icons/obj/items.dmi'
 	singular_name = "reinforced cheese block"
 	sheettype = "cheese"
@@ -831,7 +831,7 @@ GLOBAL_LIST_INIT(gingerbread_recipes, list(
 	name = "gingerbread"
 	desc = "A brick of gingerbread that seems sturdier than regular one."
 	icon_state = "sheet-gingerbread"
-	item_state = "sheet-gingerbread"
+	//item_state = "sheet-gingerbread"
 	singular_name = "gingerbread block"
 	icon = 'icons/obj/items.dmi'
 	sheettype = "gingerbread"

code/game/objects/items/stacks/sheets/sheets.dm

@@ -17,3 +17,6 @@
 	usesound = 'sound/items/deconstruct.ogg'
 	toolspeed = 1
 	var/wall_allowed = TRUE	//determines if sheet can be used in wall construction or not.
+
+	lefthand_file = 'icons/mob/inhands/sheet_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/sheet_righthand.dmi'

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

@@ -3,6 +3,8 @@
 	desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "crowbar"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	item_state = "crowbar"
 	belt_icon = "pocket_crowbar"
 	usesound = 'sound/items/crowbar.ogg'
@@ -48,7 +50,7 @@
 	icon = 'icons/obj/abductor.dmi'
 	usesound = 'sound/weapons/sonic_jackhammer.ogg'
 	icon_state = "crowbar"
-	item_state = "alien_crowbar"
+	item_state = "crowbar_alien"
 	belt_icon = "alien_crowbar"
 	toolspeed = 0.1
 	origin_tech = "combat=4;engineering=4;abductor=3"

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

@@ -9,6 +9,8 @@ Holotool. All instruments in one object
 	desc = "A highly experimental holographic tool projector."
 	icon = 'icons/obj/holotool.dmi'
 	icon_state = "holotool"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	slot_flags = ITEM_SLOT_BELT
 	usesound = 'sound/items/pshoom.ogg'
 	actions_types = list(/datum/action/item_action/change_ht_color)

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

@@ -11,6 +11,8 @@
 	desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "multitool"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	belt_icon = "multitool"
 	flags = CONDUCT
 	force = 5.0

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

@@ -4,6 +4,8 @@
 	desc = "You can be totally screwy with this."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "screwdriver_map"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	belt_icon = "screwdriver"
 	flags = CONDUCT
 	slot_flags = ITEM_SLOT_BELT
@@ -40,17 +42,15 @@
 
 /obj/item/screwdriver/Initialize(mapload)
 	. = ..()
-	AddElement(/datum/element/falling_hazard, damage = force, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound)
-
-/obj/item/screwdriver/New(loc, var/param_color = null)
-	..()
 	if(random_color)
 		if(!param_color)
 			param_color = pick("red","blue","pink","brown","green","cyan","yellow")
 		icon_state = "screwdriver_[param_color]"
 
-	if (prob(75))
-		src.pixel_y = rand(0, 16)
+	if(prob(75))
+		pixel_y = rand(0, 16)
+
+	AddElement(/datum/element/falling_hazard, damage = force, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound)
 
 
 /obj/item/screwdriver/attack(mob/living/target, mob/living/user, params, def_zone, skip_attack_anim = FALSE)

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

@@ -231,7 +231,7 @@
 	desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "welder"
-	item_state = "alien_welder"
+	item_state = "alienwelder"
 	belt_icon = "alien_welding_tool"
 	toolspeed = 0.1
 	light_intensity = 0

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

@@ -3,6 +3,8 @@
 	desc = "This cuts wires."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "cutters"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	belt_icon = "wirecutters"
 	flags = CONDUCT
 	slot_flags = ITEM_SLOT_BELT
@@ -27,15 +29,12 @@
 
 /obj/item/wirecutters/Initialize(mapload)
 	. = ..()
-	AddElement(/datum/element/falling_hazard, damage = force, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound)
-
-/obj/item/wirecutters/New(loc, param_color = null)
-	..()
 	if(random_color)
 		if(!param_color)
 			param_color = pick("yellow", "red")
 		icon_state = "cutters_[param_color]"
 
+	AddElement(/datum/element/falling_hazard, damage = force, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound)
 
 /obj/item/wirecutters/attack(mob/living/carbon/target, mob/living/user, params, def_zone, skip_attack_anim = FALSE)
 	if(istype(target) && istype(target.handcuffed, /obj/item/restraints/handcuffs/cable))
@@ -69,7 +68,7 @@
 	desc = "Extremely sharp wirecutters, made out of a silvery-green metal."
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "cutters"
-	item_state = "alien_cutters"
+	item_state = "cutters_alien"
 	belt_icon = "alien_wirecutters"
 	toolspeed = 0.1
 	origin_tech = "materials=5;engineering=4;abductor=3"

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

@@ -4,6 +4,8 @@
 	desc = "A wrench with common uses. Can be found in your hand."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "wrench"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	belt_icon = "wrench"
 	flags = CONDUCT
 	slot_flags = ITEM_SLOT_BELT
@@ -46,7 +48,7 @@
 	desc = "A polarized wrench. It causes anything placed between the jaws to turn."
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "wrench"
-	item_state = "alien_wrench"
+	item_state = "wrench_alien"
 	belt_icon = "alien_wrench"
 	usesound = 'sound/effects/empulse.ogg'
 	toolspeed = 0.1

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

@@ -3,6 +3,8 @@
 	desc = "A device used to rapidly build and deconstruct walls, floors and airlocks."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "rcd"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	flags = CONDUCT
 	item_flags = NOBLUDGEON|NO_MAT_REDEMPTION
 	force = 0
@@ -461,6 +463,8 @@
 	desc = "Highly compressed matter for the RCD."
 	icon = 'icons/obj/weapons/ammo.dmi'
 	icon_state = "rcd"
+	righthand_file = 'icons/mob/inhands/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/tools_lefthand.dmi'
 	item_state = "rcdammo"
 	origin_tech = "materials=3"
 	materials = list(MAT_METAL=16000, MAT_GLASS=8000)

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

@@ -1,6 +1,6 @@
 //This file contains xenoborg specic weapons.
 
-/obj/item/melee/energy/alien/claws
+/obj/item/melee/energy/alien_claws
 	name = "energy claws"
 	desc = "A set of alien energy claws."
 	icon = 'icons/mob/alien.dmi'

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

@@ -275,7 +275,7 @@
 	/// The sound effecte played when our baton is extended.
 	var/extend_sound = 'sound/weapons/batonextend.ogg'
 	/// The inhand iconstate used when our baton is extended.
-	var/extend_item_state = "nullrod"
+	var/extend_item_state = "telebaton"
 	/// The force on extension.
 	var/extend_force = 10
 

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

@@ -100,6 +100,8 @@
 	desc = "A card used to provide ID and determine access across the station."
 	icon_state = "id"
 	item_state = "card-id"
+	lefthand_file = 'icons/mob/inhands/id_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/id_righthand.dmi'
 	/// For redeeming at mining equipment lockers
 	var/mining_points = 0
 	/// Total mining points for the Shift.
@@ -351,13 +353,13 @@
 	name = "identification card"
 	desc = "A silver card which shows honour and dedication."
 	icon_state = "silver"
-	item_state = "silver_id"
+	item_state = "silver-id"
 
 /obj/item/card/id/gold
 	name = "identification card"
 	desc = "A golden card which shows power and might."
 	icon_state = "gold"
-	item_state = "gold_id"
+	item_state = "gold-id"
 
 /obj/item/card/id/syndicate
 	name = "agent card"
@@ -827,7 +829,7 @@
 	name = "captain's spare ID"
 	desc = "The spare ID of the captain."
 	icon_state = "gold"
-	item_state = "gold_id"
+	item_state = "gold-id"
 	registered_name = "Captain"
 	assignment = JOB_TITLE_CAPTAIN
 
@@ -839,7 +841,7 @@
 /obj/item/card/id/admin
 	name = "admin ID card"
 	icon_state = "admin"
-	item_state = "gold_id"
+	item_state = "gold-id"
 	registered_name = "Admin"
 	assignment = "Testing Shit"
 	untrackable = 1
@@ -1188,15 +1190,15 @@
 	desc = "Make your ID look like the Captain's or a self-centered HOP's. Applies to any ID."
 	decal_desc = "A golden card which shows power and might."
 	decal_icon_state = "gold"
-	decal_item_state = "gold_id"
+	decal_item_state = "gold-id"
 
 /obj/item/id_decal/silver
 	name = "silver ID card decal"
 	icon_state = "id_decal_silver"
 	desc = "Make your ID look like HOP's because they wouldn't change it officially. Applies to any ID."
 	decal_desc = "A silver card which shows honour and dedication."
 	decal_icon_state = "silver"
-	decal_item_state = "silver_id"
+	decal_item_state = "silver-id"
 
 /obj/item/id_decal/prisoner
 	name = "prisoner ID card decal"