From 65377519612510ff613aeec0d5848654136a1b96 Mon Sep 17 00:00:00 2001
From: Regalis
Date: Wed, 11 May 2016 20:15:42 +0300
Subject: [PATCH] Particle emitters can be assigned to statuseffects, fixed
item.Submarine not being set correctly for throwable items, flare particles +
sounds, nerfed some of the medical items
---
Subsurface/Barotrauma.csproj | 3 ++
.../Content/Items/Fabricators/fabricators.xml | 2 ++
Subsurface/Content/Items/Medical/medical.xml | 4 +--
Subsurface/Content/Items/Tools/flare.ogg | Bin 0 -> 78013 bytes
Subsurface/Content/Items/Tools/tools.xml | 20 +++++++++----
.../Content/Particles/ParticlePrefabs.xml | 15 ++++++++++
Subsurface/Source/Characters/StatusEffect.cs | 27 ++++++++++++++++--
.../Items/Components/Holdable/Holdable.cs | 10 ++-----
.../Items/Components/Holdable/Throwable.cs | 2 ++
.../Source/Particles/ParticleEmitter.cs | 2 +-
10 files changed, 67 insertions(+), 18 deletions(-)
create mode 100644 Subsurface/Content/Items/Tools/flare.ogg
diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index cb3b9d7a5..a5b098ca6 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -1123,6 +1123,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
diff --git a/Subsurface/Content/Items/Fabricators/fabricators.xml b/Subsurface/Content/Items/Fabricators/fabricators.xml
index 271179d1c..08d3cf413 100644
--- a/Subsurface/Content/Items/Fabricators/fabricators.xml
+++ b/Subsurface/Content/Items/Fabricators/fabricators.xml
@@ -53,6 +53,8 @@
+
+
diff --git a/Subsurface/Content/Items/Medical/medical.xml b/Subsurface/Content/Items/Medical/medical.xml
index aacf20bdf..4ad18cc4c 100644
--- a/Subsurface/Content/Items/Medical/medical.xml
+++ b/Subsurface/Content/Items/Medical/medical.xml
@@ -319,7 +319,7 @@
-
+
@@ -375,7 +375,7 @@