diff --git a/Subsurface/Content/Items/Weapons/depthcharge.xml b/Subsurface/Content/Items/Weapons/depthcharge.xml
index 7e9e32f6b..6e1579ea6 100644
--- a/Subsurface/Content/Items/Weapons/depthcharge.xml
+++ b/Subsurface/Content/Items/Weapons/depthcharge.xml
@@ -12,16 +12,10 @@
 
     <Turret canbeselected = "true" linkable="true" barrelpos="23, 76"
             rotationlimits="90,90"
-            powerconsumption="0.0">
-      <StatusEffect type="OnUse" target="This" sound="Content/Items/Weapons/railgun.ogg">
-        <Explosion range="1000.0" structuredamage="0" force="0.01" camerashake="10.0"/>
-      </StatusEffect>
-    </Turret>
+            powerconsumption="0.0"/>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
       <requireditem name="Screwdriver,Wire" type="Equipped"/>
-      <input name="power_in"/>
-      <input name="position_in"/>
       <input name="trigger_in"/>
     </ConnectionPanel>
   </Item>
diff --git a/Subsurface/Data/ContentPackages/Vanilla 0.3.xml b/Subsurface/Data/ContentPackages/Vanilla 0.3.xml
index 01edf30c6..ab80e3e5d 100644
--- a/Subsurface/Data/ContentPackages/Vanilla 0.3.xml	
+++ b/Subsurface/Data/ContentPackages/Vanilla 0.3.xml	
@@ -26,6 +26,7 @@
   <Item file="Content/Items/Pump/pump.xml" />
   <Item file="Content/Items/Reactor/reactor.xml" />
   <Item file="Content/Items/Tools/tools.xml" />
+  <Item file="Content/Items/Weapons/depthcharge.xml" />
   <Item file="Content/Items/Weapons/explosives.xml" />
   <Item file="Content/Items/Weapons/railgun.xml" />
   <Item file="Content/Items/Weapons/weapons.xml" />
diff --git a/Subsurface/Source/Items/Item.cs b/Subsurface/Source/Items/Item.cs
index 4058192c4..48dc671ac 100644
--- a/Subsurface/Source/Items/Item.cs
+++ b/Subsurface/Source/Items/Item.cs
@@ -503,20 +503,30 @@ namespace Barotrauma
         
         public virtual Hull FindHull()
         {
-            if (parentInventory != null && (parentInventory.Owner as Character) != null)
+            if (parentInventory != null && parentInventory.Owner != null)
             {
-                CurrentHull = (parentInventory.Owner as Character).AnimController.CurrentHull;
-                body.Submarine = (parentInventory.Owner as Character).Submarine;
+                if (parentInventory.Owner is Character)
+                {
+                    CurrentHull = (parentInventory.Owner as Character).AnimController.CurrentHull;
+                }
+                else if (parentInventory.Owner is Item)
+                {
+                    CurrentHull = (parentInventory.Owner as Item).CurrentHull;
+                }
+
+                Submarine = parentInventory.Owner.Submarine;
+                if (body != null) body.Submarine = Submarine;
+
                 return CurrentHull;
             }
 
             CurrentHull = Hull.FindHull(WorldPosition, CurrentHull);
-
-            if (body!=null)
+            if (body != null)
             {
                 Submarine = CurrentHull == null ? null : Submarine.Loaded;
                 body.Submarine = Submarine;
             }
+
             return CurrentHull;
         }
 
diff --git a/Subsurface/Submarines/Aegir Mark II.sub b/Subsurface/Submarines/Aegir Mark II.sub
index 5af3d90a0..66c76ca06 100644
Binary files a/Subsurface/Submarines/Aegir Mark II.sub and b/Subsurface/Submarines/Aegir Mark II.sub differ
diff --git a/Subsurface/Submarines/Nehalennia.sub b/Subsurface/Submarines/Nehalennia.sub
index 9ee09eff9..b54cf65a9 100644
Binary files a/Subsurface/Submarines/Nehalennia.sub and b/Subsurface/Submarines/Nehalennia.sub differ
diff --git a/Subsurface/Submarines/Vellamo.sub b/Subsurface/Submarines/Vellamo.sub
index 81e7cd6c0..23e523863 100644
Binary files a/Subsurface/Submarines/Vellamo.sub and b/Subsurface/Submarines/Vellamo.sub differ