diff --git a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
index 0bb9fdb4c..4c23d5fe4 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
@@ -5,16 +5,32 @@
     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 ="200" damage="20" structuredamage="20" stun="5" force="10" decal="explosion" decalsize="0.4"/>
+		<Fire size="50"/>
+	</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]">