epic Respiration Rework (#6022)

2022-02-06 21:48:15 -07:00
parent ee4c5559a3
commit 4ae1c4e332
32 changed files with 596 additions and 586 deletions
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -152,17 +152,12 @@
    normalBodyTemperature: 310.15
    thermalRegulationTemperatureThreshold: 25
  - type: Respirator
-    needsGases:
-      Oxygen: 0.00060763888
-    producesGases:
-      Oxygen: 0.00045572916
-      CarbonDioxide: 0.00015190972
    damage:
      types:
-        Asphyxiation: 1
+        Asphyxiation: 3
    damageRecovery:
      types:
-        Asphyxiation: -1
+        Asphyxiation: -1.5
  - type: Temperature
    heatDamageThreshold: 360
    coldDamageThreshold: 260
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -42,10 +42,10 @@
  - type: Respirator
    damage:
      types:
-        Asphyxiation: 1
+        Asphyxiation: 3
    damageRecovery:
      types:
-        Asphyxiation: -1
+        Asphyxiation: -1.5
  - type: UnarmedCombat
    range: 1.5
    arcwidth: 0
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -11,6 +11,13 @@
    context: "human"
  - type: PlayerMobMover
  - type: PlayerInputMover
+  - type: Respirator
+    damage:
+      types:
+        Asphyxiation: 3
+    damageRecovery:
+      types:
+        Asphyxiation: -1.5
  - type: Alerts
  - type: Actions
    innateActions:
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -9,6 +9,13 @@
  - 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
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -199,18 +199,6 @@
    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:
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -83,18 +83,14 @@
  - 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: 1
+        Asphyxiation: 3
    damageRecovery:
      types:
-        Asphyxiation: -1
+        Asphyxiation: -1.5
 #  - type: Appearance
 #    visuals:
 #      - type: RotationVisualizer