fixes a few. cant be bothered with any more rn

code/game/objects/items/storage/guncases.dm

@@ -3,6 +3,8 @@
 	desc = "A large box designed for holding firearms and magazines safely."
 	icon = 'icons/obj/guncase.dmi'
 	icon_state = "guncase"
+	lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
 	item_state = "infiltrator_case"
 	force = 12
 	throwforce = 12

code/modules/clothing/suits/cloaks.dm

@@ -5,7 +5,6 @@
 	desc = "It's a cape that can be worn around your neck."
 	icon = 'icons/obj/clothing/cloaks.dmi'
 	icon_state = "qmcloak"
-	item_state = "qmcloak"
 	w_class = WEIGHT_CLASS_SMALL
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 	flags_inv = HIDESUITSTORAGE

code/modules/clothing/under/accessories.dm

@@ -103,7 +103,7 @@
 	name = "waistcoat"
 	desc = "For some classy, murderous fun."
 	icon_state = "waistcoat"
-	item_state = "waistcoat"
+	item_state = "det_suit"
 	minimize_when_attached = FALSE
 	attachment_slot = null
 
@@ -119,13 +119,11 @@
 	name = "syndicate maid apron"
 	desc = "Practical? No. Tactical? Also no. Cute? Most definitely yes."
 	icon_state = "maidapronsynd"
-	item_state = "maidapronsynd"
 
 /obj/item/clothing/accessory/maidapron/inteq
 	name = "inteq maid apron"
 	desc = "A 'tactical' apron to protect you from all sorts of spills, from dough to blood!"
 	icon_state = "inteqmaidapron"
-	item_state = "inteqmaidapron"
 
 //////////
 //Medals//
@@ -408,7 +406,6 @@
 	name = "shoulder holster"
 	desc = "A holster to carry a handgun and ammo. WARNING: Badasses only."
 	icon_state = "holster"
-	item_state = "holster"
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster
 	attachment_slot = null
 

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -460,6 +460,7 @@
 	desc = "A small law enforcement firearm. Originally commissioned by Nanotrasen for their Private Investigation division, it has become extremely popular among independent civilians as a cheap, compact sidearm. Uses .38 Special rounds."
 	fire_sound = 'sound/weapons/gun/revolver/shot_light.ogg'
 	icon_state = "detective"
+	item_state = "hp_generic"
 	icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
 	lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
 	righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
@@ -572,6 +573,7 @@ EMPTY_GUN_HELPER(revolver/detective)
 	mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
 
 	icon_state = "montagne"
+	item_state = "hp_generic"
 	manufacturer = MANUFACTURER_HUNTERSPRIDE
 	spread_unwielded = 15
 	recoil = 0
@@ -594,6 +596,7 @@ EMPTY_GUN_HELPER(revolver/detective)
 	mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
 
 	icon_state = "ashhand"
+	item_state = "hp_generic"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev4570
 	fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
 	manufacturer = MANUFACTURER_HUNTERSPRIDE

code/modules/projectiles/guns/ballistic/shotgun.dm

@@ -144,6 +144,8 @@
 	desc = "A semi-automatic shotgun with tactical furniture and six-shell capacity underneath."
 	icon_state = "cshotgun"
 	item_state = "shotgun_combat"
+	lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
 	fire_delay = 0.5 SECONDS
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/com
 	w_class = WEIGHT_CLASS_BULKY
@@ -372,8 +374,8 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
 	name = "improvised shotgun"
 	desc = "A length of pipe and miscellaneous bits of scrap fashioned into a rudimentary single-shot shotgun."
 	icon = 'icons/obj/guns/projectile.dmi'
-	lefthand_file = GUN_LEFTHAND_ICON
-	righthand_file = GUN_RIGHTHAND_ICON
+	lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
 	mob_overlay_icon = null
 
 	base_icon_state = "ishotgun"

code/modules/projectiles/guns/energy.dm

@@ -3,6 +3,7 @@
 	desc = "A basic energy-based gun."
 	icon = 'icons/obj/guns/energy.dmi'
 	icon_state = "laser"
+	item_state = "spur"
 
 	muzzleflash_iconstate = "muzzle_flash_laser"
 	muzzle_flash_color = COLOR_SOFT_RED

code/modules/projectiles/guns/energy/laser.dm

@@ -2,8 +2,6 @@
 	name = "SL L-204 laser gun"
 	desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
 
-	icon_state = "laser"
-	item_state = "laser"
 	w_class = WEIGHT_CLASS_NORMAL
 	custom_materials = list(/datum/material/iron=2000)
 	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)