diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index bf1d04c105..b36c1f1875 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -78,7 +78,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 @@ -219,12 +219,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 cab5db6200..4ad43b8ba0 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -263,7 +263,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 @@ -275,11 +276,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 93466d49c8..1b76335f57 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 15b34ad2ea..b57672971c 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 609892a66e..426df3053f 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 c638777349..b9e7280735 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index 2820ba5c36..da4f8da048 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -1697,7 +1697,7 @@ "aGG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central) "aGH" = (/obj/machinery/vending/snack,/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/central) "aGI" = (/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/hallway/primary/central) -"aGJ" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) +"aGJ" = (/obj/machinery/light{dir = 1},/obj/structure/closet/crate/hydroponics,/obj/item/weapon/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aGK" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aGL" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics) "aGM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{pixel_y = 25},/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)