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>
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

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 122 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 B

View File

@@ -0,0 +1,317 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a7215663648f4289d2446a1c82aec1c9a406310c",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "backpack0"
},
{
"name": "backpack15"
},
{
"name": "backpack60"
},
{
"name": "backpackmob-10",
"directions": 4
},
{
"name": "backpackmob100",
"directions": 4
},
{
"name": "backpackmob50",
"directions": 4
},
{
"name": "beaker0"
},
{
"name": "beaker10"
},
{
"name": "beaker25"
},
{
"name": "beaker50"
},
{
"name": "beaker75"
},
{
"name": "beaker80"
},
{
"name": "beaker90"
},
{
"name": "beakergold0"
},
{
"name": "beakergold10"
},
{
"name": "beakergold25"
},
{
"name": "beakergold50"
},
{
"name": "beakergold75"
},
{
"name": "beakergold80"
},
{
"name": "beakergold90"
},
{
"name": "beakerlarge0"
},
{
"name": "beakerlarge10"
},
{
"name": "beakerlarge25"
},
{
"name": "beakerlarge50"
},
{
"name": "beakerlarge75"
},
{
"name": "beakerlarge80"
},
{
"name": "beakerlarge90"
},
{
"name": "bloodpack10"
},
{
"name": "bloodpack100"
},
{
"name": "bloodpack20"
},
{
"name": "bloodpack30"
},
{
"name": "bloodpack40"
},
{
"name": "bloodpack50"
},
{
"name": "bloodpack60"
},
{
"name": "bloodpack70"
},
{
"name": "bloodpack80"
},
{
"name": "bloodpack90"
},
{
"name": "bottle0"
},
{
"name": "bottle10"
},
{
"name": "bottle30"
},
{
"name": "bottle50"
},
{
"name": "bottle70"
},
{
"name": "chempack10"
},
{
"name": "chempack100"
},
{
"name": "chempack20"
},
{
"name": "chempack30"
},
{
"name": "chempack40"
},
{
"name": "chempack50"
},
{
"name": "chempack60"
},
{
"name": "chempack70"
},
{
"name": "chempack80"
},
{
"name": "chempack90"
},
{
"name": "dropper"
},
{
"name": "emptycondiment0"
},
{
"name": "emptycondiment10"
},
{
"name": "emptycondiment100"
},
{
"name": "emptycondiment25"
},
{
"name": "emptycondiment50"
},
{
"name": "emptycondiment75"
},
{
"name": "glassbottle0"
},
{
"name": "glassbottle10"
},
{
"name": "glassbottle20"
},
{
"name": "glassbottle30"
},
{
"name": "glassbottle40"
},
{
"name": "glassbottle50"
},
{
"name": "glassbottle60"
},
{
"name": "glassbottle70"
},
{
"name": "glassbottle80"
},
{
"name": "glassbottle90"
},
{
"name": "glassbottlesmall0"
},
{
"name": "glassbottlesmall10"
},
{
"name": "glassbottlesmall20"
},
{
"name": "glassbottlesmall30"
},
{
"name": "glassbottlesmall40"
},
{
"name": "glassbottlesmall50"
},
{
"name": "glassbottlesmall60"
},
{
"name": "glassbottlesmall70"
},
{
"name": "glassbottlesmall80"
},
{
"name": "glassbottlesmall90"
},
{
"name": "largebottle0"
},
{
"name": "largebottle10"
},
{
"name": "largebottle25"
},
{
"name": "largebottle50"
},
{
"name": "largebottle75"
},
{
"name": "largebottle80"
},
{
"name": "largebottle90"
},
{
"name": "maunafilling25"
},
{
"name": "pill"
},
{
"name": "powderpile"
},
{
"name": "smallbottle-10"
},
{
"name": "smallbottle10"
},
{
"name": "smallbottle25"
},
{
"name": "smallbottle50"
},
{
"name": "smallbottle75"
},
{
"name": "smallbottle80"
},
{
"name": "smallbottle90"
},
{
"name": "splashed"
},
{
"name": "syringe1"
},
{
"name": "syringe10"
},
{
"name": "syringe15"
},
{
"name": "syringe5"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 613 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 B

Some files were not shown because too many files have changed in this diff Show More