Merge with dev.

This commit is contained in:
Zuhayr
2015-02-04 11:03:13 +10:30
2 changed files with 7 additions and 6 deletions

View File

@@ -49,21 +49,22 @@
/*****************************Pickaxe********************************/
/obj/item/weapon/pickaxe
name = "pickaxe"
name = "mining drill"
desc = "The most basic of mining drills, for short excavations and small mineral extractions."
icon = 'icons/obj/items.dmi'
icon_state = "pickaxe"
flags = CONDUCT
slot_flags = SLOT_BELT
force = 15.0
throwforce = 4.0
item_state = "pickaxe"
icon_state = "pickaxe"
item_state = "jackhammer"
w_class = 4.0
matter = list("metal" = 3750)
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
origin_tech = "materials=1;engineering=1"
attack_verb = list("hit", "pierced", "sliced", "attacked")
attack_verb = list("hit", "pierced", "sliced", "attacked", "drilled")
var/drill_sound = 'sound/weapons/Genhit.ogg'
var/drill_verb = "picking"
var/drill_verb = "drilling"
sharp = 1
var/excavation_amount = 100
@@ -82,7 +83,7 @@
desc = "This makes no metallurgic sense."
/obj/item/weapon/pickaxe/drill
name = "mining drill" // Can dig sand as well!
name = "advanced mining drill" // Can dig sand as well!
icon_state = "handdrill"
item_state = "jackhammer"
digspeed = 30