cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 01:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes mining drills using pickaxe's inhands [MDB IGNORE] (#8981)

Browse Source 
* Fixes mining drills using pickaxe's inhands (#62251)

* new sprites good

* suggestion applied

* Fixes mining drills using pickaxe's inhands

Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-10-22 23:33:01 +02:00
committed by GitHub
parent 1d1d722f05
commit 17344c44bb
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/modules/mining/equipment/mining_tools.dm
View File

@@ -7,8 +7,6 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
force = 15
throwforce = 10
inhand_icon_state = "pickaxe"
worn_icon_state = "pickaxe"
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
w_class = WEIGHT_CLASS_BULKY
@@ -38,6 +36,7 @@
name = "compact pickaxe"
desc = "A smaller, compact version of the standard pickaxe."
icon_state = "minipick"
inhand_icon_state = "pickaxe"
worn_icon_state = "pickaxe"
force = 10
throwforce = 7
@@ -48,8 +47,6 @@
/obj/item/pickaxe/silver
name = "silver-plated pickaxe"
icon_state = "spickaxe"
inhand_icon_state = "spickaxe"
worn_icon_state = "spickaxe"
toolspeed = 0.5 //mines faster than a normal pickaxe, bought from mining vendor
desc = "A silver-plated pickaxe that mines slightly faster than standard-issue."
force = 17
@@ -57,8 +54,6 @@
/obj/item/pickaxe/diamond
name = "diamond-tipped pickaxe"
icon_state = "dpickaxe"
inhand_icon_state = "dpickaxe"
worn_icon_state = "dpickaxe"
toolspeed = 0.3
desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt."
force = 19
@@ -97,8 +92,6 @@
/obj/item/pickaxe/drill/jackhammer
name = "sonic jackhammer"
icon_state = "jackhammer"
inhand_icon_state = "jackhammer"
worn_icon_state = "jackhammer"
toolspeed = 0.1 //the epitome of powertools. extremely fast mining
usesound = 'sound/weapons/sonic_jackhammer.ogg'
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
@@ -108,7 +101,6 @@
name = "improvised pickaxe"
desc = "A pickaxe made with a knife and crowbar taped together, how does it not break?"
icon_state = "ipickaxe"
inhand_icon_state = "ipickaxe"
worn_icon_state = "pickaxe"
force = 10
throwforce = 7
@@ -122,17 +114,15 @@
desc = "A large tool for digging and moving dirt."
icon = 'icons/obj/mining.dmi'
icon_state = "shovel"
worn_icon_state = "shovel"
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
force = 8
throwforce = 4
tool_behaviour = TOOL_SHOVEL
toolspeed = 1
usesound = 'sound/effects/shovel_dig.ogg'
throwforce = 4
inhand_icon_state = "shovel"
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=50)
attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks")
@@ -154,8 +144,6 @@
name = "spade"
desc = "A small tool for digging and moving dirt."
icon_state = "spade"
inhand_icon_state = "spade"
worn_icon_state = "spade"
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
force = 5
@@ -166,7 +154,6 @@
name = "serrated bone shovel"
desc = "A wicked tool that cleaves through dirt just as easily as it does flesh. The design was styled after ancient lavaland tribal designs."
icon_state = "shovel_bone"
inhand_icon_state = "shovel_bone"
worn_icon_state = "shovel_serr"
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'