diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 69d53403fee..5df96916099 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -4,7 +4,7 @@ name = "lockbox" desc = "A locked box." icon_state = "lockbox+l" - item_state = "syringe_kit" + item_state = "lockbox" w_class = 4 max_w_class = 3 max_storage_space = 14 //The sum of the w_classes of all the items in this storage item. diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 7b0eb1bf170..3c876c1e632 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -89,6 +89,14 @@ name = "[name] (Wielded)" update_icon() +/obj/item/weapon/pickaxe/update_icon() + ..() + if(wielded) + item_state = "[initial(icon_state)]-wielded" + else + item_state = initial(item_state) + update_held_icon() + /obj/item/weapon/pickaxe/mob_can_equip(M as mob, slot) //Cannot equip wielded items. if(wielded) diff --git a/html/changelogs/[Ferner]-[300319-sprites_lockboxpickaxe].yml b/html/changelogs/[Ferner]-[300319-sprites_lockboxpickaxe].yml new file mode 100644 index 00000000000..bc7b5fbc3b6 --- /dev/null +++ b/html/changelogs/[Ferner]-[300319-sprites_lockboxpickaxe].yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Ferner + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Introduced new pickaxe sprites. Sprites for when they are wielded were also added." + - imageadd: "Gave the lockbox its own unique held sprite, a replacement for the generic box one it had before. Added missing directional sprite for the secure briefcase." diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 50c84ab6161..3caf47b521a 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index ca3533b3b50..cfd96b6a4fa 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