diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs index 20eb2ceca9..d65f8c54ae 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Timers; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Robust.Server.GameObjects; @@ -167,7 +167,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition Magnum, AntiMaterial, Shotgun, - Cap, // Placeholder + Cap, Rocket, Dart, // Placeholder Grenade, diff --git a/Resources/Audio/Guns/Gunshots/grenade_launcher.ogg b/Resources/Audio/Guns/Gunshots/grenade_launcher.ogg index a9c2029382..75ea9a5135 100644 Binary files a/Resources/Audio/Guns/Gunshots/grenade_launcher.ogg and b/Resources/Audio/Guns/Gunshots/grenade_launcher.ogg differ diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml index dfb7b8c3c4..d834a1e14d 100644 --- a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml @@ -169,8 +169,8 @@ - type: Projectile deleteOnCollide: false - type: Explosive - devastationRange: 3 - heavyImpactRange: 5 + devastationRange: 1 + heavyImpactRange: 2 lightImpactRange: 7 flashRange: 10 @@ -205,9 +205,9 @@ - type: Projectile deleteOnCollide: false - type: Explosive - devastationRange: 3 - heavyImpactRange: 5 - lightImpactRange: 7 + devastationRange: 0 + heavyImpactRange: 1 + lightImpactRange: 4 flashRange: 10 - type: entity