Merge branch 'master' into moStuff

# Conflicts:
#	Barotrauma/BarotraumaShared/Source/Characters/Character.cs
This commit is contained in:
Alex Noir
2017-12-21 23:17:56 +03:00
46 changed files with 1801 additions and 494 deletions
@@ -14,13 +14,16 @@
<RequiredItems name="Battery Cell" type="Contained"/>
</WifiComponent>
<ItemContainer capacity="1" hideitems="true">
<Containable name="Battery Cell"/>
<Containable name="Fulgurium Battery Cell"/>
</ItemContainer>
<ItemContainer capacity="1" hideitems="true">
<Containable name="Battery Cell">
<StatusEffect type="OnContaining" target="Contained" Condition="-0.05"/>
</Containable>
<Containable name="Fulgurium Battery Cell">
<StatusEffect type="OnContaining" target="Contained" Condition="-0.05"/>
</Containable>
</ItemContainer>
<Wearable limbtype="Head" slots="Any,Face">
<StatusEffect type="OnWearing" target="Contained" Condition="-0.1"/>
<sprite texture="headset.png" limb="Head" origin="0.5,0.5"/>
</Wearable>
</Item>