Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix
Electrostaff Sprite Fix
@@ -1012,7 +1012,7 @@
|
|||||||
|
|
||||||
/obj/item/twohanded/electrostaff
|
/obj/item/twohanded/electrostaff
|
||||||
icon = 'icons/obj/items_and_weapons.dmi'
|
icon = 'icons/obj/items_and_weapons.dmi'
|
||||||
icon_state = "electrostaff_3"
|
icon_state = "electrostaff"
|
||||||
item_state = "electrostaff"
|
item_state = "electrostaff"
|
||||||
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
|
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
|
||||||
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
|
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
|
||||||
@@ -1116,10 +1116,10 @@
|
|||||||
/obj/item/twohanded/electrostaff/update_icon_state()
|
/obj/item/twohanded/electrostaff/update_icon_state()
|
||||||
. = ..()
|
. = ..()
|
||||||
if(!wielded)
|
if(!wielded)
|
||||||
icon_state = "electrostaff_3"
|
icon_state = "electrostaff"
|
||||||
item_state = "electrostaff"
|
item_state = "electrostaff"
|
||||||
else
|
else
|
||||||
icon_state = item_state = (on? "electrostaff_1" : "electrostaff_3")
|
icon_state = item_state = (on? "electrostaff_1" : "electrostaff_0")
|
||||||
set_light(7, on? 1 : 0, LIGHT_COLOR_CYAN)
|
set_light(7, on? 1 : 0, LIGHT_COLOR_CYAN)
|
||||||
|
|
||||||
/obj/item/twohanded/electrostaff/examine(mob/living/user)
|
/obj/item/twohanded/electrostaff/examine(mob/living/user)
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 100 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 129 KiB |