]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Fix tranquiliser shells not working (#23886)
authornikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Wed, 10 Jan 2024 23:02:37 +0000 (01:02 +0200)
committerGitHub <noreply@github.com>
Wed, 10 Jan 2024 23:02:37 +0000 (18:02 -0500)
commitef132c8a7b83691ab550e1cfe5d31fd8be2b3788
tree44cba5d2513c9c3d595aeb87dd5227aed61f7430
parent1fbb63f7d3cec6cc6258860f76cc156d23cc82da
Fix tranquiliser shells not working (#23886)

* Fix tranquiliser darts not working

Fixes a bug introduced by 9f47079d02a872f0aaff84f4556b83d3c6f835ef which
was made to stop the fly-by fixture from triggering the system. This was
done by checking whether the fixture was hard. Apparently the
projectile's fixture is never hard as well. The change just makes it so
that check only succeeds when the fixture is a fly-by fixture.

* Remove something that I think is redundant

* Remove random using directive that somehow appeared.

* Address Review

* Adress Review 2

* Put the appropriate fixture ids
Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
Resources/Prototypes/Entities/Objects/Fun/darts.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml