From 465b848cb450fb22a4b9af16fb64eb2662be267a Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Fri, 6 Apr 2018 19:51:16 +0300 Subject: [PATCH 1/2] Fixed relay components ignoring signals to the toggle and set_state connections if the signal has been passed through other PowerTransfer components. Closes #355 --- .../Source/Items/Components/Power/PowerTransfer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs index b8e4b49eb..415a15ab7 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs @@ -383,9 +383,9 @@ namespace Barotrauma.Items.Components foreach (ItemComponent ic in recipient.Item.components) { - //powertransfer components don't need to receive the signal because we relay it straight - //to the connected items without going through the whole chain of junction boxes - if (ic is PowerTransfer) continue; + //powertransfer components don't need to receive the signal in the pass-through signal connections + //because we relay it straight to the connected items without going through the whole chain of junction boxes + if (ic is PowerTransfer && connection.Name.Contains("signal")) continue; ic.ReceiveSignal(stepsTaken, signal, recipient, source, sender, 0.0f); } From 9c610a1a823a46276d965b4b3309b3e599120e0b Mon Sep 17 00:00:00 2001 From: boyned//Kampfkarren Date: Sat, 7 Apr 2018 22:09:02 -0700 Subject: [PATCH 2/2] Make Captain's Jacket able to hold 5 things It's stupid that all jobs can hold stuff in their jumpsuits except Captain. --- .../BarotraumaShared/Content/Items/Jobgear/captaingear.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml index ac38100bf..94a7b9521 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml @@ -34,6 +34,10 @@ + + + +