Fleshes out smoking content (#3295)
* 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>
|
Before Width: | Height: | Size: 249 B |
|
Before Width: | Height: | Size: 280 B |
|
Before Width: | Height: | Size: 171 B |
|
Before Width: | Height: | Size: 117 B |
|
Before Width: | Height: | Size: 116 B |
|
Before Width: | Height: | Size: 116 B |
|
Before Width: | Height: | Size: 116 B |
|
Before Width: | Height: | Size: 114 B |
|
Before Width: | Height: | Size: 114 B |
@@ -1,38 +0,0 @@
|
||||
{
|
||||
"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": "cig"
|
||||
},
|
||||
{
|
||||
"name": "cig_empty"
|
||||
},
|
||||
{
|
||||
"name": "cig_open"
|
||||
},
|
||||
{
|
||||
"name": "cigarette_1"
|
||||
},
|
||||
{
|
||||
"name": "cigarette_2"
|
||||
},
|
||||
{
|
||||
"name": "cigarette_3"
|
||||
},
|
||||
{
|
||||
"name": "cigarette_4"
|
||||
},
|
||||
{
|
||||
"name": "cigarette_5"
|
||||
},
|
||||
{
|
||||
"name": "cigarette_6"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 269 B |
|
After Width: | Height: | Size: 293 B |
|
After Width: | Height: | Size: 275 B |
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "open"
|
||||
},
|
||||
{
|
||||
"name": "closed"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 340 B |
|
After Width: | Height: | Size: 253 B |
|
After Width: | Height: | Size: 257 B |
|
After Width: | Height: | Size: 253 B |
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "open"
|
||||
},
|
||||
{
|
||||
"name": "closed"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 330 B |
|
After Width: | Height: | Size: 254 B |
|
After Width: | Height: | Size: 243 B |
|
After Width: | Height: | Size: 244 B |
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "open"
|
||||
},
|
||||
{
|
||||
"name": "closed"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 320 B |
|
After Width: | Height: | Size: 255 B |
|
After Width: | Height: | Size: 261 B |
|
After Width: | Height: | Size: 252 B |
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "open"
|
||||
},
|
||||
{
|
||||
"name": "closed"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 324 B |
|
After Width: | Height: | Size: 103 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 254 B |
|
After Width: | Height: | Size: 293 B |
|
After Width: | Height: | Size: 275 B |
@@ -0,0 +1,46 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "cig1"
|
||||
},
|
||||
{
|
||||
"name": "cig2"
|
||||
},
|
||||
{
|
||||
"name": "cig3"
|
||||
},
|
||||
{
|
||||
"name": "cig4"
|
||||
},
|
||||
{
|
||||
"name": "cig5"
|
||||
},
|
||||
{
|
||||
"name": "cig6"
|
||||
},
|
||||
{
|
||||
"name": "closed"
|
||||
},
|
||||
{
|
||||
"name": "open"
|
||||
},
|
||||
{
|
||||
"name": "trash"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 297 B |
|
After Width: | Height: | Size: 292 B |
|
After Width: | Height: | Size: 103 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 249 B |
|
After Width: | Height: | Size: 257 B |
|
After Width: | Height: | Size: 253 B |
@@ -0,0 +1,46 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "cig1"
|
||||
},
|
||||
{
|
||||
"name": "cig2"
|
||||
},
|
||||
{
|
||||
"name": "cig3"
|
||||
},
|
||||
{
|
||||
"name": "cig4"
|
||||
},
|
||||
{
|
||||
"name": "cig5"
|
||||
},
|
||||
{
|
||||
"name": "cig6"
|
||||
},
|
||||
{
|
||||
"name": "closed"
|
||||
},
|
||||
{
|
||||
"name": "open"
|
||||
},
|
||||
{
|
||||
"name": "trash"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 300 B |
|
After Width: | Height: | Size: 288 B |
|
After Width: | Height: | Size: 103 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 234 B |
|
After Width: | Height: | Size: 243 B |
|
After Width: | Height: | Size: 244 B |
@@ -0,0 +1,46 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "cig1"
|
||||
},
|
||||
{
|
||||
"name": "cig2"
|
||||
},
|
||||
{
|
||||
"name": "cig3"
|
||||
},
|
||||
{
|
||||
"name": "cig4"
|
||||
},
|
||||
{
|
||||
"name": "cig5"
|
||||
},
|
||||
{
|
||||
"name": "cig6"
|
||||
},
|
||||
{
|
||||
"name": "closed"
|
||||
},
|
||||
{
|
||||
"name": "open"
|
||||
},
|
||||
{
|
||||
"name": "trash"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 299 B |
|
After Width: | Height: | Size: 292 B |
|
After Width: | Height: | Size: 103 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 104 B |
|
After Width: | Height: | Size: 242 B |
|
After Width: | Height: | Size: 261 B |
|
After Width: | Height: | Size: 252 B |
@@ -0,0 +1,46 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "cig1"
|
||||
},
|
||||
{
|
||||
"name": "cig2"
|
||||
},
|
||||
{
|
||||
"name": "cig3"
|
||||
},
|
||||
{
|
||||
"name": "cig4"
|
||||
},
|
||||
{
|
||||
"name": "cig5"
|
||||
},
|
||||
{
|
||||
"name": "cig6"
|
||||
},
|
||||
{
|
||||
"name": "closed"
|
||||
},
|
||||
{
|
||||
"name": "open"
|
||||
},
|
||||
{
|
||||
"name": "trash"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 303 B |
|
After Width: | Height: | Size: 292 B |
|
After Width: | Height: | Size: 237 B |
|
After Width: | Height: | Size: 435 B |
|
After Width: | Height: | Size: 992 B |
|
After Width: | Height: | Size: 648 B |
|
After Width: | Height: | Size: 539 B |
@@ -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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 244 B |
|
After Width: | Height: | Size: 267 B |
|
After Width: | Height: | Size: 239 B |
|
After Width: | Height: | Size: 239 B |
|
Before Width: | Height: | Size: 135 B After Width: | Height: | Size: 135 B |
|
Before Width: | Height: | Size: 429 B After Width: | Height: | Size: 429 B |
|
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 344 B |
|
After Width: | Height: | Size: 648 B |
|
After Width: | Height: | Size: 539 B |
@@ -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
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 133 B |
|
Before Width: | Height: | Size: 140 B After Width: | Height: | Size: 140 B |
|
After Width: | Height: | Size: 239 B |
|
After Width: | Height: | Size: 239 B |
|
After Width: | Height: | Size: 156 B |
|
After Width: | Height: | Size: 242 B |