Skip to content

Commit

Permalink
Add clown emergency oxygen tank (space-wizards#23495)
Browse files Browse the repository at this point in the history
* Add clown emergency oxygen tank

* increase pressure and volume slightly due to less o2 percentage
  • Loading branch information
themias committed Jan 4, 2024
1 parent bf79acd commit 0fd68b2
Show file tree
Hide file tree
Showing 18 changed files with 107 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
- type: StorageFill
contents:
- id: ClothingMaskBreath
- id: EmergencyOxygenTankFilled
- id: EmergencyFunnyOxygenTankFilled
- id: SpaceMedipen
- id: EmergencyMedipen
- id: Flare
Expand Down
21 changes: 21 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,27 @@
- 1.025689525 # nitrogen
temperature: 293.15

- type: entity
id: EmergencyFunnyOxygenTankFilled
parent: EmergencyFunnyOxygenTank
suffix: Filled
components:
- type: GasTank
outputPressure: 22.4
air:
# 4 minutes
volume: 0.66
moles:
- 0.270782035 # 95% oxygen
- 0 # nitrogen
- 0 # CO2
- 0 # plasma
- 0 # tritium
- 0 # water vapor
- 0 # ammonia
- 0.014251686 # 5% N2O
# 0.285033721 total
temperature: 293.15

- type: entity
id: AirTankFilled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
- ToolboxArtisticFilled
- NitrogenTankFilled
- DoubleEmergencyNitrogenTankFilled
- EmergencyFunnyOxygenTankFilled
- ToolboxElectricalFilled
- ToolboxMechanicalFilled
- ClothingBeltUtility
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,19 @@
- type: Clothing
sprite: Objects/Tanks/emergency_double_red.rsi

- type: entity
parent: EmergencyOxygenTank
id: EmergencyFunnyOxygenTank
name: funny emergency oxygen tank
description: An easily portable tank for emergencies. Contains very little oxygen with an extra of funny gas, rated for survival use only.
components:
- type: Sprite
sprite: Objects/Tanks/emergency_clown.rsi
- type: Item
sprite: Objects/Tanks/emergency_clown.rsi
- type: Clothing
sprite: Objects/Tanks/emergency_clown.rsi

- type: entity
parent: GasTankRoundBase
id: AirTank
Expand Down
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_clown.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/ff8df99906ab1909674680b9973bd3c909080360",
"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-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-hamster",
"directions": 4,
"delays": [[1],[1],[1],[1]]
},
{
"name": "equipped-SUITSTORAGE-kangaroo",
"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": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit 0fd68b2

Please sign in to comment.