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

Merge branch 'multisub'

Browse Source 
Conflicts:
	.gitignore
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Items/Components/Holdable/RepairTool.cs
	Subsurface_Solution.v12.suo
This commit is contained in:
Regalis
2016-07-04 17:42:31 +03:00
parent 73ff859f33 e74d5adef4
commit cd3ecd36e8
87 changed files with 2496 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Content/Items/Door/dockingport.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

Subsurface/Content/Items/Door/dockingport1.ogg
BIN
View File
Binary file not shown.
Subsurface/Content/Items/Door/dockingport2.ogg
BIN
View File
Binary file not shown.
Subsurface/Content/Items/Door/dockingport2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

Subsurface/Content/Items/Door/doors.xml
+54
View File
@@ -82,4 +82,58 @@
<output name="state_out"/>
</ConnectionPanel>
</Item>
<Item
name="Docking Port"
linkable="true"
pickdistance="150.0">
<Sprite texture ="dockingport.png" sourcerect="0,0,112,208" depth="0.94" origin="0.5,0.5"/>
<DockingPort IsHorizontal="true" DistanceTolerance="128,64" DockedDistance="64">
<Sprite texture ="dockingport.png" sourcerect="127,0,112,144" depth="0.05" origin="0.5,0.5"/>
<sound file="dockingport1.ogg" type="OnUse" range="1000.0"/>
<sound file="dockingport2.ogg" type="OnSecondaryUse" range="1000.0"/>
</DockingPort>
<fixrequirement name="Mechanical repairs">
<skill name="Construction" level="60"/>
<item name="Welding Tool"/>
</fixrequirement>
<ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
<requireditem name="Screwdriver" type="Equipped"/>
<input name="toggle"/>
<input name="set_state"/>
<output name="state_out"/>
<output name="proximity_sensor"/>
</ConnectionPanel>
</Item>
<Item
name="Docking Hatch"
linkable="true"
pickdistance="150.0">
<Sprite texture ="dockingport2.png" sourcerect="0,0,128,112" depth="0.94" origin="0.5,0.5"/>
<DockingPort IsHorizontal="false" DistanceTolerance="64,128" DockedDistance="64">
<Sprite texture ="dockingport.png" sourcerect="127,144,48,112" depth="0.05" origin="0.5,0.5"/>
<sound file="dockingport1.ogg" type="OnUse" range="1000.0"/>
<sound file="dockingport2.ogg" type="OnSecondaryUse" range="1000.0"/>
</DockingPort>
<fixrequirement name="Mechanical repairs">
<skill name="Construction" level="60"/>
<item name="Welding Tool"/>
</fixrequirement>
<ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
<requireditem name="Screwdriver" type="Equipped"/>
<input name="toggle"/>
<input name="set_state"/>
<output name="state_out"/>
<output name="proximity_sensor"/>
</ConnectionPanel>
</Item>
</Items>
Subsurface/Content/Items/Engine/engine.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 90 KiB

Subsurface/Content/Items/Engine/engine.xml
+29 -1
View File
@@ -8,7 +8,7 @@
pickthroughwalls="true"
pickdistance="150">
<Sprite texture ="engine.png" depth="0.8"/>
<Sprite texture ="engine.png" depth="0.8" sourcerect="0,0,373,113"/>
<fixrequirement name="Mechanical repairs">
<skill name="Construction" level="40"/>
@@ -29,6 +29,34 @@
</ConnectionPanel>
</Item>
<Item
name="Shuttle Engine"
linkable="true"
category="Machine"
pickthroughwalls="true"
pickdistance="150">
<Sprite texture ="engine.png" depth="0.8" sourcerect="0,115,224,73"/>
<fixrequirement name="Mechanical repairs">
<skill name="Construction" level="30"/>
<item name="Welding Tool"/>
<item name="Wrench"/>
</fixrequirement>
<Engine minvoltage="0.5" powerconsumption="500.0" maxforce="300" canbeselected = "true">
<StatusEffect type="InWater" target="This" condition="-2.0"/>
<GuiFrame rect="0,0,350,160" alignment="Center" color="0.0,0.0,0.0,0.6"/>
<sound file="engine.ogg" type="OnActive" range="3000.0" volume="CurrentVolume" loop="true"/>
</Engine>
<ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
<requireditem name="Screwdriver" type="Equipped"/>
<input name="power_in"/>
<input name="set_force"/>
</ConnectionPanel>
</Item>
<Item
name="Navigation Terminal"
linkable="true"
Subsurface/Content/Items/Reactor/reactor.xml
+3 -6
View File
@@ -67,8 +67,7 @@
<Body radius="6" height="22" density="5"/>
<Holdable handle1="0,0"/>
<Pickable slots="RightHand,Any"/>
<Holdable handle1="0,0" slots="RightHand,Any"/>
</Item>
<Item
@@ -86,8 +85,7 @@
<Body radius="6" height="22" density="5"/>
<Holdable handle1="0,0"/>
<Pickable slots="RightHand,Any"/>
<Holdable handle1="0,0" slots="RightHand,Any"/>
</Item>
@@ -100,8 +98,7 @@
<Body radius="6" height="22" density="5"/>
<Holdable handle1="0,0"/>
<Pickable slots="Any"/>
<Holdable handle1="0,0" slots="Any"/>
</Item>
</Items>