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

Fleshes out smoking content (#3295)

Browse Source 
* RSIs sorted out

* Bookmark

* Updated packet RSIs for Stacks

* Cigs Packs done

* Cigarette Cartons

* fucking MANUALLY fixed the cigarette inhands, fuck you tgstation

* Pipes work

* Cigars/Cases

* Updates vending machine inventory

* tweaks count

* Adds a cigarette crate

* Fixes RSIs, working on rolling paper

* Adds Tobacco and Cannabis plants

* Cigarettes and Rollies are now craftable

* There

* Fixed crafting recipes

* Reset RobustToolbox

* Netsync'd

* Ready

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Swept
2021-02-22 04:08:17 +00:00
committed by GitHub
parent 932ae78621
commit 4a67fc1d22
306 changed files with 2537 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 326 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 513 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1022 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 919 B

182
Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.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/Pipes/pipe.rsi/unlit-equipped-MASK.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 321 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 326 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 314 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 329 B