Merge pull request #157 from jjpark-kb/master

Fixing the Crusher Icon
This commit is contained in:
quotefox
2020-01-25 10:22:03 +00:00
committed by GitHub
@@ -2,7 +2,7 @@
/obj/item/twohanded/kinetic_crusher
icon = 'icons/obj/mining.dmi'
icon_state = "mining_hammer"
item_state = "mining_hammer0"
item_state = "mining_hammer"
lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
name = "proto-kinetic crusher"
@@ -97,7 +97,7 @@
playsound(user, 'sound/weapons/plasma_cutter.ogg', 100, 1)
D.fire()
charged = FALSE
icon_state = "mining_hammer1_uncharged"
icon_state = "mining_hammer"
addtimer(CALLBACK(src, .proc/Recharge), charge_time)
return
if(proximity_flag && isliving(target))