Added some husk chems to the subs, attack key is included in the default config, fixed character and wiring modes crashing the game

This commit is contained in:
Regalis
2016-08-29 21:23:35 +03:00
parent 1dad116981
commit ca5ad3ece4
5 changed files with 2 additions and 3 deletions

View File

@@ -508,13 +508,12 @@ namespace Barotrauma
Properties = ObjectProperty.GetProperties(this);
Info = characterInfo;
if (file == humanConfigFile && characterInfo == null)
{
Info = new CharacterInfo(file);
}
Info = characterInfo;
XDocument doc = ToolBox.TryLoadXml(file);
if (doc == null || doc.Root == null) return;

Binary file not shown.

Binary file not shown.

View File

@@ -2,5 +2,5 @@
<config masterserverurl="http://www.undertowgames.com/baromaster" autocheckupdates="true" musicvolume="0.0" soundvolume="0.0" verboselogging="true">
<graphicsmode width="1280" height="720" fullscreen="false" />
<contentpackage path="Data/ContentPackages/Vanilla 0.3.xml" />
<keymapping Select="E" Use="0" Aim="1" Up="W" Down="S" Left="A" Right="D" Run="LeftShift" Crouch="LeftControl" Chat="Tab" CrewOrders="C" />
<keymapping Select="E" Use="0" Aim="1" Up="W" Down="S" Left="A" Right="D" Attack="R" Run="LeftShift" Crouch="LeftControl" Chat="Tab" CrewOrders="C" />
</config>