From 01c3d20a0c960884b0cdf287057cb1d597e97aa0 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon, 16 Jul 2018 14:58:38 +0300
Subject: [PATCH] Fire can only explode oxygen tanks that are >25% full
 (otherwise the condition of the tank just drops to 0). Prevents infinite
 explosions when an oxygen generator is on fire with oxygen tanks inside.
 Closes #470

+ Made oxygen generators fill oxygen tanks faster.
---
 Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml | 2 ++
 .../Content/Items/OxygenGenerator/oxygengenerator.xml           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
index 59d9ee794..5b08da1d5 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
@@ -17,9 +17,11 @@
 
     <Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
       <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>
   </Item>
 
diff --git a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
index 5a0e92b18..0bb9fdb4c 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
@@ -7,7 +7,7 @@
     <Sprite texture="oxygengenerator.png" depth="0.8" sourcerect="0,0,128,128"/>
 
     <OxygenGenerator powerconsumption="1000.0" minvoltage="0.5" canbeselected = "true">
-      <StatusEffect type="OnActive" target="Contained" targetnames="Oxygen Tank" Condition="0.5"/>
+      <StatusEffect type="OnActive" target="Contained" targetnames="Oxygen Tank" Condition="2.0"/>
       <sound file="Content/Items/OxygenGenerator/oxygengenerator.ogg" type="OnActive" range="1000.0" volume="CurrFlow" volumemultiplier="0.001f" loop="true"/>
     </OxygenGenerator>