shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

k

Browse Source
This commit is contained in:
kevinz000
2020-02-24 13:16:12 -07:00
parent 59e95555bb
commit fa9e275237
8 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/twohanded.dm
+10 -8
View File
@@ -1018,11 +1018,11 @@
user.client.pixel_y = 0
/obj/item/twohanded/electrostaff
icon = 'icons/obj/estaff.dmi'
icon_state = "electrostaff_3"
item_state = "electrostaff_3"
lefthand_file = 'icons/mob/inhands/weapons/estaff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/estaff_righthand.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "electrostaff"
item_state = "electrostaff"
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
name = "riot suppression electrostaff"
desc = "A large quarterstaff, with massive silver electrodes mounted at the end."
w_class = WEIGHT_CLASS_HUGE
@@ -1123,9 +1123,11 @@
/obj/item/twohanded/electrostaff/update_icon()
. = ..()
var/final = wielded? (on? "electrostaff_1" : "electrostaff_3") : "electrostaff"
icon_state = final
item_state = final
if(!wielded)
icon_state = "electrostaff"
item_state = "electrostaff"
else
icon_state = item_state = (on? "electrostaff_1" : "electrostaff_3")
set_light(7, on? 1 : 0, LIGHT_COLOR_CYAN)
/obj/item/twohanded/electrostaff/examine(mob/living/user)