Skip to content

Commit

Permalink
Merge pull request #132 from Graugr/Add-N2-gas-tanks
Browse files Browse the repository at this point in the history
Add n2 gas tanks
  • Loading branch information
Cheackraze committed Aug 3, 2023
2 parents 59fb809 + f3014b1 commit 0476d6e
Show file tree
Hide file tree
Showing 45 changed files with 335 additions and 1 deletion.
46 changes: 46 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,49 @@
- 0 # CO2
- 6.154137219 # plasma
temperature: 293.15

- type: entity
id: EmergencyNitrogenTankFilled
parent: EmergencyNitrogenTank
suffix: Filled
components:
- type: GasTank
outputPressure: 21.3
air:
# ? minutes
volume: 2
moles::
- 0 # oxygen
- 0.820551629 #nitrogen
temperature: 293.15

- type: entity
id: ExtendedEmergencyNitrogenTankFilled
parent: ExtendedEmergencyNitrogenTank
suffix: Filled
components:
- type: GasTank
outputPressure: 21.3
air:
# ? minutes
volume: 6
moles:
- 0 # oxygen
- 2.461654887 #nitrogen
temperature: 293.15

- type: entity
id: DoubleEmergencyNitrogenTankFilled
parent: DoubleEmergencyNitrogenTank
suffix: Filled
components:
- type: GasTank
outputPressure: 21.3
air:
# 63 minutes
volume: 10
moles:
- 0 # oxygen
- 4.102758145 #nitrogen
temperature: 293.15

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
startingInventory:
OxygenTankFilled: 5
NitrogenTankFilled: 5

EmergencyOxygenTankFilled: 5
ExtendedEmergencyOxygenTankFilled: 5
DoubleEmergencyOxygenTankFilled: 5
EmergencyNitrogenTankFilled: 5
ExtendedEmergencyNitrogenTankFilled: 5
DoubleEmergencyNitrogenTankFilled: 5
- type: vendingMachineInventory
id: TankDispenserEngineeringInventory
startingInventory:
Expand Down
79 changes: 79 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,3 +227,82 @@
slots:
- Belt
- suitStorage

- type: entity
parent: OxygenTank
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: GasTank
outputPressure: 101.325
air:
volume: 2
temperature: 293.15
- type: Item
size: 10
- type: Clothing
sprite: Objects/Tanks/emergency_red.rsi
slots:
- Pocket
- Belt
- suitStorage
- type: MeleeWeapon
damage:
types:
Blunt: 5
- type: PhysicalComposition
materialComposition:
Steel: 100

- type: entity
parent: EmergencyNitrogenTank
id: ExtendedEmergencyNitrogenTank
name: extended-capacity emergency nitrogen tank
description: An emergency tank with extended capacity. Technically rated for prolonged use.
components:
- type: Sprite
sprite: Objects/Tanks/emergency_red_extended.rsi
- type: GasTank
outputPressure: 101.325
air:
volume: 6
temperature: 293.15
- type: Item
size: 10
- type: Clothing
sprite: Objects/Tanks/emergency_red_extended.rsi
slots:
- Pocket
- Belt
- suitStorage

- type: entity
parent: ExtendedEmergencyNitrogenTank
id: DoubleEmergencyNitrogenTank
name: double emergency nitrogen tank
description: A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for it's small size.
components:
- type: Sprite
sprite: Objects/Tanks/emergency_red_double.rsi
- type: GasTank
outputPressure: 101.325
air:
volume: 10
temperature: 293.15
- type: Item
size: 10
- type: Clothing
sprite: Objects/Tanks/emergency_red_double.rsi
slots:
- Pocket
- Belt
- suitStorage
- type: MeleeWeapon
attackRate: 0.9
damage:
types:
Blunt: 7.5

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 71 additions & 0 deletions Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken 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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken 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
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE-dog",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE-kangaroo",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE-puppy",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE-fox",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE-cat",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE-sloth",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE-possum",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE-pig",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "icon"
}
]
}

0 comments on commit 0476d6e

Please sign in to comment.