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

Fix/improve smokeables (#10497)

Browse Source
This commit is contained in:
Visne
2022-08-14 07:20:31 +02:00
committed by GitHub
parent 7deb22e163
commit 906edc592d
129 changed files with 228 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/burnt-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 210 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 332 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1011 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 729 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 564 B

182
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json Normal file
View File

@@ -0,0 +1,182 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Adapted from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "unlit-equipped-MASK",
"directions": 4
},
{
"name": "lit-equipped-MASK",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "burnt-icon"
},
{
"name": "unlit-icon"
},
{
"name": "lit-icon",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "unlit-inhand-left",
"directions": 4
},
{
"name": "unlit-inhand-right",
"directions": 4
},
{
"name": "lit-inhand-left",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "lit-inhand-right",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-equipped-MASK.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 149 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 592 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 147 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 151 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/burnt-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 237 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-equipped-MASK.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 435 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 992 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 648 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/lit-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 539 B

182
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/meta.json Normal file
View File

@@ -0,0 +1,182 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "unlit-equipped-MASK",
"directions": 4
},
{
"name": "lit-equipped-MASK",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "burnt-icon"
},
{
"name": "unlit-icon"
},
{
"name": "lit-icon",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "unlit-inhand-left",
"directions": 4
},
{
"name": "unlit-inhand-right",
"directions": 4
},
{
"name": "lit-inhand-left",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "lit-inhand-right",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-equipped-MASK.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 527 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 267 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 239 B

BIN
Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 239 B