tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Grenade Launcher Adjustments (#1230)

Browse Source
This commit is contained in:
Swept
2020-07-02 18:37:24 +00:00
committed by GitHub
parent dbd9ee1671
commit 7d346ede28
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Timers; using System.Timers;
using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
@@ -167,7 +167,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
Magnum, Magnum,
AntiMaterial, AntiMaterial,
Shotgun, Shotgun,
Cap, // Placeholder Cap,
Rocket, Rocket,
Dart, // Placeholder Dart, // Placeholder
Grenade, Grenade,

BIN
Resources/Audio/Guns/Gunshots/grenade_launcher.ogg
View File

Binary file not shown.

10
Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml
View File

@@ -169,8 +169,8 @@
- type: Projectile - type: Projectile
deleteOnCollide: false deleteOnCollide: false
- type: Explosive - type: Explosive
devastationRange: 3 devastationRange: 1
heavyImpactRange: 5 heavyImpactRange: 2
lightImpactRange: 7 lightImpactRange: 7
flashRange: 10 flashRange: 10
@@ -205,9 +205,9 @@
- type: Projectile - type: Projectile
deleteOnCollide: false deleteOnCollide: false
- type: Explosive - type: Explosive
devastationRange: 3 devastationRange: 0
heavyImpactRange: 5 heavyImpactRange: 1
lightImpactRange: 7 lightImpactRange: 4
flashRange: 10 flashRange: 10
- type: entity - type: entity