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/Source/Characters/StatusEffect.cs

@@ -1,4 +1,5 @@
-using Microsoft.Xna.Framework;
+using Barotrauma.Particles;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -36,6 +37,8 @@ namespace Barotrauma
 
         private Explosion explosion;
 
+        private List<ParticleEmitterPrefab> particleEmitters;
+
         public readonly float FireSize;
 
         private Sound sound;
@@ -68,6 +71,7 @@ namespace Barotrauma
         protected StatusEffect(XElement element)
         {
             requiredItems = new List<RelatedItem>();
+            particleEmitters = new List<ParticleEmitterPrefab>();
 
             IEnumerable<XAttribute> attributes = element.Attributes();            
             List<XAttribute> propertyAttributes = new List<XAttribute>();
@@ -156,6 +160,9 @@ namespace Barotrauma
                     case "useitem":
                         useItem = true;
                         break;
+                    case "particleemitter":
+                        particleEmitters.Add(new ParticleEmitterPrefab(subElement));
+                        break;
                     case "requireditem":
                     case "requireditems":
                         RelatedItem newRequiredItem = RelatedItem.Load(subElement);
@@ -253,12 +260,28 @@ namespace Barotrauma
 
             if (explosion != null) explosion.Explode(entity.WorldPosition);
 
+            
+            Hull hull = null;
+            if (entity is Character) 
+            {
+                hull = ((Character)entity).AnimController.CurrentHull;
+            }
+            else if (entity is Item)
+            {
+                hull = ((Item)entity).CurrentHull;
+            }
+
             if (FireSize > 0.0f)
             {
-                var fire = new FireSource(entity.WorldPosition);
+                var fire = new FireSource(entity.WorldPosition, hull);
 
                 fire.Size = new Vector2(FireSize, fire.Size.Y);
             }   
+
+            foreach (ParticleEmitterPrefab emitter in particleEmitters)
+            {
+                emitter.Emit(entity.WorldPosition, hull);
+            }
         }
 
         private IEnumerable<object> ApplyToPropertyOverDuration(float duration, ObjectProperty property, object value)

Subsurface/Source/Items/Components/Holdable/Holdable.cs

@@ -241,22 +241,16 @@ namespace Barotrauma.Items.Components
 
         public override void Update(float deltaTime, Camera cam)
         {
-            if (item.body==null || !item.body.Enabled) return;
+            if (item.body == null || !item.body.Enabled) return;
             if (!picker.HasSelectedItem(item)) IsActive = false;
 
             ApplyStatusEffects(ActionType.OnActive, deltaTime, picker);
 
             if (item.body.Dir != picker.AnimController.Dir) Flip(item);
 
-            AnimController ac = picker.AnimController;
-
             item.Submarine = picker.Submarine;
 
-            //if (picker.SelectedConstruction != null && picker.SelectedConstruction.GetComponent<Controller>() != null) return;
-
-            //item.sprite.Depth = picker.AnimController.GetLimb(LimbType.RightHand).sprite.Depth + 0.01f;            
-
-            ac.HoldItem(deltaTime, item, handlePos, holdPos, aimPos, picker.IsKeyDown(InputType.Aim), holdAngle);
+            picker.AnimController.HoldItem(deltaTime, item, handlePos, holdPos, aimPos, picker.IsKeyDown(InputType.Aim), holdAngle);
         }
 
         protected void Flip(Item item)

Subsurface/Source/Items/Components/Holdable/Throwable.cs

@@ -82,6 +82,8 @@ namespace Barotrauma.Items.Components
 
             AnimController ac = picker.AnimController;
 
+            item.Submarine = picker.Submarine;
+
             if (!throwing)
             {
                 if (picker.IsKeyDown(InputType.Aim))

Subsurface/Source/Particles/ParticleEmitter.cs

@@ -35,7 +35,7 @@ namespace Barotrauma.Particles
             }
 
             AngleMin = MathHelper.ToRadians(AngleMin);
-            AngleMin = MathHelper.ToRadians(AngleMax);
+            AngleMax = MathHelper.ToRadians(AngleMax);
 
             if (element.Attribute("velocity") == null)
             {