From 89bc61b1b928b51813055ffa8242be4f2b7d527d Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 7 Oct 2022 17:12:46 +1100 Subject: [PATCH] Bandaid fixtureless buttons (#11748) --- Content.Shared/Interaction/SharedInteractionSystem.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index b5d917a6df..86c320a9b3 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -451,7 +451,11 @@ namespace Content.Shared.Interaction // that means we wouldn't be able to easily check overlap interactions. if (range > 0f && TryComp(origin, out var fixtureA) && + // These fixture counts are stuff that has the component but no fixtures for (e.g. buttons). + // At least until they get removed. + fixtureA.FixtureCount > 0 && TryComp(other, out var fixtureB) && + fixtureB.FixtureCount > 0 && TryComp(origin, out var xformA) && TryComp(other, out var xformB)) {