diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
index 5b08da1d5..c27274390 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
@@ -15,14 +15,14 @@
 
     <Body width="12" height="33" density="5"/>
 
-    <Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
+    <Holdable slots="Any,RightHand,LeftHand" holdpos="30,-15" handle1="0,5" handle2="0,-5">
       <StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true">
         <Conditional Condition="gt 25"/>
         <sound file="Content/Items/Reactor/explosion.ogg"/>
         <Explosion range="250.0" structuredamage="10" damage="20" stun="5" force="3.0"/>
       </StatusEffect>
       <StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true"/>
-    </Pickable>
+    </Holdable>
   </Item>
 
   <Item
@@ -42,12 +42,13 @@
 
     <Body width="12" height="33" density="9.9"/>
 
-    <Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
+    <Holdable slots="Any,RightHand,LeftHand" holdpos="30,-15" handle1="0,5" handle2="0,-5">
       <StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true">
+        <Conditional Condition="gt 20"/>
         <sound file="Content/Items/Reactor/explosion.ogg"/>
-        <Explosion range="250.0" structuredamage="10" damage="20" stun="5" force="3.0"/>
+        <Explosion range="280.0" structuredamage="20" damage="30" stun="8" force="3.0"/>
       </StatusEffect>
-    </Pickable>
+    </Holdable>
   </Item> 
  
   <Item
diff --git a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
index 0bb9fdb4c..a3fdf04d8 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
@@ -5,16 +5,31 @@
     linkable="true">
     
     <Sprite texture="oxygengenerator.png" depth="0.8" sourcerect="0,0,128,128"/>
+    
+    <fixrequirement name="Mechanical repairs">
+      <skill name="Construction" level="30"/>
+      <item name="Welding Tool"/>
+      <item name="Wrench"/>
+    </fixrequirement>
 
     <OxygenGenerator powerconsumption="1000.0" minvoltage="0.5" canbeselected = "true">
+
+      <StatusEffect type="OnFire" target="This" Condition="-0.5"/>
       <StatusEffect type="OnActive" target="Contained" targetnames="Oxygen Tank" Condition="2.0"/>
+      <StatusEffect type="OnActive" target="Contained" targetnames="Oxygenite Tank" Condition="0.0"/>
       <sound file="Content/Items/OxygenGenerator/oxygengenerator.ogg" type="OnActive" range="1000.0" volume="CurrFlow" volumemultiplier="0.001f" loop="true"/>
+    
+	<StatusEffect type="OnBroken" target="This" disabledeltatime="true">
+		<sound file="Content/Items/Reactor/explosion.ogg"/>
+		<Explosion range="50" damage="0" stun="0" force="3.0" flames="false" shockwave="false" sparks="true"/>
+	</StatusEffect>
     </OxygenGenerator>
   
     <trigger/>
 
     <ItemContainer capacity="5" canbeselected = "true" msg="Insert oxygen tank to refill it">
       <Containable name="Oxygen Tank"/>
+      <Containable name="Oxygenite Tank"/>
     </ItemContainer>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
index 954673d6e..28f6bcfc1 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
@@ -104,7 +104,8 @@
 
       <RequiredSkill name="Construction" level="30"/>
 
-      <StatusEffect type="OnFailure" target="Contained" targetnames="Welding Fuel Tank,Oxygen Tank" Condition="-3.0"/>
+       <StatusEffect type="OnFailure" target="Contained" targetnames="Welding Fuel Tank,Oxygen Tank" Condition="-3.0"/>
+       <StatusEffect type="OnFailure" target="Contained" targetnames="Oxygenite Tank" Condition="-1.5"/>
 
       <LightComponent LightColor="0.8,0.7,1.0,1.0" Flicker="0.5">
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5"/>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png
index 2bd2a36f0..b42d17f9a 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 d9d44e6c9..d3cd69843 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
@@ -120,14 +120,14 @@
       <Item name="Polycarbonate Bar"/>
     </Deconstruct>
 
-    <Sprite texture="weapons.png" sourcerect="26,97,25,19" depth="0.55"/>
-
-    <Body width="25" height="15" density="50"/>
+    <Sprite texture="weapons.png" sourcerect="24,102,37,19" depth="0.55"/>
+  
+    <Body width="37" height="18" density="50"/>
 
     <Holdable slots="Any,RightHand,LeftHand" controlpose="true"
-              aimpos="90,10" handle1="-11,-7"/>
+              aimpos="75,18" handle1="-10,-5"/>
 
-    <RangedWeapon barrelpos="14,6" spread="0" unskilledspread="2">
+    <RangedWeapon barrelpos="37,3" spread="0" unskilledspread="2">
       <Sound file="Content/Items/Weapons/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"/>
@@ -136,7 +136,7 @@
       <RequiredSkill name="Weapons" level="40"/>
     </RangedWeapon>
 
-    <ItemContainer capacity="4" hideitems="true">
+    <ItemContainer capacity="6" hideitems="true">
       <Containable name="Revolver Round"/>
     </ItemContainer>
   </Item>
diff --git a/Barotrauma/BarotraumaShared/Content/Jobs.xml b/Barotrauma/BarotraumaShared/Content/Jobs.xml
index d5e86f074..a0b3caf33 100644
--- a/Barotrauma/BarotraumaShared/Content/Jobs.xml
+++ b/Barotrauma/BarotraumaShared/Content/Jobs.xml
@@ -16,10 +16,11 @@
       <Item name="Headset" equip="true">
         <Item name="Battery Cell"/>
       </Item>
-      <Item name="Revolver" equip="false">
-        <Item name="Revolver Round"/>
-        <Item name="Revolver Round"/>
-      </Item>
+        <Item name="Revolver" equip="false">
+          <Item name="Revolver Round"/>
+          <Item name="Revolver Round"/>
+          <Item name="Revolver Round"/>
+        </Item>
     </Items>
   </Job>
   
