vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Regalis11/Barotrauma

Browse Source
This commit is contained in:
itchyOwl
2018-04-09 09:55:07 +03:00
parent a34a024f58 2d39a68ecb
commit c0dccc550e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml
+4
View File
@@ -34,6 +34,10 @@
<sprite texture="captainTorso.png" limb="RightArm" sourcerect="30,0,17,42" origin="0.5,0.5" hidelimb="true"/> <sprite texture="captainTorso.png" limb="RightArm" sourcerect="30,0,17,42" origin="0.5,0.5" hidelimb="true"/>
<sprite texture="captainTorso.png" limb="LeftArm" sourcerect="30,0,17,42" origin="0.5,0.5" hidelimb="true"/> <sprite texture="captainTorso.png" limb="LeftArm" sourcerect="30,0,17,42" origin="0.5,0.5" hidelimb="true"/>
</Wearable> </Wearable>
<ItemContainer capacity="5">
<Containable name="smallitem"/>
</ItemContainer>
</Item> </Item>
<Item <Item
Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs
+3 -3
View File
@@ -383,9 +383,9 @@ namespace Barotrauma.Items.Components
foreach (ItemComponent ic in recipient.Item.components) foreach (ItemComponent ic in recipient.Item.components)
{ {
//powertransfer components don't need to receive the signal because we relay it straight //powertransfer components don't need to receive the signal in the pass-through signal connections
//to the connected items without going through the whole chain of junction boxes //because we relay it straight to the connected items without going through the whole chain of junction boxes
if (ic is PowerTransfer) continue; if (ic is PowerTransfer && connection.Name.Contains("signal")) continue;
ic.ReceiveSignal(stepsTaken, signal, recipient, source, sender, 0.0f); ic.ReceiveSignal(stepsTaken, signal, recipient, source, sender, 0.0f);
} }