From 31bef06fd8b634f72fc8ef3d2a49da55fd068629 Mon Sep 17 00:00:00 2001
From: Alex Noir <Varsash@Gmail.com>
Date: Thu, 28 Dec 2017 19:11:46 +0300
Subject: [PATCH] Just noticed a new, strange bug happening:
 https://puu.sh/yPuai/eca2a059e2.webm Problem is, this should've been
 happening before even regardless of my changes. So why did it only start
 happening now? That'll have to be looked into. The reason why it should be
 happening in theory is that in character's UpdateOxygen method, it takes hull
 oxygen and OxygenAvailable. If OxygenAvailable was 0, it'd take the hull,
 which would likely be 100. If OxygenAvailable was -100, it would take the
 hull, which would make OxygenAvaialbe 0. However, it seems like something
 happened and instead of setting the property it now decreases it, and I don't
 know why? In theory it should SET OxygenAvailable to -100 but it seems like
 its performing a substraction now.

Adds tags to all duration/delay status effects
Chloromydride buffed slightly to counteract crit damage as well so it truly stabilizes you
Sufforin now affects your available oxygen too by setting it to -10000 to prevent diving suits/oxygen masks/etc. counteracting it.
---
 .../Content/Items/Diving/divinggear.xml       |  4 +-
 .../Content/Items/Fabricators/fabricators.xml |  4 ++
 .../Content/Items/Medical/medical.xml         | 52 ++++++++++---------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
index 05256665b..4ba0c960a 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="-100.0" Oxygen="-20.0" Condition="-0.5">
+      <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="-200.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="-100.0"/>
+      <StatusEffect type="OnWearing" target="Character" OxygenAvailable="-200.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/Content/Items/Fabricators/fabricators.xml b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
index 33bf59412..a6fcd9996 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
@@ -161,6 +161,10 @@
         <RequiredSkill name="Medical" level="50"/>
       </fabricableitem>
 
+      <fabricableitem name="Chloromydride" requireditems="Stabilozine, Erythrozine, Chloral Hydrate" requiredtime="20">
+        <RequiredSkill name="Medical" level="50"/>
+      </fabricableitem>
+
       <fabricableitem name="Flash Powder" requireditems="Aluminium, Potassium" requiredtime="25">
         <RequiredSkill name="Medical" level="40"/>
       </fabricableitem>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
index e9893a7e5..8e1510ba5 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
@@ -74,7 +74,7 @@
     <Body width="8" height="16" density="40"/>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" Health="-2" duration="10">
+      <StatusEffect tags="poison,iron" type="OnUse" target="Character" Health="-2" duration="10">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -94,12 +94,12 @@
     <Body width="8" height="17" density="20"/>
     
     <ItemComponent>
-      <StatusEffect type="OnUse" target="Character" Health="0.1" duration="20"/>
+      <StatusEffect tags="medical" type="OnUse" target="Character" Health="0.1" duration="20"/>
       <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
     </ItemComponent>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" Health="0.3" Oxygen="0.3" duration="10">
+      <StatusEffect tags="medical" type="OnUse" target="Character" Health="0.3" Oxygen="0.3" duration="10">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -117,7 +117,7 @@
     <Body width="8" height="17" density="10"/>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" Health="-0.1" duration="20.0">
+      <StatusEffect tags="poison,chlorine" type="OnUse" target="Character" Health="-0.1" duration="20.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -133,7 +133,7 @@
 
     <ItemComponent>
       <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
-      <StatusEffect type="OnUse" target="Character" SpeedMultiplier="0.8" setvalue="true" duration="20.0"/>      
+      <StatusEffect tags="drunk" type="OnUse" target="Character" SpeedMultiplier="0.8" setvalue="true" duration="20.0"/>      
     </ItemComponent>
 
     <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
@@ -141,7 +141,7 @@
     <Body width="8" height="7" density="10"/>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" SpeedMultiplier="0.8" setvalue="true" duration="20.0">
+      <StatusEffect tags="drunk" type="OnUse" target="Character" SpeedMultiplier="0.8" setvalue="true" duration="20.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -209,9 +209,9 @@
   <Item
      name="Chloromydride"
      category="Material"
-     spritecolor="0.7,0.9,1,1.0"
+     spritecolor="0.7,0.9,1.0,1.0"
      Tags="smallitem,chem,medical"     
-     description="A strong synaptic stimulant and cardiostimulant which is used as a preventative measure against critical condition. Should be injected once every 30 seconds."
+     description="A strong synaptic stimulant and cardiostimulant which is used as a preventative measure against critical condition. Should only be injected once every 30 seconds."
      price="50">
 
     <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6" />
