From 058b6f1aa3a020155f37590dc13a49a0f2e60090 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 7 Aug 2016 15:00:25 +0100 Subject: [PATCH] Further weapon force tweaks --- code/game/objects/items/weapons/extinguisher.dm | 4 ++-- code/game/objects/items/weapons/material/shards.dm | 2 +- .../modules/reagents/reagent_containers/food/drinks/bottle.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 063a6a206b8..6e323d7387f 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -7,10 +7,10 @@ hitsound = 'sound/weapons/smash.ogg' flags = CONDUCT throwforce = 10 - w_class = 3.0 + w_class = 3 throw_speed = 2 throw_range = 10 - force = 15 + force = 10 matter = list(DEFAULT_WALL_MATERIAL = 90) attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index c952d6aa67d..d957c049b5e 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -8,7 +8,7 @@ sharp = 1 edge = 1 w_class = 2 - force_divisor = 0.3 // 9 with hardness 30 (glass) + force_divisor = 0.25 // 7.5 with hardness 30 (glass) thrown_force_divisor = 0.5 item_state = "shard-glass" attack_verb = list("stabbed", "slashed", "sliced", "cut") diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index c4ee895ab87..3114f12f558 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -172,7 +172,7 @@ desc = "A bottle with a sharp broken bottom." icon = 'icons/obj/drinks.dmi' icon_state = "broken_bottle" - force = 13 + force = 10 throwforce = 5 throw_speed = 3 throw_range = 5