diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 2a85fbdfc9..063a6a206b 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -10,7 +10,7 @@ w_class = 3.0 throw_speed = 2 throw_range = 10 - force = 10.0 + force = 15 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 f4b763c5e9..c952d6aa67 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -8,8 +8,8 @@ sharp = 1 edge = 1 w_class = 2 - force_divisor = 0.2 // 6 with hardness 30 (glass) - thrown_force_divisor = 0.4 // 4 with weight 15 (glass) + force_divisor = 0.3 // 9 with hardness 30 (glass) + thrown_force_divisor = 0.5 item_state = "shard-glass" attack_verb = list("stabbed", "slashed", "sliced", "cut") default_material = "glass" @@ -87,7 +87,7 @@ if(affecting) if(affecting.robotic >= ORGAN_ROBOT) return - if(affecting.take_damage(5, 0)) + if(affecting.take_damage(force, 0)) H.UpdateDamageIcon() H.updatehealth() if(affecting.can_feel_pain()) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 13cbc06dc7..be8895009f 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -5,7 +5,7 @@ icon_state = "red" item_state = "toolbox_red" flags = CONDUCT - force = 5 + force = 10 throwforce = 10 throw_speed = 1 throw_range = 7 @@ -67,7 +67,7 @@ icon_state = "syndicate" item_state = "toolbox_syndi" origin_tech = list(TECH_COMBAT = 1, TECH_ILLEGAL = 1) - force = 7.0 + force = 14 /obj/item/weapon/storage/toolbox/syndicate/New() ..() diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index b7868cf7e0..bcc85d7e63 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -21,9 +21,9 @@ icon_state = "wrench" flags = CONDUCT slot_flags = SLOT_BELT - force = 5.0 - throwforce = 7.0 - w_class = 2.0 + force = 6 + throwforce = 7 + w_class = 2 origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) matter = list(DEFAULT_WALL_MATERIAL = 150) attack_verb = list("bashed", "battered", "bludgeoned", "whacked") @@ -39,9 +39,9 @@ icon_state = "screwdriver" flags = CONDUCT slot_flags = SLOT_BELT | SLOT_EARS - force = 5.0 - w_class = 1.0 - throwforce = 5.0 + force = 6 + w_class = 1 + throwforce = 5 throw_speed = 3 throw_range = 5 matter = list(DEFAULT_WALL_MATERIAL = 75) @@ -100,7 +100,7 @@ icon_state = "cutters" flags = CONDUCT slot_flags = SLOT_BELT - force = 6.0 + force = 6 throw_speed = 2 throw_range = 9 w_class = 2.0 @@ -411,10 +411,10 @@ icon_state = "crowbar" flags = CONDUCT slot_flags = SLOT_BELT - force = 5.0 - throwforce = 7.0 + force = 6 + throwforce = 7 item_state = "crowbar" - w_class = 2.0 + w_class = 2 origin_tech = list(TECH_ENGINEERING = 1) matter = list(DEFAULT_WALL_MATERIAL = 50) attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index c0189dd1c6..c4ee895ab8 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -6,7 +6,7 @@ amount_per_transfer_from_this = 10 volume = 100 item_state = "broken_beer" //Generic held-item sprite until unique ones are made. - force = 5 + force = 6 var/smash_duration = 5 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets) var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it @@ -172,7 +172,7 @@ desc = "A bottle with a sharp broken bottom." icon = 'icons/obj/drinks.dmi' icon_state = "broken_bottle" - force = 9 + force = 13 throwforce = 5 throw_speed = 3 throw_range = 5