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

Fixing Canisters Mess #1310

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
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
name: storage canister
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: yellow
- type: GasCanister
Expand Down Expand Up @@ -160,6 +161,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain air mixture. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: grey
- type: GasCanister
Expand Down Expand Up @@ -200,6 +202,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain oxygen. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: blue
- type: GasCanister
Expand Down Expand Up @@ -254,6 +257,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain nitrogen. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: red
- type: GasCanister
Expand Down Expand Up @@ -310,6 +314,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain carbon dioxide. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: black
- type: GasCanister
Expand Down Expand Up @@ -370,6 +375,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain plasma. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: orange
- type: GasCanister
Expand Down Expand Up @@ -459,6 +465,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain water vapor. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: water_vapor
- type: GasCanister
Expand Down Expand Up @@ -550,6 +557,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain nitrous oxide. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: redws
- type: GasCanister
Expand Down Expand Up @@ -673,7 +681,7 @@
damageModifierSet: Metallic
- type: InteractionOutline
- type: Sprite
sprite: Structures/Storage/canister.rsi
sprite: _NF/Structures/Storage/canister.rsi
state: grey-1
- type: Physics
bodyType: Dynamic
Expand All @@ -700,6 +708,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: yellow-1

- type: entity
Expand All @@ -708,6 +717,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: grey-1

- type: entity
Expand All @@ -716,6 +726,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: blue-1

- type: entity
Expand All @@ -724,6 +735,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: red-1

- type: entity
Expand All @@ -732,6 +744,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: black-1

- type: entity
Expand All @@ -740,6 +753,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: orange-1

- type: entity
Expand All @@ -757,6 +771,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: water_vapor-1

- type: entity
Expand All @@ -773,6 +788,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: redws-1

- type: entity
Expand Down
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/black-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/blue-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/blue.png
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.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/can-o0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/can-o1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/can-o2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/can-o3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/can-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/darkblue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/frezon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/grey-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/orange-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/orange.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/red-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/redws-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/redws.png
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.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/yellow.png
122 changes: 122 additions & 0 deletions Resources/Textures/_NF/Structures/Storage/canister.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Frezon canister modified from tgstation, the rest are taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335",
"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.2,
0.2
]
]
},
{
"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