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
This commit is contained in:
Henri215
2023-09-19 14:58:11 -03:00
committed by GitHub
parent 24440cc3a4
commit 9fdf2992be
11 changed files with 28 additions and 8 deletions
+4 -2
View File
@@ -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)
. = ..()
@@ -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
@@ -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
@@ -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
@@ -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