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

Merge branch 'master' of https://github.com/Faerdan/Barotrauma into Faerdan-master

Browse Source 
Conflicts:
	Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs
	Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs
	Barotrauma/BarotraumaShared/Source/Characters/Character.cs
	Barotrauma/BarotraumaShared/Source/Items/Item.cs
This commit is contained in:
Joonas Rikkonen
2017-07-05 19:32:34 +03:00
parent 64ad5e5003 a09367c78f
commit bf5a0746ad
47 changed files with 473 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Content/Items/Jobgear/securitygear.xml
+3 -3
View File
@@ -2,7 +2,7 @@
<Item
name="Body Armor"
category="Equipment"
pickdistance="150"
tags="smallitem"
description="While the body armor won't offer adequate protection against most of the inhabitants of the subsurface ocean, it can be extremely useful if there are traitors on board.">
@@ -20,7 +20,7 @@
<Item
name="Ballistic Helmet"
category="Equipment"
pickdistance="150"
tags="smallitem"
description="While the helmet won't offer adequate protection against most of the inhabitants of the subsurface ocean, it can be extremely useful if there are traitors on board.">
@@ -41,7 +41,7 @@
<Item
name="Handcuffs"
category="Equipment"
pickdistance="150"
tags="smallitem" >
<Sprite texture = "securitygear.png" sourcerect="0,63,32,14" depth="0.6"/>