diff --git a/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml b/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml
index b9dc385d5..49c989471 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml
@@ -195,6 +195,8 @@
     <ItemContainer capacity="1" hideitems="false" itempos="9,-15">
       <Containable name="Welding Fuel Tank"/>
       <Containable name="Oxygen Tank"/>
+      <Containable name="Oxygenite Tank"/>
+      <Containable name="Oxygenite Shard"/>
     </ItemContainer>
   </Item>
 
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
index ccff82db3..4d1b6b7e9 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
@@ -22,7 +22,32 @@
       </StatusEffect>
     </Pickable>
   </Item>
-  
+
+  <Item
+  name="Oxygenite Tank"
+  category="Equipment,Misc"
+  Tags="meditem,oxygensource"
+  description="A Tank containing liquid Oxygenite.">
+
+    <Deconstruct time="10">
+      <Item name="Steel Bar"/>
+      <Item name="Liquid Oxygenite" mincondition="0.1"/>
+      <Item name="Liquid Oxygenite" mincondition="0.5"/>
+      <Item name="Liquid Oxygenite" mincondition="0.9"/>
+    </Deconstruct>
+
+    <Sprite texture ="Content/Items/Tools/tools.png" sourcerect="39,31,12,33" depth="0.55"/>
+
+    <Body width="12" height="33" density="9.9"/>
+
+    <Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
+      <StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true">
+        <sound file="Content/Items/Reactor/explosion.ogg"/>
+        <Explosion range="250.0" structuredamage="10" damage="20" stun="5" force="3.0"/>
+      </StatusEffect>
+    </Pickable>
+  </Item> 
+ 
   <Item
     name="Diving Mask"
     category="Equipment"
@@ -48,15 +73,19 @@
       <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="-100.0" Oxygen="-20.0" Condition="-0.5">
         <RequiredItem type="Contained" name="Welding Fuel Tank"/>
       </StatusEffect>
-      <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1">
+      <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" SpeedMultiplier="1.2" Condition="-0.3">
         <RequiredItem type="Contained" name="Oxygenite Shard"/>
       </StatusEffect>
+      <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1">
+        <RequiredItem type="Contained" name="Oxygenite Tank"/>
+      </StatusEffect>
     </Wearable>
 
     <ItemContainer capacity="1" hideitems="true">
       <Containable name="Oxygen Tank"/>
       <Containable name="Welding Fuel Tank"/>
       <Containable name="Oxygenite Shard"/>
+      <Containable name="Oxygenite Tank"/>
     </ItemContainer>  
   </Item>
 
@@ -114,9 +143,12 @@
       <StatusEffect type="OnWearing" target="Contained,Character" Oxygen="-20.0" Condition="-0.5">
         <RequiredItem type="Contained" name="Welding Fuel Tank"/>
       </StatusEffect>
-      <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1">
+      <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" SpeedMultiplier="1.2" Condition="-0.3">
         <RequiredItem type="Contained" name="Oxygenite Shard"/>
       </StatusEffect>
+      <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1">
+        <RequiredItem type="Contained" name="Oxygenite Tank"/>
+      </StatusEffect>
       <StatusEffect type="OnWearing" target="Character" OxygenAvailable="-100.0"/>
 
       <damagemodifier damagetype="Burn" armorsector="0.0,360.0" damagemultiplier="0.6"/>
@@ -128,6 +160,7 @@
       <Containable name="Oxygen Tank"/>
       <Containable name="Welding Fuel Tank"/>
       <Containable name="Oxygenite Shard"/>
+      <Containable name="Oxygenite Tank"/>
     </ItemContainer>
   </Item>
 
@@ -166,4 +199,4 @@
       <Containable name="Fulgurium Battery Cell"/>
     </ItemContainer>
   </Item>
-</Items>
\ No newline at end of file
+</Items>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
index 305c61450..3c9e13d69 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
@@ -109,6 +109,7 @@
       </fabricableitem>
 
       <fabricableitem name="Oxygen Tank" requireditems="Steel Bar" outcondition="0.0"/>
+      <fabricableitem name="Oxygenite Tank" requireditems="Steel Bar, Liquid Oxygenite, Liquid Oxygenite, Liquid Oxygenite" outcondition="100.0" requiredtime="5" />
       <fabricableitem name="Welding Fuel Tank" requireditems="Steel Bar" outcondition="0.0"/>
     </Fabricator>
 		
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
index 7450d476a..a3e8dc468 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
@@ -60,6 +60,7 @@
     <ItemContainer capacity="1" hideitems="false" itempos="-17,-21">
       <Containable name="Welding Fuel Tank"/>
       <Containable name="Oxygen Tank"/>
+      <Containable name="Oxygenite Tank"/>
     </ItemContainer>
   </Item>
 
@@ -85,8 +86,9 @@
               aimpos="50,0" handle1="-12,4"/>
 
     <RepairTool structurefixamount="-2.0" limbfixamount="-0.5" range="100" barrelpos="28,8">
-      <RequiredItems name="Oxygen Tank" type="Contained" msg="Oxygen tank required"/>
+      <RequiredItems name="Oxygen Tank,Oxygenite Tank" type="Contained" msg="Oxygen tank required"/>
       <StatusEffect type="OnUse" target="Contained" targetnames="Oxygen Tank" Condition="-1.0"/>
+	    <StatusEffect type="OnUse" target="Contained" targetnames="Oxygenite Tank" Condition="-0.5"/>
       <StatusEffect type="OnUse" target="UseTarget" targetnames="Door,Windowed Door,Hatch,Duct Block,Alien Door,Alien Hatch" Stuck="-20.0" Condition="-3.0"/>
 
       <ParticleEmitter particle="plasma" particlespersecond="50"/>
@@ -112,6 +114,7 @@
     <ItemContainer capacity="1" hideitems="false" itempos="9,-15">
       <Containable name="Welding Fuel Tank"/>
       <Containable name="Oxygen Tank"/>
+      <Containable name="Oxygenite Tank"/>
     </ItemContainer>
   </Item>
 
@@ -331,4 +334,4 @@
     </LightComponent>
   </Item>
 
-</Items>
\ No newline at end of file
+</Items>
