diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index f9a6e709303..aecf0530841 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -88,7 +88,7 @@ /obj/item/weapon/storage/pillbottlebox name = "box of pill bottles" desc = "It has pictures of pill bottles on its front." - icon_state = "box" + icon_state = "pillbox" item_state = "syringe_kit" foldable = /obj/item/stack/sheet/cardboard //BubbleWrap @@ -292,12 +292,19 @@ update_icon() for(var/obj/item/weapon/card/id/ID in contents) - if(ID.icon_state == "gold") - icon_state = "walletid_gold" - return - else if(ID.icon_state == "id") - icon_state = "walletid" - return + switch(ID.icon_state) + if("id") + icon_state = "walletid" + return + if("silver") + icon_state = "walletid_silver" + return + if("gold") + icon_state = "walletid_gold" + return + if("centcom") + icon_state = "walletid_centcom" + return icon_state = "wallet" diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 54befddcbc3..08470a9a2e9 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -266,7 +266,8 @@ proc/move_mining_shuttle() /*****************************Shovel********************************/ /obj/item/weapon/shovel - name = "Shovel" + name = "shovel" + desc = "A large tool for digging and moving dirt." icon = 'items.dmi' icon_state = "shovel" flags = FPRINT | TABLEPASS| CONDUCT @@ -278,11 +279,14 @@ proc/move_mining_shuttle() m_amt = 50 origin_tech = "materials=1;engineering=1" - - - - - +/obj/item/weapon/shovel/spade + name = "spade" + desc = "A small tool for digging and moving dirt." + icon_state = "spade" + item_state = "spade" + force = 5.0 + throwforce = 7.0 + w_class = 2.0 /**********************Mining car (Crate like thing, not the rail car)**************************/ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 25e0331d237..7f1476f8665 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 61319b20f9e..cd602b16e39 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 69c55d472b1..759442da114 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 6292adc2211..176d76c5b4c 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