Revert "epic Respiration Rework" (#6524)

Resources/Prototypes/Alerts/alerts.yml

@@ -25,16 +25,7 @@
     sprite: /Textures/Interface/Alerts/breathing.rsi
     state: not_enough_oxy
   name: "[color=red]Low Oxygen[/color]"
-  description: "There is [color=red]not enough oxygen[/color] in the air you are breathing. Put on [color=green]internals[/color]."
-
-- type: alert
-  alertType: Toxins
-  category: Toxins
-  icon:
-    sprite: /Textures/Interface/Alerts/breathing.rsi
-    state: too_much_tox
-  name: "[color=red]High Toxin Level[/color]"
-  description: "There are [color=red]too many toxins[/color] in the air you are breathing. Put on [color=green]internals[/color] or get away."
+  description: "There is not [color=red]not enough oxygen[/color] in the air you are breathing. Put on [color=green]internals[/color]."
 
 - type: alert
   alertType: LowPressure

Resources/Prototypes/Atmospherics/gases.yml

@@ -5,7 +5,6 @@
   heatCapacityRatio: 1.4
   molarMass: 32
   color: 2887E8
-  reagent: Oxygen
 
 - type: gas
   id: 1
@@ -14,7 +13,6 @@
   heatCapacityRatio: 1.4
   molarMass: 28
   color: DA1010
-  reagent: Nitrogen
 
 - type: gas
   id: 2
@@ -23,7 +21,6 @@
   heatCapacityRatio: 1.3
   molarMass: 44
   color: 4e4e4e
-  reagent: CarbonDioxide
 
 - type: gas
   id: 3
@@ -34,7 +31,6 @@
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
   gasOverlayState: plasma
   color: FF3300
-  reagent: Plasma
 
 - type: gas
   id: 4
@@ -45,7 +41,6 @@
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
   gasOverlayState: tritium
   color: 13FF4B
-  reagent: Tritium
 
 - type: gas
   id: 5
@@ -56,4 +51,3 @@
   gasOverlaySprite: /Textures/Effects/atmospherics.rsi
   gasOverlayState: water_vapor
   color: bffffd
-  reagent: Water

Resources/Prototypes/Body/Mechanisms/human.yml

@@ -100,19 +100,6 @@
     size: 1
     compatibility: Biological
   - type: Lung
-    validReagentGases:
-    - Oxygen
-    - Plasma
-    - Tritium
-    - CarbonDioxide
-  - type: Metabolizer
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Human ]
-    groups:
-    - id: Gas
-      rateModifier: 100.0
 
 - type: entity
   id: OrganHumanHeart

Resources/Prototypes/Body/Mechanisms/slime.yml

@@ -11,6 +11,7 @@
     - type: Mechanism
       size: 5
       compatibility: Slime
+    - type: Lung
     - type: Brain
     - type: Stomach
       maxVolume: 250

Resources/Prototypes/Body/Parts/animal.yml

@@ -82,19 +82,6 @@
     size: 1
     compatibility: Biological
   - type: Lung
-    validReagentGases:
-    - Oxygen
-    - Plasma
-    - Tritium
-    - CarbonDioxide
-  - type: Metabolizer
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Animal ]
-    groups:
-    - id: Gas
-      rateModifier: 100.0
 
 - type: entity
   id: OrganAnimalStomach

Resources/Prototypes/Chemistry/metabolism_groups.yml

@@ -16,7 +16,3 @@
 
 - type: metabolismGroup
   id: Drink
-
-# Used for gases that have effects on being inhaled
-- type: metabolismGroup
-  id: Gas

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -152,12 +152,17 @@
     normalBodyTemperature: 310.15
     thermalRegulationTemperatureThreshold: 25
   - type: Respirator
+    needsGases:
+      Oxygen: 0.00060763888
+    producesGases:
+      Oxygen: 0.00045572916
+      CarbonDioxide: 0.00015190972
     damage:
       types:
-        Asphyxiation: 3
+        Asphyxiation: 1
     damageRecovery:
       types:
-        Asphyxiation: -1.5
+        Asphyxiation: -1
   - type: Temperature
     heatDamageThreshold: 360
     coldDamageThreshold: 260

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -42,10 +42,10 @@
   - type: Respirator
     damage:
       types:
-        Asphyxiation: 3
+        Asphyxiation: 1
     damageRecovery:
       types:
-        Asphyxiation: -1.5
+        Asphyxiation: -1
   - type: UnarmedCombat
     range: 1.5
     arcwidth: 0

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -11,13 +11,6 @@
     context: "human"
   - type: PlayerMobMover
   - type: PlayerInputMover
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 3
-    damageRecovery:
-      types:
-        Asphyxiation: -1.5
   - type: Alerts
   - type: Actions
     innateActions:

Resources/Prototypes/Entities/Mobs/Species/dwarf.yml

@@ -9,13 +9,6 @@
   - type: Icon
     sprite: Mobs/Species/Slime/parts.rsi
     state: full
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 3
-    damageRecovery:
-      types:
-        Asphyxiation: -1.5
   - type: Sprite
     netsync: false
     noRot: true

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -199,6 +199,18 @@
     shiveringHeatRegulation: 2000
     normalBodyTemperature: 310.15
     thermalRegulationTemperatureThreshold: 25
+  - type: Respirator
+    needsGases:
+      Oxygen: 0.00060763888
+    producesGases:
+      Oxygen: 0.00045572916
+      CarbonDioxide: 0.00015190972
+    damage:
+      types:
+        Asphyxiation: 1
+    damageRecovery:
+      types:
+        Asphyxiation: -1
   - type: Internals
   - type: MobState
     thresholds:

Resources/Prototypes/Entities/Mobs/Species/vox.yml

