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

* 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

View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: BaseShellShotgun
name: shell (.50)
parent: BaseCartridge
@@ -155,14 +155,13 @@
name: uranium shotgun shell
parent: BaseShellShotgun
components:
- type: Sprite
layers:
- state: depleted-uranium
map: [ "enum.AmmoVisualLayers.Base" ]
- type: CartridgeAmmo
count: 5
spread: 6
proto: PelletShotgunUranium
- type: SpentAmmoVisuals
state: "depleted-uranium"
- type: Sprite
layers:
- state: depleted-uranium
map: [ "enum.AmmoVisualLayers.Base" ]
- type: CartridgeAmmo
count: 5
spread: 6
proto: PelletShotgunUranium
- type: SpentAmmoVisuals
state: "depleted-uranium"

View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: PelletShotgunSlug
name: pellet (.50 slug)
noSpawn: true
@@ -132,10 +132,7 @@
!type:PhysShapeAabb
bounds: "-0.1,-0.1,0.1,0.1"
mask:
- BulletImpassable
- type: Tag
tags:
- PelletShotgunFlare
- BulletImpassable
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
state: buckshot-flare

View File

@@ -17,13 +17,8 @@
selectedMode: SemiAuto
availableModes:
- SemiAuto
compatibleAmmo:
- PelletShotgunFlare
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/flaregun.ogg
damageOnWrongAmmo:
types:
Blunt: 6.0
- type: BallisticAmmoProvider
whitelist:
tags:

View File

@@ -1022,9 +1022,6 @@
- type: Tag
id: ShellShotgun
- type: Tag
id: PelletShotgunFlare
- type: Tag
id: Shiv