Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Make flare gun explode, damage and stun the player when used … (#24679)

Browse Source 
* Revert "Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)"

This reverts commit e301378114.

# Conflicts:
#	Content.Shared/Weapons/Ranged/Components/GunComponent.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

* Fix revert conflicts

* Update Content.Shared/Weapons/Ranged/Components/GunComponent.cs
This commit is contained in:
metalgearsloth
2024-01-29 11:20:34 +11:00
committed by GitHub
parent 58b55ba06c
commit e1901aa6b6
7 changed files with 13 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Shared/Weapons/Ranged/Components/GunComponent.cs
View File

@@ -5,7 +5,6 @@ using Content.Shared.Weapons.Ranged.Systems;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
namespace Content.Shared.Weapons.Ranged.Components;
@@ -180,18 +179,6 @@ public sealed partial class GunComponent : Component
[DataField]
public bool ResetOnHandSelected = true;
/// <summary>
/// Type of ammo the gun can work with
/// </summary>
[DataField]
public List<ProtoId<TagPrototype>>? CompatibleAmmo;
/// <summary>
/// Damage the gun deals when used with wrong ammo
/// </summary>
[DataField]
public DamageSpecifier? DamageOnWrongAmmo = null;
/// <summary>
/// The base value for how fast the projectile moves.
/// </summary>