Adds Emergency Nitrogen Tanks (#22142)

* Added Emergency Nitrogen tanks and added both variants to the Emergency Closet loot pool.

* Restored O2 tank I deleted :)

* Fixed accident with extended emergency oxygen tanks

* Fixed an issue with emergency oxygen tanks

---------

Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>

diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
index e013fb3710922ad8668a5e767f32ac647338c391..095be1adb88535ba0e1b1df2ac8bbb8724ac4e5c 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
@@ -54,6 +54,21 @@
         - 0.270782035 # oxygen
       temperature: 293.15
 
+- type: entity
+  id: EmergencyNitrogenTankFilled
+  parent: EmergencyNitrogenTank
+  suffix: Filled
+  components:
+  - type: GasTank
+    outputPressure: 21.3
+    air:
+      # 9 minutes
+      volume: 1.5
+      moles:
+        - 0 # oxygen
+        - 0.615413715 #nitrogen
+      temperature: 293.15
+      
 - type: entity
   id: ExtendedEmergencyOxygenTankFilled
   parent: ExtendedEmergencyOxygenTank
@@ -68,6 +83,7 @@
         - 0.615413715 # oxygen
       temperature: 293.15
 
+
 - type: entity
   id: DoubleEmergencyOxygenTankFilled
   parent: DoubleEmergencyOxygenTank

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 4e4d4f10672cbb04fa355758daacc118cbd80dc2..79eb2f9e0f20fa58be72a9678a1ef0828848861a 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -28,6 +28,12 @@
       - id: OxygenTankFilled
         prob: 0.20
         orGroup: EmergencyTankOrRegularTank
+      - id: EmergencyNitrogenTankFilled
+        prob: 0.80
+        orGroup: EmergencyNitrogenOrRegularNitrogen
+      - id: NitrogenTankFilled
+        prob: 0.20
+        orGroup: EmergencyNitrogenOrRegularNitrogen
       - id: ToolboxEmergencyFilled
         prob: 0.4
       - id: MedkitOxygenFilled
@@ -52,6 +58,12 @@
       - id: OxygenTankFilled
         prob: 0.20
         orGroup: EmergencyTankOrRegularTank
+      - id: NitrogenTankFilled
+        prob: 0.80
+        orGroup: EmergencyNitrogenOrRegularNitrogen
+      - id: EmergencyNitrogenTankFilled
+        prob: 0.20
+        orGroup: EmergencyNitrogenOrRegularNitrogen  
       - id: ToolboxEmergencyFilled
         prob: 0.4
       - id: MedkitOxygenFilled

diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 624c99e64c6cb6fa3e7f721708ab9cd387ea4b29..70722ffb2725f2cc89b96b934323f39057147b03 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -129,6 +129,40 @@
     materialComposition:
       Steel: 100
 
+- type: entity
+  parent: GasTankRoundBase
+  id: EmergencyNitrogenTank
+  name: emergency nitrogen tank
+  description: An easily portable tank for emergencies. Contains very little nitrogen, rated for survival use only.
+  components:
+  - type: Sprite
+    sprite: Objects/Tanks/emergency_red.rsi
+  - type: Item
+    size: Small
+    sprite: Objects/Tanks/emergency_red.rsi
+  - type: GasTank
+    outputPressure: 21.3
+    air:
+      volume: 0.66
+      temperature: 293.15
+  - type: Clothing
+    sprite: Objects/Tanks/emergency_red.rsi
+    slots:
+    - Pocket
+    - Belt
+    - suitStorage
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 5
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+
 - type: entity
   parent: EmergencyOxygenTank
   id: ExtendedEmergencyOxygenTank

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..db800b2
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-cat.png
new file mode 100644 (file)
index 0000000..7793357
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-cat.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-dog.png
new file mode 100644 (file)
index 0000000..7793357
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-dog.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-fox.png
new file mode 100644 (file)
index 0000000..49150ee
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-fox.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-hamster.png
new file mode 100644 (file)
index 0000000..9f97568
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-hamster.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644 (file)
index 0000000..f13fb2e
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-kangaroo.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-pig.png
new file mode 100644 (file)
index 0000000..3cf22a0
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-pig.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-possum.png
new file mode 100644 (file)
index 0000000..3edb64e
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-possum.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-puppy.png
new file mode 100644 (file)
index 0000000..6299351
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-puppy.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-sloth.png
new file mode 100644 (file)
index 0000000..a59cce1
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-sloth.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/icon.png
new file mode 100644 (file)
index 0000000..4fd5f55
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..0f43ae1
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..faf0d3d
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
new file mode 100644 (file)
index 0000000..e0ed3ed
--- /dev/null
+++ b/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
@@ -0,0 +1,71 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Adapted by DangerReovlution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE-dog",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-puppy",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-fox",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-cat",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-sloth",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-possum",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-pig",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}