From ed98a6bc0b49af0a3d72a74770be668852f0d515 Mon Sep 17 00:00:00 2001
From: Alex Noir <Varsash@Gmail.com>
Date: Thu, 28 Dec 2017 19:28:45 +0300
Subject: [PATCH] well jeez who'da thunk it's my sorry ass forgetting to remove
 the second updateoxygen Reverted OxygenAvailable values for diving gear +
 oxygen mask back to -100 Keeping sufforin OxygenAvailable at -10000 tho, that
 seems like the way to completely cut off any and all oxygen suppliers from
 acting

---
 .../BarotraumaShared/Content/Items/Diving/divinggear.xml      | 4 ++--
 Barotrauma/BarotraumaShared/Source/Characters/Character.cs    | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
index 4ba0c960a..05256665b 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
@@ -45,7 +45,7 @@
       <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" Condition="-0.5">
         <RequiredItem type="Contained" name="Oxygen Tank"/>
       </StatusEffect>
-      <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="-200.0" Oxygen="-20.0" Condition="-0.5">
+      <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">
@@ -110,7 +110,7 @@
       <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1">
         <RequiredItem type="Contained" name="Oxygenite Shard"/>
       </StatusEffect>
-      <StatusEffect type="OnWearing" target="Character" OxygenAvailable="-200.0"/>
+      <StatusEffect type="OnWearing" target="Character" OxygenAvailable="-100.0"/>
 
       <damagemodifier damagetype="Burn" armorsector="0.0,360.0" damagemultiplier="0.6"/>
       <damagemodifier damagetype="Blunt" armorsector="0.0,360.0" damagemultiplier="0.8" bleedingmultiplier="0.3" damagesound="LimbArmor" deflectprojectiles="true"/>
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
index 0e7fff190..9c9f3bf1f 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
@@ -1601,8 +1601,6 @@ namespace Barotrauma
 
             lowPassMultiplier = MathHelper.Lerp(lowPassMultiplier, 1.0f, 0.1f);
 
-            if (needsAir) UpdateOxygen(deltaTime);
-
             if (DoesBleed)
             {
                 Health -= bleeding * deltaTime;