Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

engineering-update-atmosgase #2462

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Resources/Prototypes/Atmospherics/gases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
specificHeat: 200
heatCapacityRatio: 1.7
molarMass: 120
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlaySprite: /Textures/SS220/Effects/atmospherics.rsi #ss220-engineering-update-atmosgase
gasOverlayState: plasma
color: FF3300
reagent: Plasma
Expand All @@ -46,7 +46,7 @@
specificHeat: 10
heatCapacityRatio: 1.3
molarMass: 6
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlaySprite: /Textures/SS220/Effects/atmospherics.rsi #ss220-engineering-update-atmosgase
gasOverlayState: tritium
color: 3BBF58 #SS220 Supermatter-crystal
reagent: Tritium
Expand All @@ -58,7 +58,7 @@
specificHeat: 40
heatCapacityRatio: 1.33
molarMass: 18
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlaySprite: /Textures/SS220/Effects/atmospherics.rsi #ss220-engineering-update-atmosgase
gasOverlayState: water_vapor
color: 9BBFBE #SS220 Supermatter-crystal
reagent: Water
Expand All @@ -70,7 +70,7 @@
specificHeat: 20
heatCapacityRatio: 1.4
molarMass: 44
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlaySprite: /Textures/SS220/Effects/atmospherics.rsi #ss220-engineering-update-atmosgase
gasOverlayState: miasma
gasMolesVisible: 2
gasVisbilityFactor: 3.5
Expand All @@ -94,7 +94,7 @@
specificHeat: 600 # Strongest by far
heatCapacityRatio: 1.33
molarMass: 50
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlaySprite: /Textures/SS220/Effects/atmospherics.rsi #ss220-engineering-update-atmosgase
gasOverlayState: frezon
gasMolesVisible: 0.6
color: 3a758c
Expand Down
22 changes: 11 additions & 11 deletions Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: cargoProduct
id: AtmosphericsAir
icon:
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: grey
product: AirCanister
cost: 1100
Expand All @@ -11,7 +11,7 @@
- type: cargoProduct
id: AtmosphericsOxygen
icon:
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: blue
product: OxygenCanister
cost: 1100
Expand All @@ -21,7 +21,7 @@
- type: cargoProduct
id: AtmosphericsLiquidOxygen
icon:
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: blue
product: LiquidOxygenCanister
cost: 2500
Expand All @@ -31,7 +31,7 @@
- type: cargoProduct
id: AtmosphericsNitrogen
icon:
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: red
product: NitrogenCanister
cost: 1100
Expand All @@ -41,7 +41,7 @@
- type: cargoProduct
id: AtmosphericsLiquidNitrogen
icon:
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: red
product: LiquidNitrogenCanister
cost: 2500
Expand All @@ -51,7 +51,7 @@
- type: cargoProduct
id: AtmosphericsCarbonDioxide
icon:
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: black
product: CarbonDioxideCanister
cost: 2200 # Until someone fixes it co2 can be used to oneshot people so it's more expensive
Expand All @@ -61,7 +61,7 @@
- type: cargoProduct
id: AtmosphericsLiquidCarbonDioxide
icon:
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: black
product: LiquidCarbonDioxideCanister
cost: 4000
Expand All @@ -71,7 +71,7 @@
- type: cargoProduct
id: AtmosphericsStorage
icon:
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: yellow
product: StorageCanister
cost: 1010 # No gases in it so it's cheaper
Expand All @@ -83,7 +83,7 @@
# id: AtmosphericsWaterVapor
# description: "Water vapor canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
# state: water_vapor
# product: WaterVaporCanister
# cost: 2600
Expand All @@ -93,7 +93,7 @@
- type: cargoProduct
id: AtmosphericsPlasma
icon:
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: orange
product: PlasmaCanister
cost: 4000
Expand All @@ -105,7 +105,7 @@
# id: AtmosphericsTritium
# description: "Tritium canister"
# icon:
# sprite: Structures/Storage/canister.rsi
# sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
# state: green
# product: TritiumCanister
# cost: 15500
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
- type: Sprite
layers:
- state: pink
- sprite: Structures/Storage/canister.rsi
- sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: blue
- type: EntityTableSpawner
table: !type:GroupSelector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- type: Transform
noRot: true
- type: Sprite
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
noRot: true
layers:
- state: grey
Expand Down Expand Up @@ -673,7 +673,7 @@
damageModifierSet: Metallic
- type: InteractionOutline
- type: Sprite
sprite: Structures/Storage/canister.rsi
sprite: SS220/Structures/Storage/canister.rsi #ss220-engineering-update-atmosgase
state: grey-1
- type: Physics
bodyType: Dynamic
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions Resources/Textures/SS220/Effects/atmospherics.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by kazne (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{"name": "frezon", "delays": [[0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09]]},
{"name": "miasma", "delays": [[0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09]]},
{"name": "plasma", "delays": [[0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09]]},
{"name": "tritium", "delays": [[0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09]]},
{"name": "water_vapor", "delays": [[0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09]]}
]
}
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.
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.
126 changes: 126 additions & 0 deletions Resources/Textures/SS220/Structures/Storage/canister.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Frezon canister modified from tgstation, some assets taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335. New Canisters by AftrLite(Github), inspired by CEV-Eris sprites at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af. Other assets taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/2fd9200036dd18a56e6887f8090d5dc0477fc6f3.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "black"
},
{
"name": "black-1"
},
{
"name": "blue"
},
{
"name": "blue-1"
},
{
"name": "can-connector"
},
{
"name": "locked"
},
{
"name": "unlocked"
},
{
"name": "can-o0",
"delays": [
[
0.25,
0.25,
0.25,
0.25,
0.25,
0.25
]
]
},
{
"name": "can-o1"
},
{
"name": "can-o2"
},
{
"name": "can-o3"
},
{
"name": "can-oa1"
},
{
"name": "can-open"
},
{
"name": "grey"
},
{
"name": "grey-1"
},
{
"name": "orange"
},
{
"name": "orange-1"
},
{
"name": "red"
},
{
"name": "red-1"
},
{
"name": "redws"
},
{
"name": "redws-1"
},
{
"name": "yellow"
},
{
"name": "yellow-1"
},
{
"name": "green"
},
{
"name": "green-1"
},
{
"name": "greenys"
},
{
"name": "greenys-1"
},
{
"name": "darkblue"
},
{
"name": "darkblue-1"
},
{
"name": "frezon"
},
{
"name": "frezon-1"
},
{
"name": "water_vapor"
},
{
"name": "water_vapor-1"
},
{
"name": "scrubber-connector"
},
{
"name": "scrubber-open"
}
]
}
Loading