diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index 5710e0f4d5..e17a577514 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -2,7 +2,7 @@ sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi', SPECIES_WEREBEAST = 'icons/inventory/belt/mob_vr_werebeast.dmi') - + /obj/item/weapon/storage/belt/explorer name = "explorer's belt" desc = "A versatile belt with several pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find." @@ -51,7 +51,7 @@ /obj/item/device/mapping_unit, /obj/item/weapon/kinetic_crusher ) - + /obj/item/weapon/storage/belt/explorer/pathfinder name = "pathfinder's belt" desc = "A deluxe belt with many pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find." @@ -60,3 +60,46 @@ item_state = "explorer_belt" storage_slots = 7 //two more, bringing it on par with normal belts max_storage_space = ITEMSIZE_COST_NORMAL * 7 + +/obj/item/weapon/storage/belt/miner + name = "mining belt" + desc = "A versatile and durable looking belt with several pouches and straps. It can hold a very wide variety of items that any typical miner might need out in the deep." + icon = 'icons/inventory/belt/item_vr.dmi' + icon_state = "mining" + item_state = "mining" + storage_slots = 6 + max_w_class = ITEMSIZE_LARGE + max_storage_space = ITEMSIZE_COST_NORMAL * 6 + can_hold = list( + /obj/item/weapon/storage/box/samplebags, + /obj/item/device/core_sampler, + /obj/item/device/beacon_locator, + /obj/item/device/radio/beacon, + /obj/item/device/measuring_tape, + /obj/item/device/flashlight, + /obj/item/weapon/cell/device, + /obj/item/weapon/pickaxe, + /obj/item/weapon/shovel, + /obj/item/device/depth_scanner, + /obj/item/device/camera, + /obj/item/weapon/paper, + /obj/item/weapon/photo, + /obj/item/weapon/folder, + /obj/item/weapon/pen, + /obj/item/weapon/folder, + /obj/item/weapon/clipboard, + /obj/item/weapon/anodevice, + /obj/item/clothing/glasses, + /obj/item/weapon/tool/wrench, + /obj/item/weapon/storage/excavation, + /obj/item/weapon/anobattery, + /obj/item/device/ano_scanner, + /obj/item/weapon/pickaxe/hand, + /obj/item/device/xenoarch_multi_tool, + /obj/item/weapon/pickaxe/excavationdrill, + /obj/item/device/geiger, + /obj/item/device/gps, + /obj/item/stack/marker_beacon, + /obj/item/stack/flag, + /obj/item/weapon/melee + ) \ No newline at end of file diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm index acb7f93fc8..a6bc8c7d34 100644 --- a/code/game/objects/random/maintenance.dm +++ b/code/game/objects/random/maintenance.dm @@ -287,6 +287,7 @@ something, make sure it's not in one of the other lists.*/ return pick(prob(320);/obj/random/maintenance/clean, prob(3);/obj/item/device/flashlight/lantern, prob(4);/obj/item/weapon/pickaxe, + prob(3);/obj/item/weapon/pickaxe/drill, prob(5);/obj/item/weapon/storage/backpack/industrial, prob(5);/obj/item/weapon/storage/backpack/satchel/norm, prob(3);/obj/item/weapon/storage/backpack/dufflebag, diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index 6940a6702f..0a96e31f9f 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -207,6 +207,12 @@ /obj/item/weapon/flame/lighter/zippo, /obj/structure/closet/crate/hydroponics ), + prob(5);list( + /obj/item/weapon/pickaxe, + /obj/item/clothing/under/rank/miner, + /obj/item/clothing/head/hardhat, + /obj/structure/closet/crate/engineering + ), prob(5);list( /obj/item/weapon/pickaxe/drill, /obj/item/clothing/suit/space/void/mining, @@ -214,7 +220,7 @@ /obj/structure/closet/crate/engineering ), prob(5);list( - /obj/item/weapon/pickaxe/drill, + /obj/item/weapon/pickaxe/advdrill, /obj/item/clothing/suit/space/void/mining/alt, /obj/item/clothing/head/helmet/space/void/mining/alt, /obj/structure/closet/crate/engineering @@ -249,7 +255,7 @@ /obj/structure/closet/crate/engineering ), prob(5);list( - /obj/item/weapon/pickaxe/drill, + /obj/item/weapon/pickaxe, /obj/item/clothing/glasses/material, /obj/structure/ore_box, /obj/structure/closet/crate @@ -368,7 +374,7 @@ /obj/structure/closet/crate/engineering ), prob(2);list( - /obj/item/weapon/pickaxe/drill, + /obj/item/weapon/pickaxe/advdrill, /obj/item/weapon/storage/bag/ore, /obj/item/clothing/glasses/material, /obj/structure/closet/crate/engineering @@ -1485,6 +1491,7 @@ return pick( prob(10);list(/obj/item/weapon/pickaxe/silver), prob(8);list(/obj/item/weapon/pickaxe/drill), + prob(6);list(/obj/item/weapon/pickaxe/advdrill), prob(6);list(/obj/item/weapon/pickaxe/jackhammer), prob(5);list(/obj/item/weapon/pickaxe/gold), prob(4);list(/obj/item/weapon/pickaxe/plasmacutter), diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 42fa6d9ff3..0e27bc9788 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -12,6 +12,9 @@ desc = "It looks alien!" closet_appearance = /decl/closet_appearance/alien + open_sound = 'sound/machines/click.ogg' + close_sound = 'sound/machines/click.ogg' + /obj/structure/closet/gimmick name = "administrative supply closet" desc = "It's a storage unit for things that have no right being here." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 2f6aaf5ce2..d59bb442ea 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -71,9 +71,10 @@ /obj/item/clothing/shoes/black, /obj/item/device/analyzer, /obj/item/weapon/storage/bag/ore, + /obj/item/weapon/storage/belt/miner, /obj/item/device/flashlight/lantern, /obj/item/weapon/shovel, - /obj/item/weapon/pickaxe, + /obj/item/weapon/pickaxe/drill, /obj/item/clothing/glasses/material, /obj/item/clothing/suit/storage/hooded/wintercoat/miner, /obj/item/clothing/shoes/boots/winter/mining, diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 3a58a1018b..afaff608d3 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -2151,7 +2151,9 @@ /obj/item/weapon/storage/belt/utility/chief/full = 5, /obj/item/weapon/storage/belt/utility/alien/full = 5, /obj/item/weapon/storage/bible = 5, + /obj/item/weapon/pickaxe = 5, /obj/item/weapon/pickaxe/drill = 5, + /obj/item/weapon/pickaxe/advdrill = 5, /obj/item/weapon/pickaxe/diamonddrill = 5, /obj/item/weapon/pickaxe/gold = 5, /obj/item/weapon/pickaxe/diamond = 5, diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 2896f7feea..1b043ec8c1 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -27,7 +27,7 @@ new/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus(src) new/obj/item/weapon/flame/lighter/zippo(src) if(6 to 10) - new/obj/item/weapon/pickaxe/drill(src) + new/obj/item/weapon/pickaxe/advdrill(src) new/obj/item/device/taperecorder(src) new/obj/item/clothing/suit/space(src) new/obj/item/clothing/head/helmet/space(src) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 8b3b188135..8654ef9fed 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -10,22 +10,22 @@ /*****************************Pickaxe********************************/ /obj/item/weapon/pickaxe - name = "mining drill" - desc = "The most basic of mining drills, for short excavations and small mineral extractions." + name = "pickaxe" + desc = "A miner's best friend." icon = 'icons/obj/items.dmi' slot_flags = SLOT_BELT force = 15.0 throwforce = 4.0 icon_state = "pickaxe" - item_state = "jackhammer" + item_state = "pickaxe" w_class = ITEMSIZE_LARGE - matter = list(MAT_STEEL = 3750) + matter = list(MAT_STEEL = 2500) var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO var/sand_dig = FALSE // does this thing dig sand? - origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) + origin_tech = list(TECH_MATERIAL = 1) attack_verb = list("hit", "pierced", "sliced", "attacked") var/drill_sound = "pickaxe" - var/drill_verb = "drilling" + var/drill_verb = "picking" sharp = TRUE var/excavation_amount = 200 @@ -39,16 +39,59 @@ origin_tech = list(TECH_MATERIAL = 3) desc = "This makes no metallurgic sense." +/obj/item/weapon/pickaxe/gold + name = "golden pickaxe" + icon_state = "gpickaxe" + item_state = "gpickaxe" + digspeed = 20 + origin_tech = list(TECH_MATERIAL = 4) + desc = "This makes no metallurgic sense." + drill_verb = "picking" + +/obj/item/weapon/pickaxe/diamond + name = "diamond pickaxe" + icon_state = "dpickaxe" + item_state = "dpickaxe" + digspeed = 10 + origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4) + desc = "A pickaxe with a diamond pick head." + drill_verb = "picking" + +/*****************************Drill********************************/ + /obj/item/weapon/pickaxe/drill + name = "mining drill" // Can dig sand as well! + icon_state = "drill" + item_state = "jackhammer" + digspeed = 35 //Only slighty better than a pickaxe + sand_dig = TRUE + origin_tech = list(TECH_MATERIAL = 1, TECH_POWER = 2, TECH_ENGINEERING = 1) + matter = list(MAT_STEEL = 3750) + desc = "The most basic of mining drills, for short excavations and small mineral extractions." + drill_verb = "drilling" + +/obj/item/weapon/pickaxe/advdrill name = "advanced mining drill" // Can dig sand as well! - icon_state = "handdrill" + icon_state = "advdrill" item_state = "jackhammer" digspeed = 30 sand_dig = TRUE origin_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) + matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 2500) desc = "Yours is the drill that will pierce through the rock walls." drill_verb = "drilling" +/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME! + name = "diamond mining drill" + icon_state = "diamonddrill" + item_state = "jackhammer" + digspeed = 5 //Digs through walls, girders, and can dig up sand + sand_dig = TRUE + origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 5) + matter = list(MAT_STEEL = 4500, MAT_PLASTEEL = 3000, MAT_DIAMONDS = 1000) + desc = "Yours is the drill that will pierce the heavens!" + drill_verb = "drilling" + /obj/item/weapon/pickaxe/jackhammer name = "sonic jackhammer" icon_state = "jackhammer" @@ -58,56 +101,33 @@ desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards." drill_verb = "hammering" -/obj/item/weapon/pickaxe/gold - name = "golden pickaxe" - icon_state = "gpickaxe" - item_state = "gpickaxe" - digspeed = 20 - origin_tech = list(TECH_MATERIAL = 4) - desc = "This makes no metallurgic sense." - drill_verb = "picking" +/obj/item/weapon/pickaxe/borgdrill + name = "jackhammer" + icon_state = "borg_pick" + item_state = "jackhammer" + digspeed = 15 + sand_dig = TRUE + desc = "Cracks rocks with a hardened pneumatic bit." + drill_verb = "hammering" /obj/item/weapon/pickaxe/plasmacutter name = "plasma cutter" + desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff." icon_state = "plasmacutter" - item_state = "gun" + item_state = "plasmacutter" w_class = ITEMSIZE_NORMAL //it is smaller than the pickaxe damtype = "fire" - digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire + digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/light thermite on fire origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3) - desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff." + matter = list(MAT_STEEL = 3000, MAT_PLASTEEL = 1500, MAT_DIAMONDS = 500, MAT_PHORON = 500) drill_verb = "cutting" drill_sound = 'sound/items/Welder.ogg' sharp = TRUE edge = TRUE -/obj/item/weapon/pickaxe/diamond - name = "diamond pickaxe" - icon_state = "dpickaxe" - item_state = "dpickaxe" - digspeed = 10 - origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4) - desc = "A pickaxe with a diamond pick head." - drill_verb = "picking" - -/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME! - name = "diamond mining drill" - icon_state = "diamonddrill" - item_state = "jackhammer" - digspeed = 5 //Digs through walls, girders, and can dig up sand - sand_dig = TRUE - origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 5) - desc = "Yours is the drill that will pierce the heavens!" - drill_verb = "drilling" - -/obj/item/weapon/pickaxe/borgdrill - name = "enhanced sonic jackhammer" - icon_state = "jackhammer" - item_state = "jackhammer" - digspeed = 15 - sand_dig = TRUE - desc = "Cracks rocks with sonic blasts. This one seems like an improved design." - drill_verb = "hammering" +/obj/item/weapon/pickaxe/plasmacutter/borg + name = "mounted plasma cutter" + icon_state = "pcutter_borg" /*****************************Shovel********************************/ @@ -116,10 +136,10 @@ desc = "A large tool for digging and moving dirt." icon = 'icons/obj/items.dmi' icon_state = "shovel" + item_state = "shovel" slot_flags = SLOT_BELT force = 8.0 throwforce = 4.0 - item_state = "shovel" w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 50) diff --git a/code/modules/mining/mine_items_vr.dm b/code/modules/mining/mine_items_vr.dm index 3fbf95d826..55ee93a18e 100644 --- a/code/modules/mining/mine_items_vr.dm +++ b/code/modules/mining/mine_items_vr.dm @@ -1,30 +1,35 @@ //upgrades the speed of all drills and pickaxes. +//Pickaxes /obj/item/weapon/pickaxe digspeed = 36 /obj/item/weapon/pickaxe/silver digspeed = 27 +/obj/item/weapon/pickaxe/diamond + digspeed = 9 + +/obj/item/weapon/pickaxe/gold + digspeed = 18 + +//Drills /obj/item/weapon/pickaxe/drill + digspeed = 30 + +/obj/item/weapon/pickaxe/advdrill digspeed = 27 /obj/item/weapon/pickaxe/jackhammer digspeed = 18 destroy_artefacts = TRUE -/obj/item/weapon/pickaxe/gold - digspeed = 18 - -/obj/item/weapon/pickaxe/plasmacutter - digspeed = 18 - -/obj/item/weapon/pickaxe/diamond - digspeed = 9 - /obj/item/weapon/pickaxe/diamonddrill digspeed = 4 /obj/item/weapon/pickaxe/borgdrill digspeed = 13 destroy_artefacts = TRUE + +/obj/item/weapon/pickaxe/plasmacutter + digspeed = 18 diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 3e02f71c1f..2deb28fa2c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -422,7 +422,7 @@ var/global/list/robot_modules = list( src.emag = new /obj/item/weapon/melee/baton/robot/arm(src) src.modules += new /obj/item/device/geiger(src) src.modules += new /obj/item/weapon/rcd/electric/mounted/borg(src) - src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src) + src.modules += new /obj/item/weapon/pickaxe/plasmacutter/borg(src) src.modules += new /obj/item/weapon/gripper/no_use/loader(src) var/datum/matter_synth/metal = new /datum/matter_synth/metal(40000) @@ -745,7 +745,7 @@ var/global/list/robot_modules = list( src.emag = new /obj/item/weapon/kinetic_crusher/machete/dagger(src) // No reason for these, upgrade modules replace them. - //src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src) + //src.emag = new /obj/item/weapon/pickaxe/plasmacutter/borg(src) //src.emag = new /obj/item/weapon/pickaxe/diamonddrill(src) /obj/item/weapon/robot_module/robot/research @@ -840,7 +840,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/device/flash(src) //src.modules += new /obj/item/borg/sight/thermal(src) // VOREStation Edit src.modules += new /obj/item/weapon/gun/energy/laser/mounted(src) - src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src) + src.modules += new /obj/item/weapon/pickaxe/plasmacutter/borg(src) src.modules += new /obj/item/borg/combat/shield(src) src.modules += new /obj/item/borg/combat/mobility(src) src.emag = new /obj/item/weapon/gun/energy/lasercannon/mounted(src) @@ -875,7 +875,7 @@ var/global/list/robot_modules = list( robot.internals = new/obj/item/weapon/tank/jetpack/carbondioxide(src) src.modules += robot.internals - src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src) + src.emag = new /obj/item/weapon/pickaxe/plasmacutter/borg(src) src.emag.name = "Plasma Cutter" var/datum/matter_synth/metal = new /datum/matter_synth/metal(25000) diff --git a/code/modules/research/designs/mining_toys.dm b/code/modules/research/designs/mining_toys.dm index c1784dec6f..6d6b47a9c1 100644 --- a/code/modules/research/designs/mining_toys.dm +++ b/code/modules/research/designs/mining_toys.dm @@ -6,38 +6,45 @@ /datum/design/item/weapon/mining/drill id = "drill" - req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) - materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners. + req_tech = list(TECH_MATERIAL = 1, TECH_POWER = 2, TECH_ENGINEERING = 1) + materials = list(MAT_STEEL = 4000, MAT_GLASS = 500) //expensive, but no need for miners. build_path = /obj/item/weapon/pickaxe/drill sort_string = "FAAAA" +/datum/design/item/weapon/mining/advdrill + id = "advanced_drill" + req_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) + materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners. + build_path = /obj/item/weapon/pickaxe/advdrill + sort_string = "FAAAB" + /datum/design/item/weapon/mining/jackhammer id = "jackhammer" req_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2) materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_SILVER = 500) build_path = /obj/item/weapon/pickaxe/jackhammer - sort_string = "FAAAB" + sort_string = "FAAAC" /datum/design/item/weapon/mining/plasmacutter id = "plasmacutter" req_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3) materials = list(MAT_STEEL = 1500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_PHORON = 500) build_path = /obj/item/weapon/pickaxe/plasmacutter - sort_string = "FAAAC" + sort_string = "FAAAD" /datum/design/item/weapon/mining/pick_diamond id = "pick_diamond" req_tech = list(TECH_MATERIAL = 6) materials = list(MAT_DIAMOND = 3000) build_path = /obj/item/weapon/pickaxe/diamond - sort_string = "FAAAD" + sort_string = "FAAAE" /datum/design/item/weapon/mining/drill_diamond id = "drill_diamond" req_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 4) materials = list(MAT_STEEL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) build_path = /obj/item/weapon/pickaxe/diamonddrill - sort_string = "FAAAE" + sort_string = "FAAAF" // Mining other equipment diff --git a/icons/inventory/belt/item_vr.dmi b/icons/inventory/belt/item_vr.dmi index d7a769224c..b11bbec306 100644 Binary files a/icons/inventory/belt/item_vr.dmi and b/icons/inventory/belt/item_vr.dmi differ diff --git a/icons/inventory/belt/mob_vr.dmi b/icons/inventory/belt/mob_vr.dmi index b03d95c430..3a774c960b 100644 Binary files a/icons/inventory/belt/mob_vr.dmi and b/icons/inventory/belt/mob_vr.dmi differ diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 17b80b78a5..16022a35b6 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 f8b95c18bc..5232b40a73 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 048b14acbc..09b112ca2c 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/gps.dmi b/icons/obj/gps.dmi index 2a1bc98b10..1b22a37f12 100644 Binary files a/icons/obj/gps.dmi and b/icons/obj/gps.dmi differ diff --git a/icons/obj/hydroponics_machines.dmi b/icons/obj/hydroponics_machines.dmi index ed1bcf868a..7727a655cd 100644 Binary files a/icons/obj/hydroponics_machines.dmi and b/icons/obj/hydroponics_machines.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 97ee06a906..74e690e18b 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/maps/submaps/depreciated_vr/talon.dm b/maps/submaps/depreciated_vr/talon.dm index 70355b0d97..54cc43c265 100644 --- a/maps/submaps/depreciated_vr/talon.dm +++ b/maps/submaps/depreciated_vr/talon.dm @@ -390,7 +390,7 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/weapon/storage/bag/ore, /obj/item/device/flashlight/lantern, /obj/item/weapon/shovel, - /obj/item/weapon/pickaxe, + /obj/item/weapon/pickaxe/drill, /obj/item/weapon/mining_scanner, /obj/item/clothing/glasses/material, /obj/item/clothing/glasses/meson