Ports Rod of Asclepius in hand sprites and moves staves in hands into a new file (#22250)

* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file

* removing for now

* its conflict time

* lets fix this conflict

* ah shit

* here we go again

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

@@ -124,9 +124,11 @@
 
 /obj/item/nullrod/staff
 	name = "red holy staff"
-	icon_state = "godstaff-red"
-	item_state = "godstaff-red"
 	desc = "It has a mysterious, protective aura."
+	icon_state = "godstaff-red"
+	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
+	item_state = "godstaff-red"
 	w_class = WEIGHT_CLASS_HUGE
 	force = 5
 	slot_flags = SLOT_BACK
@@ -449,14 +451,16 @@
 /obj/item/nullrod/claymore/bostaff //May as well make it a "claymore" and inherit the blocking
 	name = "monk's staff"
 	desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown."
+	icon_state = "bostaff0"
+	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
+	item_state = "bostaff0"
 	w_class = WEIGHT_CLASS_BULKY
 	force = 13
 	slot_flags = SLOT_BACK
 	sharp = FALSE
 	hitsound = "swing_hit"
 	attack_verb = list("smashed", "slammed", "whacked", "thwacked")
-	icon_state = "bostaff0"
-	item_state = "bostaff0"
 
 /obj/item/nullrod/claymore/bostaff/Initialize(mapload)
 	. = ..()
@@ -600,6 +604,8 @@
 	reskinned = TRUE
 	reskin_selectable = FALSE
 	icon_state = "godstaff-red"
+	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
 	item_state = "godstaff-red"
 	w_class = WEIGHT_CLASS_HUGE
 	force = 5

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

@@ -3,6 +3,8 @@
 	desc = "Apparently a staff used by the wizard."
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "staff"
+	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
 	force = 3.0
 	throwforce = 5.0
 	throw_speed = 1
@@ -75,6 +77,8 @@
 	name = "stick"
 	desc = "A great tool to drag someone else's drinks across the bar."
 	icon_state = "stick"
+	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	item_state = "stick"
 	force = 3.0
 	throwforce = 5.0

code/modules/martial_arts/martial.dm

@@ -375,14 +375,16 @@
 /obj/item/bostaff
 	name = "bo staff"
 	desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate."
+	icon_state = "bostaff0"
+	base_icon_state = "bostaff"
+	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
 	force = 10
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = SLOT_BACK
 	throwforce = 20
 	throw_speed = 2
 	attack_verb = list("smashed", "slammed", "whacked", "thwacked")
-	icon_state = "bostaff0"
-	base_icon_state = "bostaff"
 
 /obj/item/bostaff/Initialize(mapload)
 	. = ..()

code/modules/mining/lavaland/loot/ashdragon_loot.dm

@@ -201,9 +201,11 @@
 /obj/item/lava_staff
 	name = "staff of lava"
 	desc = "The power of fire and rocks in your hands!"
-	icon_state = "lavastaff"
-	item_state = "lavastaff"
 	icon = 'icons/obj/guns/magic.dmi'
+	icon_state = "lavastaff"
+	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
+	item_state = "lavastaff"
 	slot_flags = SLOT_BACK
 	w_class = WEIGHT_CLASS_BULKY
 	force = 25

code/modules/mining/lavaland/loot/legion_loot.dm

@@ -2,6 +2,8 @@
 	name = "staff of storms"
 	desc = "An ancient staff retrieved from the remains of Legion. The wind stirs as you move it."
 	icon_state = "staffofstorms"
+	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
 	item_state = "staffofstorms"
 	icon = 'icons/obj/guns/magic.dmi'
 	slot_flags = SLOT_BACK

code/modules/mining/lavaland/necropolis_chests.dm

@@ -299,6 +299,8 @@
 	desc = "A wooden rod about the size of your forearm with a snake carved around it, winding its way up the sides of the rod. Something about it seems to inspire in you the responsibilty and duty to help others."
 	icon = 'icons/obj/lavaland/artefacts.dmi'
 	icon_state = "asclepius_dormant"
+	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
 	var/activated = FALSE
 	var/usedHand
 	var/mob/living/carbon/owner

code/modules/projectiles/guns/magic/magic_staff.dm

@@ -1,4 +1,6 @@
 /obj/item/gun/magic/staff
+	lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
 	slot_flags = SLOT_BACK
 	ammo_type = /obj/item/ammo_casing/magic
 	flags_2 = NO_MAT_REDEMPTION_2