@@ -83,14 +83,18 @@
   - type: Body
     template: HumanoidTemplate
     preset: VoxPreset
-  # TODO Vox nitrogen
   - type: Respirator
+    needsGases:
+      Nitrogen: 0.00060763888
+    producesGases:
+      Nitrogen: 0.00045572916
+      CarbonDioxide: 0.00015190972
     damage:
       types:
-        Asphyxiation: 3
+        Asphyxiation: 1
     damageRecovery:
       types:
-        Asphyxiation: -1.5
+        Asphyxiation: -1
 #  - type: Appearance
 #    visuals:
 #      - type: RotationVisualizer

Resources/Prototypes/Reagents/elements.yml

@@ -134,6 +134,26 @@
           types:
             Poison: 2
 
+- type: reagent
+  id: Nitrogen
+  name: nitrogen
+  group: Elements
+  desc: A colorless, odorless unreactive gas. Highly stable.
+  physicalDesc: gaseous
+  color: "#808080"
+  boilingPoint: -195.8
+  meltingPoint: -210.0
+
+- type: reagent
+  id: Oxygen
+  name: oxygen
+  group: Elements
+  desc: An oxidizing, colorless gas.
+  physicalDesc: gaseous
+  color: "#808080"
+  boilingPoint: -183.0
+  meltingPoint: -218.4
+
 - type: reagent
   id: Potassium
   name: potassium

Resources/Prototypes/Reagents/gases.yml

@@ -1,121 +0,0 @@
-- type: reagent
-  id: Oxygen
-  name: oxygen
-  desc: An oxidizing, colorless gas.
-  physicalDesc: gaseous
-  color: "#808080"
-  boilingPoint: -183.0
-  meltingPoint: -218.4
-  metabolisms:
-    Gas:
-      effects:
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Human
-      - !type:Oxygenate
-        conditions:
-        - !type:OrganType
-          type: Animal
-      # Convert Oxygen into CO2.
-      - !type:ModifyLungGas
-        ratios:
-          CarbonDioxide: 1.0
-          Oxygen: -1.0
-
-- type: reagent
-  id: Plasma
-  name: plasma
-  desc: Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways.
-  physicalDesc: gaseous
-  color: "#7e009e"
-  boilingPoint: -127.3 # Random values picked between the actual values for CO2 and O2
-  meltingPoint: -186.4
-  tileReactions:
-  - !type:FlammableTileReaction
-    temperatureMultiplier: 1.5
-  metabolisms:
-    Poison:
-      effects:
-      - !type:HealthChange
-        damage:
-          types:
-            Poison: 3
-      - !type:AdjustReagent
-        reagent: Inaprovaline
-        amount: -2.0
-    Gas:
-      effects:
-      - !type:HealthChange
-        scaleByQuantity: true
-        ignoreResistances: true
-        damage:
-          types:
-            Poison:
-              1
-      # Cant be added until I add metabolism effects on reagent removal
-      #- !type:AdjustAlert
-      #  alertType: Toxins
-  reactiveEffects:
-    Flammable:
-      methods: [ Touch ]
-      effects:
-      - !type:FlammableReaction
-
-- type: reagent
-  id: Tritium
-  name: tritium
-  desc: Radioactive space-magic pixie dust.
-  physicalDesc: ionizing
-  color: "#66ff33"
-  tileReactions:
-  - !type:FlammableTileReaction
-    temperatureMultiplier: 2.0
-  metabolisms:
-    Poison:
-      effects:
-      - !type:HealthChange
-        damage:
-          types:
-            Radiation: 3
-    Gas:
-      effects:
-      - !type:HealthChange
-        scaleByQuantity: true
-        ignoreResistances: true
-        damage:
-          types:
-            Radiation:
-              1
-      # Cant be added until I add metabolism effects on reagent removal
-      #- !type:AdjustAlert
-      #  alertType: Toxins
-
-- type: reagent
-  id: CarbonDioxide
-  name: carbon dioxide
-  desc: You have genuinely no idea what this is.
-  physicalDesc: odorless
-  color: "#66ff33"
-  metabolisms:
-    Gas:
-      effects:
-      - !type:HealthChange
-        scaleByQuantity: true
-        ignoreResistances: true
-        damage:
-          types:
-            Poison:
-              0.2
-      # Cant be added until I add metabolism effects on reagent removal
-      #- !type:AdjustAlert
-      #  alertType: CarbonDioxide
-
-- type: reagent
-  id: Nitrogen
-  name: nitrogen
-  desc: A colorless, odorless unreactive gas. Highly stable.
-  physicalDesc: gaseous
-  color: "#808080"
-  boilingPoint: -195.8
-  meltingPoint: -210.0

Resources/Prototypes/Reagents/toxins.yml

@@ -133,6 +133,35 @@
         type: Local
         messages: [ "generic-reagent-effect-burning-insides" ]
         probability: 0.33
+  # TODO MIRROR acid!
+
+- type: reagent
+  id: Plasma
+  name: plasma
+  group: Toxins
+  desc: Funky, space-magic pixie dust. You probably shouldn't eat this, but we both know you will anyways.
+  physicalDesc: gaseous
+  color: "#7e009e"
+  boilingPoint: -127.3 # Random values picked between the actual values for CO2 and O2
+  meltingPoint: -186.4
+  tileReactions:
+  - !type:FlammableTileReaction
+    temperatureMultiplier: 1.5
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 3
+      - !type:AdjustReagent
+        reagent: Inaprovaline
+        amount: -2.0
+  reactiveEffects:
+    Flammable:
+      methods: [ Touch ]
+      effects:
+      - !type:FlammableReaction
 
 - type: reagent
   id: UnstableMutagen