diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml index 91d687a2ab..5c9e7a8434 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml @@ -7,4 +7,4 @@ - type: Projectile damage: types: - Piercing: 70 + Piercing: 49 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index 9f69a54076..2e81e92300 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 27 + Piercing: 19 - type: entity id: BulletCaselessRifleFlash @@ -29,7 +29,7 @@ - type: Projectile damage: types: - Piercing: 32 + Piercing: 22 - type: entity id: BulletCaselessRiflePractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index aa6531f8eb..be6a07e486 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 28 + Piercing: 19 - type: entity id: BulletMinigun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index b3205f47f1..4cc3a4f46f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 28 + Piercing: 19 - type: entity id: BulletLightRifleFlash @@ -29,7 +29,7 @@ - type: Projectile damage: types: - Piercing: 30 + Piercing: 21 - type: entity id: BulletLightRiflePractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index 237d2c7dee..fd729cb6f5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 32 + Piercing: 22 - type: entity id: BulletMagnumFlash @@ -29,7 +29,7 @@ - type: Projectile damage: types: - Piercing: 35 + Piercing: 24 - type: entity id: BulletMagnumPractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 6d99884f3a..c9a5e0565b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 24 + Piercing: 16 - type: entity id: BulletPistolFlash @@ -29,7 +29,7 @@ - type: Projectile damage: types: - Piercing: 28 + Piercing: 19 - type: entity id: BulletPistolPractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index af1a23a443..6e9a5873e5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 25 + Piercing: 17 - type: entity id: BulletRifleFlash @@ -29,7 +29,7 @@ - type: Projectile damage: types: - Piercing: 30 + Piercing: 21 - type: entity id: BulletRiflePractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index d00d8a3115..d596111e4a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -10,7 +10,7 @@ - type: Projectile damage: types: - Piercing: 8 # Should have the same or less damage than a regular pellet + Piercing: 5 # Should have the same or less damage than a regular pellet - type: entity id: PelletShotgunBeanbag @@ -41,7 +41,7 @@ - type: Projectile damage: types: - Piercing: 8 + Piercing: 5 - type: entity id: PelletShotgunFlash @@ -55,7 +55,7 @@ - type: Projectile damage: types: - Blunt: 3 + Blunt: 2 - type: entity id: PelletShotgunIncendiary @@ -69,7 +69,7 @@ - type: Projectile damage: groups: - Burn: 10 + Burn: 7 - type: PointLight enabled: true color: "#ff4300" @@ -130,7 +130,7 @@ - type: Projectile damage: groups: - Burn: 20 + Burn: 14 - type: PointLight enabled: true color: "#FF8080" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 1491cdafb3..3cfe06efcb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -16,7 +16,7 @@ id: RedLaser damage: types: - Heat: 20 + Heat: 14 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_laser @@ -31,7 +31,7 @@ id: RedMediumLaser damage: types: - Heat: 25 + Heat: 17 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_laser @@ -46,7 +46,7 @@ id: OmniLaser damage: types: - Heat: 30 + Heat: 21 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_omni @@ -61,8 +61,8 @@ id: XrayLaser damage: types: - Heat: 15 - Radiation: 15 + Heat: 10 + Radiation: 10 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_xray @@ -77,7 +77,7 @@ id: RedHeavyLaser damage: types: - Heat: 40 + Heat: 28 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_beam_heavy @@ -92,7 +92,7 @@ id: Pulse damage: types: - Heat: 50 + Heat: 35 muzzleFlash: sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi state: muzzle_blue diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 9fbf0b2d5f..534a5ae7b2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -31,7 +31,7 @@ - type: Projectile damage: types: - Piercing: 20 + Piercing: 14 soundHit: path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg @@ -81,7 +81,7 @@ - type: Projectile damage: types: - Piercing: 12 + Piercing: 17 - type: entity id: BaseBulletPractice @@ -179,7 +179,7 @@ - type: Projectile damage: types: - Heat: 20 + Heat: 14 - type: Tag tags: - EmitterBolt