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

Merge branch 'master' into new-netcode

Browse Source 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
This commit is contained in:
Regalis
2017-02-22 23:33:14 +02:00
parent 75d047b57e 5006a9af6c
commit 3fcaff0288
23 changed files with 82 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Content/Items/Electricity/signalcomp.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Subsurface/Content/Items/Electricity/signalitems.xml
+11 -8
View File
@@ -15,9 +15,9 @@
<Item name="Copper Bar"/>
</Deconstruct>
<Sprite texture ="wire.png" depth="0.55"/>
<Sprite texture ="signalcomp.png" depth="0.55" sourcerect="83,105,44,22"/>
<Body radius="15" density="30"/>
<Body radius="7" width="25" density="30"/>
<Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
@@ -38,8 +38,9 @@
<Item name="Copper Bar"/>
</Deconstruct>
<Sprite texture ="wire.png" depth="0.55"/>
<Body radius="15" density="30"/>
<Sprite texture ="signalcomp.png" depth="0.55" sourcerect="83,105,44,22"/>
<Body radius="7" width="25" density="30"/>
<Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
<Wire/>
@@ -59,8 +60,9 @@
<Item name="Copper Bar"/>
</Deconstruct>
<Sprite texture ="wire.png" depth="0.55"/>
<Body radius="15" density="30"/>
<Sprite texture ="signalcomp.png" depth="0.55" sourcerect="83,105,44,22"/>
<Body radius="7" width="25" density="30"/>
<Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
<Wire/>
@@ -80,8 +82,9 @@
<Item name="Copper Bar"/>
</Deconstruct>
<Sprite texture ="wire.png" depth="0.55"/>
<Body radius="15" density="30"/>
<Sprite texture ="signalcomp.png" depth="0.55" sourcerect="83,105,44,22"/>
<Body radius="7" width="25" density="30"/>
<Holdable slots="Any,RightHand,LeftHand" handle1="0,0"/>
<Wire/>
Subsurface/Content/Items/Electricity/wire.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

Subsurface/Content/Items/Jobgear/captaingear.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<Sprite texture ="captainhat.png" depth="0.6"/>
<Body radius="8" density="30"/>
<Body width="25" height="15" density="30"/>
<Wearable limbtype="Head" slots="Any,Head">
<sprite texture="captainhat.png" limb="Head" origin="0.5,0.9"/>