diff --git a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
index 8f03bf746..7df40beff 100644
--- a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
+++ b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
@@ -1000,6 +1000,9 @@
     <None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\railgun.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\revolver.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="$(MSBuildThisFileDirectory)Content\Items\Weapons\smack.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Engine/engine.xml b/Barotrauma/BarotraumaShared/Content/Items/Engine/engine.xml
index 1f774a460..a0fcf1c60 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Engine/engine.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Engine/engine.xml
@@ -5,7 +5,6 @@
     name="Engine"
     linkable="true"
     category="Machine"
-    pickthroughwalls="true"
     >
 
     <Sprite texture ="engine.png" depth="0.8" sourcerect="0,0,373,113" canflipx="true"/>
@@ -35,7 +34,6 @@
     name="Shuttle Engine"
     linkable="true"
     category="Machine"
-    pickthroughwalls="true"
     >
 
     <Sprite texture ="engine.png" depth="0.8" sourcerect="0,115,224,73" canflipx="true"/>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/revolver.ogg b/Barotrauma/BarotraumaShared/Content/Items/Weapons/revolver.ogg
new file mode 100644
index 000000000..d78389ea9
Binary files /dev/null and b/Barotrauma/BarotraumaShared/Content/Items/Weapons/revolver.ogg differ
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png
index de58b23cc..dd96c6070 100644
Binary files a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png and b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png differ
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
index b2a354aae..2f6b71c45 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
@@ -4,8 +4,7 @@
   <Item
     name="Spear"
     category="Equipment"
-    
-    pickthroughwalls="true"
+    interactthroughwalls="true"
     price="50">
 
     <Deconstruct time="5">
@@ -18,7 +17,7 @@
 
     <Pickable slots="Any"/>
     <Projectile launchimpulse="20.0" doesstick="true">
-      <Attack damage="20" bleedingdamage="2" structuredamage="50" damagetype="Blunt"/>
+      <Attack damage="20" bleedingdamage="2" structuredamage="50" damagetype="Blunt" stun="0.2" targetforce="50"/>
     </Projectile>
   </Item>
   
@@ -42,9 +41,12 @@
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true"
               holdpos="35,-10" aimpos="35,-10" handle1="-15,-6" handle2="26,7"/>
     
-    <RangedWeapon barrelpos="49,10">
+    <RangedWeapon barrelpos="49,10" spread="1" unskilledspread="10">
       <Sound file="harpoon1.ogg" type="OnUse"/>
       <Sound file="harpoon2.ogg" type="OnUse"/>
+      <StatusEffect type="OnUse">
+        <Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" camerashake="5.0"/>
+      </StatusEffect>
       <RequiredItems name="Spear" type="Contained" msg="Spear required to shoot"/>
       <RequiredSkill name="Weapons" level="30"/>
     </RangedWeapon>
@@ -54,6 +56,55 @@
     </ItemContainer>
   </Item>
 
+  <Item
+    name="Revolver Round"
+    category="Equipment"
+    interactthroughwalls="true"
+    price="10">
+
+    <Sprite texture="weapons.png" sourcerect="52,99,8,3" depth="0.55"/>
+
+    <Body width="8" height="3" density="40"/>
+
+    <Pickable slots="Any"/>
+    <Projectile hitscan="true" doesstick="false" removeonhit="true" >
+      <Attack damage="40" bleedingdamage="3" structuredamage="100" damagetype="Blunt" stun="0.5" targetforce="50"/>
+    </Projectile>
+  </Item>
+  
+  <Item
+    name="Revolver"
+    category="Equipment"    
+    price="700"
+    tags="weapon">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="Aluminium"/>
+      <Item name="Polycarbonate Bar"/>
+    </Deconstruct>
+
+    <Sprite texture="weapons.png" sourcerect="26,97,25,19" depth="0.55"/>
+
+    <Body width="25" height="15" density="50"/>
+
+    <Holdable slots="Any,RightHand,LeftHand" controlpose="true"
+              aimpos="90,10" handle1="-11,-7"/>
+
+    <RangedWeapon barrelpos="14,6" spread="0" unskilledspread="2">
+      <Sound file="revolver.ogg" type="OnUse" range="3000"/>
+      <StatusEffect type="OnUse">
+        <Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" sparks="false" camerashake="5.0"/>
+      </StatusEffect>
+      <RequiredItems name="Revolver Round" type="Contained" msg="Out of ammo"/>
+      <RequiredSkill name="Weapons" level="40"/>
+    </RangedWeapon>
+
+    <ItemContainer capacity="4" hideitems="true">
+      <Containable name="Revolver Round"/>
+    </ItemContainer>
+  </Item>
+
   <Item
     name="Stun Grenade"
     category="Equipment"
diff --git a/Barotrauma/BarotraumaShared/Content/Jobs.xml b/Barotrauma/BarotraumaShared/Content/Jobs.xml
index 0b98e6c24..60b174dcb 100644
--- a/Barotrauma/BarotraumaShared/Content/Jobs.xml
+++ b/Barotrauma/BarotraumaShared/Content/Jobs.xml
@@ -14,7 +14,11 @@
       <Item name="Captain's Trousers" equip="true"/>
       <Item name="Headset" equip="true">
         <Item name="Battery Cell"/>
-      </Item>        
+      </Item>
+      <Item name="Revolver" equip="false">
+        <Item name="Revolver Round"/>
+        <Item name="Revolver Round"/>
+      </Item>
     </Items>
   </Job>
   
