From 9b6dd5da0049aa9f7e4c6a4a9af3902b7e7e95f2 Mon Sep 17 00:00:00 2001
From: Regalis
Date: Sat, 13 Feb 2016 21:25:59 +0200
Subject: [PATCH] Timer for deattaching items, more reliable door syncing, some
new splash sounds
---
Subsurface/Barotrauma.csproj | 33 ++++++
.../Content/Characters/Moloch/moloch.xml | 2 +-
Subsurface/Content/Items/Button/button.xml | 2 +-
.../Content/Items/Electricity/signalitems.xml | 19 ++--
Subsurface/Content/Items/Reactor/reactor.xml | 4 +-
Subsurface/Content/Sounds/Water/Splash0.ogg | Bin 0 -> 29301 bytes
Subsurface/Content/Sounds/Water/Splash1.ogg | Bin 0 -> 22382 bytes
Subsurface/Content/Sounds/Water/Splash2.ogg | Bin 0 -> 30230 bytes
Subsurface/Content/Sounds/Water/Splash3.ogg | Bin 0 -> 25505 bytes
Subsurface/Content/Sounds/Water/Splash4.ogg | Bin 0 -> 22159 bytes
Subsurface/Content/Sounds/Water/Splash5.ogg | Bin 0 -> 29095 bytes
Subsurface/Content/Sounds/Water/Splash6.ogg | Bin 0 -> 28693 bytes
Subsurface/Content/Sounds/Water/Splash7.ogg | Bin 0 -> 25609 bytes
Subsurface/Content/Sounds/Water/Splash8.ogg | Bin 0 -> 57143 bytes
Subsurface/Content/Sounds/Water/Splash9.ogg | Bin 0 -> 59816 bytes
.../Content/Sounds/Water/splashLoop.ogg | Bin 0 -> 160658 bytes
.../Source/Characters/Animation/Ragdoll.cs | 21 +++-
Subsurface/Source/Characters/Limb.cs | 2 +-
Subsurface/Source/DebugConsole.cs | 2 +-
Subsurface/Source/Items/CharacterInventory.cs | 4 +-
Subsurface/Source/Items/Components/Door.cs | 42 +++++--
.../Items/Components/Holdable/Holdable.cs | 35 +++---
.../Items/Components/Holdable/Pickable.cs | 106 ++++++++++++++++--
.../Source/Items/Components/ItemComponent.cs | 7 ++
Subsurface/Source/Items/ItemInventory.cs | 2 +-
Subsurface/Source/Map/SubmarineBody.cs | 2 +-
Subsurface/Source/Networking/GameServer.cs | 2 +-
Subsurface/Source/Sounds/SoundPlayer.cs | 22 +++-
Subsurface_Solution.sln | 4 +-
Subsurface_Solution.v12.suo | Bin 913920 -> 828928 bytes
30 files changed, 252 insertions(+), 59 deletions(-)
create mode 100644 Subsurface/Content/Sounds/Water/Splash0.ogg
create mode 100644 Subsurface/Content/Sounds/Water/Splash1.ogg
create mode 100644 Subsurface/Content/Sounds/Water/Splash2.ogg
create mode 100644 Subsurface/Content/Sounds/Water/Splash3.ogg
create mode 100644 Subsurface/Content/Sounds/Water/Splash4.ogg
create mode 100644 Subsurface/Content/Sounds/Water/Splash5.ogg
create mode 100644 Subsurface/Content/Sounds/Water/Splash6.ogg
create mode 100644 Subsurface/Content/Sounds/Water/Splash7.ogg
create mode 100644 Subsurface/Content/Sounds/Water/Splash8.ogg
create mode 100644 Subsurface/Content/Sounds/Water/Splash9.ogg
create mode 100644 Subsurface/Content/Sounds/Water/splashLoop.ogg
diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index b4383195e..abdbe0bb7 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -1177,6 +1177,39 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
diff --git a/Subsurface/Content/Characters/Moloch/moloch.xml b/Subsurface/Content/Characters/Moloch/moloch.xml
index a1bcb33b2..17f78f8f3 100644
--- a/Subsurface/Content/Characters/Moloch/moloch.xml
+++ b/Subsurface/Content/Characters/Moloch/moloch.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/Subsurface/Content/Items/Button/button.xml b/Subsurface/Content/Items/Button/button.xml
index 3971265a6..0f4a2f65b 100644
--- a/Subsurface/Content/Items/Button/button.xml
+++ b/Subsurface/Content/Items/Button/button.xml
@@ -25,7 +25,7 @@
-
diff --git a/Subsurface/Content/Items/Electricity/signalitems.xml b/Subsurface/Content/Items/Electricity/signalitems.xml
index 6a828cdfe..f07443f88 100644
--- a/Subsurface/Content/Items/Electricity/signalitems.xml
+++ b/Subsurface/Content/Items/Electricity/signalitems.xml
@@ -123,7 +123,7 @@
-
@@ -158,7 +158,7 @@
-
@@ -192,7 +192,7 @@
-
@@ -226,7 +226,8 @@