Merge pull request #16672 from botka4aet/BoneItems

New tribal craft items(pickaxe and scythe)
This commit is contained in:
variableundefined
2021-09-17 21:34:35 -05:00
committed by GitHub
6 changed files with 49 additions and 12 deletions
+16
View File
@@ -510,6 +510,22 @@
/obj/item/stack/sheet/sinew = 1)
category = CAT_PRIMAL
/datum/crafting_recipe/bonepickaxe
name = "Bone Pickaxe"
result = list(/obj/item/pickaxe/bone)
time = 40
reqs = list(/obj/item/stack/sheet/bone = 4,
/obj/item/stack/sheet/sinew = 2)
category = CAT_PRIMAL
/datum/crafting_recipe/bonescythe
name = "Bone Scythe"
result = list(/obj/item/scythe/bone)
time = 40
reqs = list(/obj/item/stack/sheet/bone = 5,
/obj/item/stack/sheet/sinew = 2)
category = CAT_PRIMAL
/datum/crafting_recipe/boneaxe
name = "Bone Axe"
result = list(/obj/item/twohanded/fireaxe/boneaxe)
+12 -4
View File
@@ -8,7 +8,7 @@
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT
origin_tech = "magnets=2;biotech=2"
materials = list(MAT_METAL=30, MAT_GLASS=20)
materials = list(MAT_METAL = 30, MAT_GLASS = 20)
// *************************************
// Hydroponics Tools
@@ -111,9 +111,9 @@
flags = NONE
/obj/item/scythe
icon_state = "scythe0"
name = "scythe"
desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
icon_state = "scythe0"
force = 13
throwforce = 5
throw_speed = 2
@@ -129,6 +129,14 @@
var/extend = 1
var/swiping = FALSE
/obj/item/scythe/bone
name = "bone scythe"
desc = "Perfect for harvesting. And it's not about plants."
icon_state = "bone_scythe"
force = 14
throw_range = 4
origin_tech = "materials=1;combat=2"
/obj/item/scythe/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
if(ishuman(user))
@@ -155,10 +163,10 @@
swiping = FALSE
/obj/item/scythe/tele
icon_state = "tscythe0"
item_state = null //no sprite for folded version, like a tele-baton
name = "telescopic scythe"
desc = "A sharp and curved blade on a collapsable fibre metal handle, this tool is the pinnacle of covert reaping technology."
icon_state = "tscythe0"
item_state = null //no sprite for folded version, like a tele-baton
force = 3
sharp = 0
w_class = WEIGHT_CLASS_SMALL
+21 -8
View File
@@ -9,7 +9,7 @@
throwforce = 10
item_state = "pickaxe"
w_class = WEIGHT_CLASS_BULKY
materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
materials = list(MAT_METAL = 2000) //one sheet, but where can you make them?
origin_tech = "materials=2;engineering=3"
attack_verb = list("hit", "pierced", "sliced", "attacked")
var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg')
@@ -42,35 +42,49 @@
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 1000)
/obj/item/pickaxe/bone
name = "bone pickaxe"
desc = "Do it yourself pickaxe."
icon_state = "bone_pickaxe"
item_state = "bone_pickaxe"
origin_tech = "materials=1;engineering=2"
toolspeed = 0.7
force = 16
materials = list()
/obj/item/pickaxe/silver
name = "silver-plated pickaxe"
desc = "A silver-plated pickaxe that mines slightly faster than standard-issue."
icon_state = "spickaxe"
item_state = "spickaxe"
origin_tech = "materials=3;engineering=4"
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
materials = list(MAT_METAL = 1900, MAT_SILVER = 100)
/obj/item/pickaxe/gold
name = "golden pickaxe"
desc = "A gold-plated pickaxe that mines faster than standard-issue."
icon_state = "gpickaxe"
item_state = "gpickaxe"
origin_tech = "materials=4;engineering=4"
toolspeed = 0.4
desc = "A gold-plated pickaxe that mines faster than standard-issue."
force = 18
materials = list(MAT_METAL = 1900, MAT_GOLD = 100)
/obj/item/pickaxe/diamond
name = "diamond-tipped pickaxe"
desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt."
icon_state = "dpickaxe"
item_state = "dpickaxe"
origin_tech = "materials=5;engineering=4"
toolspeed = 0.3
desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt."
force = 19
materials = list(MAT_METAL = 1900, MAT_DIAMOND = 100)
/obj/item/pickaxe/drill
name = "mining drill"
desc = "An electric mining drill for the especially scrawny."
icon_state = "handdrill"
item_state = "jackhammer"
digsound = list('sound/weapons/drill.ogg')
@@ -78,7 +92,6 @@
hitsound = 'sound/weapons/drill.ogg'
usesound = 'sound/weapons/drill.ogg'
origin_tech = "materials=2;powerstorage=2;engineering=3"
desc = "An electric mining drill for the especially scrawny."
/obj/item/pickaxe/drill/cyborg
name = "cyborg mining drill"
@@ -87,9 +100,9 @@
/obj/item/pickaxe/drill/diamonddrill
name = "diamond-tipped mining drill"
desc = "Yours is the drill that will pierce the heavens!"
icon_state = "diamonddrill"
origin_tech = "materials=6;powerstorage=4;engineering=4"
desc = "Yours is the drill that will pierce the heavens!"
toolspeed = 0.2
/obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version!
@@ -99,13 +112,13 @@
/obj/item/pickaxe/drill/jackhammer
name = "sonic jackhammer"
desc = "Cracks rocks with sonic blasts, and doubles as a demolition power tool for smashing walls."
icon_state = "jackhammer"
item_state = "jackhammer"
origin_tech = "materials=6;powerstorage=4;engineering=5;magnets=4"
digsound = list('sound/weapons/sonic_jackhammer.ogg')
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
usesound = 'sound/weapons/sonic_jackhammer.ogg'
desc = "Cracks rocks with sonic blasts, and doubles as a demolition power tool for smashing walls."
toolspeed = 0.1 //the epitome of powertools. extremely fast mining, laughs at puny walls
/obj/item/shovel
@@ -119,7 +132,7 @@
throwforce = 4
item_state = "shovel"
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=50)
materials = list(MAT_METAL = 50)
origin_tech = "materials=2;engineering=2"
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
usesound = 'sound/effects/shovel_dig.ogg'