Merge pull request #4582 from Mechoid/Tacknives_Angry_Again

Fixes Tacknife oversight. Fixes comments regarding knives.
This commit is contained in:
Anewbe
2018-01-18 22:23:58 -06:00
committed by GitHub
2 changed files with 3 additions and 2 deletions
@@ -96,7 +96,7 @@
name = "machete"
desc = "A sharp machete often found in survival kits."
icon_state = "machete"
force_divisor = 0.3 // 20 when hardness 60 (steel)
force_divisor = 0.3 // 18 when hardness 60 (steel)
attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut")
var/should_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned.
@@ -57,13 +57,14 @@
hits = initial(hits)
..()
// These probably shouldn't inherit from hatchets.
// These no longer inherit from hatchets.
/obj/item/weapon/material/knife/tacknife
name = "tactical knife"
desc = "You'd be killing loads of people if this was Medal of Valor: Heroes of Space."
icon = 'icons/obj/weapons.dmi'
icon_state = "tacknife"
item_state = "knife"
force_divisor = 0.25 //15 when hardness 60 (steel)
attack_verb = list("stabbed", "chopped", "cut")
applies_material_colour = 1