Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes inhands for small gas tanks (#2658)

Browse Source 
* Initial

* Hotfix
This commit is contained in:
Swept
2020-12-01 08:33:22 +00:00
committed by GitHub
parent a6a6e0b72e
commit 0412ea0bbc
17 changed files with 47 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml → Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
View File

@@ -132,7 +132,6 @@
- type: Clothing - type: Clothing
sprite: Objects/Tanks/emergency.rsi sprite: Objects/Tanks/emergency.rsi
Slots: Slots:
- Back
- Pocket - Pocket
- Belt - Belt
@@ -168,7 +167,6 @@
- type: Clothing - type: Clothing
sprite: Objects/Tanks/emergency_yellow.rsi sprite: Objects/Tanks/emergency_yellow.rsi
Slots: Slots:
- Back
- Pocket - Pocket
- Belt - Belt
@@ -204,7 +202,6 @@
- type: Clothing - type: Clothing
sprite: Objects/Tanks/emergency_double.rsi sprite: Objects/Tanks/emergency_double.rsi
Slots: Slots:
- Back
- Pocket - Pocket
- Belt - Belt
@@ -282,7 +279,8 @@
temperature: 293.15 temperature: 293.15
- type: Clothing - type: Clothing
sprite: Objects/Tanks/phoron.rsi sprite: Objects/Tanks/phoron.rsi
Slots: [] # no straps Slots:
- Belt
- type: entity - type: entity
id: PhoronTankFilled id: PhoronTankFilled

BIN
Resources/Textures/Objects/Tanks/emergency.rsi/equipped-BELT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 643 B

BIN
Resources/Textures/Objects/Tanks/emergency.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 445 B

BIN
Resources/Textures/Objects/Tanks/emergency.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 440 B

29
Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
View File

@@ -1,38 +1,27 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"states": [ "states": [
{ {
"name": "icon", "name": "icon",
"directions": 1, "directions": 1
"delays": [ },
[ {
1.0 "name": "equipped-BELT",
] "directions": 4
]
}, },
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 1, "directions": 4
"delays": [
[
1.0
]
]
}, },
{ {
"name": "inhand-right", "name": "inhand-right",
"directions": 1, "directions": 4
"delays": [
[
1.0
]
]
} }
] ]
} }

BIN
Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-BELT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 525 B

BIN
Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 486 B

BIN
Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 466 B

29
Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
View File

@@ -1,38 +1,27 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"states": [ "states": [
{ {
"name": "icon", "name": "icon",
"directions": 1, "directions": 1
"delays": [ },
[ {
1.0 "name": "equipped-BELT",
] "directions": 4
]
}, },
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 1, "directions": 4
"delays": [
[
1.0
]
]
}, },
{ {
"name": "inhand-right", "name": "inhand-right",
"directions": 1, "directions": 4
"delays": [
[
1.0
]
]
} }
] ]
} }

BIN
Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-BELT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 665 B

BIN
Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 486 B

BIN
Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 466 B

29
Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
View File

@@ -1,38 +1,27 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"states": [ "states": [
{ {
"name": "icon", "name": "icon",
"directions": 1, "directions": 1
"delays": [ },
[ {
1.0 "name": "equipped-BELT",
] "directions": 4
]
}, },
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 1, "directions": 4
"delays": [
[
1.0
]
]
}, },
{ {
"name": "inhand-right", "name": "inhand-right",
"directions": 1, "directions": 4
"delays": [
[
1.0
]
]
} }
] ]
} }

BIN
Resources/Textures/Objects/Tanks/phoron.rsi/equipped-BELT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 383 B

29
Resources/Textures/Objects/Tanks/phoron.rsi/meta.json
View File

@@ -1,38 +1,27 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432",
"states": [ "states": [
{ {
"name": "icon", "name": "icon",
"directions": 1, "directions": 1
"delays": [ },
[ {
1.0 "name": "equipped-BELT",
] "directions": 4
]
}, },
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 1, "directions": 4
"delays": [
[
1.0
]
]
}, },
{ {
"name": "inhand-right", "name": "inhand-right",
"directions": 1, "directions": 4
"delays": [
[
1.0
]
]
} }
] ]
} }

BIN
Resources/Textures/Objects/Tanks/plasmaman.rsi/equipped-BELT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 313 B

4
Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json
View File

@@ -15,6 +15,10 @@
"name": "equipped-BACKPACK", "name": "equipped-BACKPACK",
"directions": 4 "directions": 4
}, },
{
"name": "equipped-BELT",
"directions": 4
},
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 4 "directions": 4