diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml index bae33f27f1..84665c365d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -40,7 +40,7 @@ wideAnimationRotation: 180 damage: types: - Blunt: 10 + Blunt: 12 soundHit: path: /Audio/Weapons/smash.ogg - type: Tool diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index d04b8cceec..d69ca57e49 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -27,7 +27,7 @@ - type: MeleeWeapon damage: types: - Blunt: 12 + Blunt: 15 soundHit: path: "/Audio/Weapons/smash.ogg" - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml index 0a720f9fd0..bc4da9359d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -39,7 +39,7 @@ attackRate: 0.75 damage: types: - Slash: 16 + Slash: 33 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item @@ -69,14 +69,14 @@ damage: types: Blunt: 10 - Slash: 10 + Slash: 20 Structural: 5 - type: Wieldable - type: IncreaseDamageOnWield damage: types: - Blunt: 5 - Slash: 5 + Blunt: 4 + Slash: 12 Structural: 10 - type: Item size: Ginormous diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index b46ee09633..4b1791e2ae 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -19,14 +19,15 @@ types: # axes are kinda like sharp hammers, you know? Blunt: 5 - Slash: 10 + Slash: 13 Structural: 10 - type: Wieldable - type: IncreaseDamageOnWield damage: types: - Slash: 10 - Structural: 40 + Blunt: 2.5 + Slash: 10.5 + Structural: 60 - type: Item size: Ginormous - type: Clothing diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 106e8bf440..c6a8ac2a6f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -14,7 +14,7 @@ wideAnimationRotation: -135 damage: types: - Slash: 10 + Slash: 12 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 2a27c8525f..4073865533 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -46,7 +46,7 @@ wideAnimationRotation: -135 damage: types: - Slash: 15 + Slash: 20 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item @@ -102,7 +102,7 @@ wideAnimationRotation: -135 damage: types: - Slash: 15 + Slash: 20 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item @@ -125,7 +125,7 @@ attackRate: 0.75 damage: types: - Slash: 20 + Slash: 33 soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Item