This commit is contained in:
Atermonera
2022-01-18 17:29:50 -08:00
parent 4d8c43f106
commit 0dabd4a717
2 changed files with 6 additions and 0 deletions
@@ -68,6 +68,7 @@
origin_tech = list(TECH_MATERIAL = 1)
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
drop_sound = 'sound/items/drop/knife.ogg'
tool_qualities = list(TOOL_WOODCUT = TOOL_QUALITY_POOR, TOOL_KNIFE = TOOL_QUALITY_STANDARD)
// These no longer inherit from hatchets.
/obj/item/weapon/material/knife/tacknife
@@ -139,6 +140,8 @@
attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut")
can_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned.
slot_flags = SLOT_BELT
tool_qualities = list(TOOL_WOODCUT = TOOL_QUALITY_MEDIOCRE, TOOL_KNIFE = TOOL_QUALITY_STANDARD)
/obj/item/weapon/material/knife/machete/cyborg
name = "integrated machete"
@@ -23,6 +23,7 @@
applies_material_colour = 0
drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
tool_qualities = list(TOOL_WOODCUT = TOOL_QUALITY_STANDARD, TOOL_KNIFE = TOOL_QUALITY_STANDARD)
/obj/item/weapon/material/knife/machete/hatchet/stone
name = "sharp rock"
@@ -31,6 +32,7 @@
icon_state = "rock"
item_state = "rock"
attack_verb = list("chopped", "torn", "cut")
tool_qualities = list(TOOL_WOODCUT = TOOL_QUALITY_POOR, TOOL_KNIFE = TOOL_QUALITY_POOR)
/obj/item/weapon/material/knife/machete/hatchet/stone/set_material(var/new_material)
var/old_name = name
@@ -44,6 +46,7 @@
attack_verb = list("ripped", "torn", "cut")
can_cleave = FALSE
var/hits = 0
tool_qualities = list(TOOL_WOODCUT = TOOL_QUALITY_POOR, TOOL_KNIFE = TOOL_QUALITY_POOR)
/obj/item/weapon/material/knife/machete/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob)
if(hits > 0)