From 4a6a1dbf5c4972c8912418b661225d7b5d217cbe Mon Sep 17 00:00:00 2001 From: Mechoid Date: Thu, 18 Jan 2018 14:20:55 -0800 Subject: [PATCH] Fixes Tacknife oversight. Fixes comments regarding knives. --- code/game/objects/items/weapons/material/knives.dm | 2 +- code/game/objects/items/weapons/material/misc.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 83f6f0bd89..02f48b15d0 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -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. diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index a5860465b9..1ab2e74730 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -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