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/Artifacts/artifacts.xml
+10 -10
View File
@@ -4,7 +4,7 @@
name="Skyholder Artifact"
category="Alien"
Tags="alien"
pickdistance="150">
>
<Sprite texture="artifact.png" depth="0.7" sourcerect="58,0,60,60"/>
@@ -26,7 +26,7 @@
name="Thermal Artifact"
category="Alien"
Tags="alien"
pickdistance="150">
>
<Sprite texture="artifact.png" depth="0.7" sourcerect="1,0,57,56"/>
@@ -50,7 +50,7 @@
name="Faraday Artifact"
category="Alien"
Tags="alien"
pickdistance="150">
>
<Sprite texture="artifact.png" depth="0.7" sourcerect="0,56,60,49"/>
@@ -92,7 +92,7 @@
<Item
name="Oxygenite Shard"
category="Alien"
pickdistance="150"
tags="alien,smallitem"
impacttolerance="8">
@@ -112,7 +112,7 @@
<Item
name="Sulphurite Shard"
category="Alien"
pickdistance="150"
tags="alien,smallitem"
impacttolerance="8"
spritecolor="1.0,0.0,0.0,1.0">
@@ -137,7 +137,7 @@
name="Ancient Weapon"
category="Alien"
Tags="alien,smallitem"
pickdistance="200">
>
<Deconstruct time="20">
<Item name="Steel Bar"/>
@@ -188,7 +188,7 @@
category="Alien"
Tags="alien"
linkable="true"
pickdistance="150.0">
>
<Sprite texture="Content/Map/ruins.png" sourcerect="747,0,260,95" depth="0.8" origin="0.5,0.5"/>
@@ -210,7 +210,7 @@
category="Alien"
linkable="true"
Tags="alien"
pickdistance="150.0">
>
<Sprite texture="Content/Map/ruins.png" sourcerect="746,101,93,259" depth="0.8" origin="0.5,0.5"/>
@@ -232,7 +232,7 @@
linkable="true"
category="Alien"
Tags="alien"
pickdistance="150.0">
>
<Sprite texture="Content/Map/ruins.png" sourcerect="55,608,81,103" depth="0.8" origin="0.5,0.5"/>
@@ -249,7 +249,7 @@
linkable="true"
category="Alien"
Tags="alien"
pickdistance="150.0">
>
<Sprite texture="artifactholder.png" depth="0.8"/>