@@ -219,10 +219,10 @@
     <Body width="8" height="16" density="20"/>
     
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" bleeding="-0.2" Oxygen="0.5" duration="30" stackable="false" checkconditionalalways="true">
-        <!-- Rapidly removes bleeding and stabilizes oxygen intake so they're "frozen" in a stasis. Doesn't prevent poisons.
-            EXTREMELY useful to follow up with a CPR while keeping them alive long enough. -->
-        <Conditional Health="lte 0.0"/>
+      <StatusEffect tags="medical" type="OnUse" target="Character" health="1.0" bleeding="-0.2" Oxygen="0.6" duration="30" stackable="false" checkconditionalalways="true">
+        <!-- Rapidly removes bleeding and stabilizes oxygen intake while also counteracting crit damage so they won't die. Doesn't prevent poisons.
+            EXTREMELY useful to follow up with CPR, especially if they were bleeding before. -->
+        <Conditional Health="lt 0.1"/>
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -241,7 +241,7 @@
     <Body width="8" height="16" density="20"/>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" Health="-0.3" Oxygen="2.0" duration="10">
+      <StatusEffect tags="medical" type="OnUse" target="Character" Health="-0.3" Oxygen="2.0" duration="10">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -261,12 +261,12 @@
     <Body width="8" height="16" density="20"/>
 
     <ItemComponent>
-      <StatusEffect type="OnUse" target="Character" Bleeding="-0.1" duration="10.0"/>
+      <StatusEffect tags="medical" type="OnUse" target="Character" Bleeding="-0.1" duration="10.0"/>
       <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
     </ItemComponent>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" Health="0.3" Bleeding="-0.2" duration="5.0">
+      <StatusEffect tags="medical" type="OnUse" target="Character" Health="0.3" Bleeding="-0.2" duration="5.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -288,11 +288,11 @@
     
     <ItemComponent>
       <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
-      <StatusEffect type="OnUse" target="Character, This" Health="-0.5" duration="10"/>      
+      <StatusEffect tags="medical" type="OnUse" target="Character, This" Health="-0.5" duration="10"/>      
     </ItemComponent>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" Health="3.0" duration="5.0">
+      <StatusEffect tags="medical" type="OnUse" target="Character" Health="3.0" duration="5.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -312,7 +312,7 @@
     <Body width="8" height="16" density="20"/>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" Health="0.5" Oxygen="0.5" Bleeding="-0.025" duration="60.0">
+      <StatusEffect tags="medical" type="OnUse" target="Character" Health="0.5" Oxygen="0.5" Bleeding="-0.025" duration="60.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -331,7 +331,7 @@
     <Body width="8" height="16" density="15"/>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" SpeedMultiplier="1.5" setvalue="true" duration="60.0">
+      <StatusEffect tags="medical" type="OnUse" target="Character" SpeedMultiplier="1.5" setvalue="true" duration="60.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -354,12 +354,12 @@
         <Conditional HuskInfectionState="lt 1.0"/>
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-      <StatusEffect type="OnUse" target="Character" Health="-3.0" duration="10.0">
+      <StatusEffect tags="poison,calyxanide" type="OnUse" target="Character" Health="-3.0" duration="10.0">
         <!-- Injecting a still-conscious Husk will only piss it off and kill the "conscious" faster -->
         <Conditional HuskInfectionState="eq 1.0"/>
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-      <StatusEffect type="OnUse" target="Character" Health="-5.0" duration="10.0">
+      <StatusEffect tags="poison,calyxanide" type="OnUse" target="Character" Health="-5.0" duration="10.0">
         <Conditional SpeciesName="husk"/>
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
@@ -399,7 +399,7 @@
     <Body width="8" height="16" density="20"/>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" Health="-0.5" Oxygen="10.0" duration="60">
+      <StatusEffect tags="medical" type="OnUse" target="Character" Health="-0.5" Oxygen="10.0" duration="60">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
       <StatusEffect type="OnImpact" target="This" Condition="0.0" setvalue="true">
@@ -462,7 +462,7 @@
     <Body width="8" height="17" density="10"/>
 
     <Throwable canBeCombined="true" slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
-      <StatusEffect type="OnUse" target="Character" Health="-1.0" duration="30.0">
+      <StatusEffect tags="poison,acid" type="OnUse" target="Character" Health="-1.0" duration="30.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>
@@ -559,7 +559,8 @@
     spritecolor="1.0,0.3,0.3,1.0"
     Tags="smallitem,chem,medical"   
     description="A devious poison with a delayed effect.">
-    <!-- Can only be crafted. Direct counter to Sufforin is Liquid Oxygenite, though it's not strictly an antidote. -->
+    <!-- Can only be crafted. Direct counter to Sufforin is Liquid Oxygenite, though it's not strictly an antidote.
+        Two injections to choke slightly faster than welding fuel. -->
     <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
 
     <Body width="8" height="16" density="10"/>
@@ -568,7 +569,8 @@
       <StatusEffect type="OnUse" target="Character" Health="-5.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-      <StatusEffect tags="poison,sufforin" type="OnUse" target="Character" Oxygen="-15.0" Health="-0.5" duration="60.0" delay="20.0"> 
+      <!-- Did You Know? If OxygenAvailable is too low, character will take -5 Oxygen loss per tick, otherwise they restore +10 oxygen. -->
+      <StatusEffect tags="poison,sufforin" type="OnUse" target="Character" Oxygen="-5.0" OxygenAvailable="-10000.0" Health="-0.5" duration="60.0" delay="20.0"> 
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
     </Throwable>