]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Cluster grenade refactor and contra markings (#31108)
authorPlykiya <58439124+Plykiya@users.noreply.github.com>
Mon, 16 Dec 2024 12:08:07 +0000 (04:08 -0800)
committerGitHub <noreply@github.com>
Mon, 16 Dec 2024 12:08:07 +0000 (13:08 +0100)
commita4d6f09a4fc11c2cd7cdacc390f4c42995757ff6
tree95011f21717439262bc205bcba6aa2e9cd9da40f
parent1266b05b02c6fd6bfd4b0def75a710057e959535
Cluster grenade refactor and contra markings (#31108)

* Cluster grenade refactor

* oopsies on the name

* Solve client-side errors

* reviews addressed

* filling scattering grenades is now predicted

* reviews addressed
14 files changed:
Content.Client/Explosion/ScatteringGrenadeSystem.cs [new file with mode: 0644]
Content.Server/Explosion/Components/ClusterGrenadeComponent.cs [deleted file]
Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs [new file with mode: 0644]
Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs [deleted file]
Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs [new file with mode: 0644]
Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs [new file with mode: 0644]
Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs
Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs [new file with mode: 0644]
Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml [deleted file]
Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml [new file with mode: 0644]
Resources/Prototypes/tags.yml