]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Combine solution injection systems; Fix embeddable injectors (#26268)
authorTayrtahn <tayrtahn@gmail.com>
Mon, 1 Apr 2024 03:39:34 +0000 (23:39 -0400)
committerGitHub <noreply@github.com>
Mon, 1 Apr 2024 03:39:34 +0000 (14:39 +1100)
commitd0d12760a88f21368a19e9b523686b304f331a81
tree923d2a2bf274f66eaee54a8d6b572cd83b934e63
parentd8d4feec3813c2667dd33e084da916d394977527
Combine solution injection systems; Fix embeddable injectors (#26268)

* Combine injection systems

* Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
12 files changed:
Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs [new file with mode: 0644]
Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs [deleted file]
Content.Server/Chemistry/Components/SolutionInjectOnEmbedComponent.cs [new file with mode: 0644]
Content.Server/Chemistry/Components/SolutionInjectOnProjectileHitComponent.cs [new file with mode: 0644]
Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs [deleted file]
Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs [new file with mode: 0644]
Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
Resources/Prototypes/Entities/Objects/Fun/darts.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml