]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Defibs will now also shock anyone still interacting with the target. (#35998)
authorCiarán Walsh <github@ciaranwal.sh>
Sat, 22 Nov 2025 23:44:26 +0000 (23:44 +0000)
committerGitHub <noreply@github.com>
Sat, 22 Nov 2025 23:44:26 +0000 (23:44 +0000)
commitc2f4b5145d1dfde85791b7464d46a092d1613da5
tree54764d7bb846c239aa575b062faab6d92deeea99
parentf38a322912dcd9edb72f8d4a9449dc3143970eb6
Defibs will now also shock anyone still interacting with the target. (#35998)

* Defibs will now also shock anyone still interacting with the target.

* Improvements to test readability

* Apply fixes to other tests

* Refactor the interacting entities query to use an event.

* Include pullers as interacting with the entity they are pulling

* Broadcast event

* Use a constant

* Convert new test to InteractionTest

* Convert existing test

* Add behaviour note

* Revert "Convert existing test"

This reverts commit b8a8f2f68e3733bdb6ec254faf955a42096d47d7.

* Move new test into separate (InteractionTest) test file

* Use ToServer

* Use a constant for prototype id

* Use ToServer

* Add EntProtoId constructor

* Add assertion failure messages

* Manual cleanup of test entities

* Remove obsolete flag

* Add test summaries

* Remove tuple constructor

* Wrap entity deletion in WaitPost

* Extend DoAfter interacting test with an extra mob
Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs
Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
Content.IntegrationTests/Tests/Puller/InteractingEntitiesTest.cs [new file with mode: 0644]
Content.Server/Medical/DefibrillatorSystem.cs
Content.Shared/DoAfter/SharedDoAfterSystem.cs
Content.Shared/Interaction/SharedInteractionSystem.cs
Content.Shared/Movement/Pulling/Systems/PullingSystem.cs