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

View File

@@ -334,12 +334,20 @@
solids:
FoodMiloSoup: 1
#Handy template for copy **pasta**. Get it? Pasta? Aw whatever fuck you.
# - type: microwaveMealRecipe
# id:
# name:
# result:
# time: 5
# reagents:
# NOT ACTUAL FOOD
# solids:
- type: microwaveMealRecipe
id: RecipeDriedCannabis
name: dried cannabis leaves recipe
result: LeavesTobaccoDried
time: 10
solids:
LeavesTobacco: 1
- type: microwaveMealRecipe
id: RecipeDriedTobacco
name: dried tobacco leaves recipe
result: LeavesCannabisDried
time: 10
solids:
LeavesCannabis: 1

View File

@@ -0,0 +1,100 @@
- type: constructionGraph
id: smokeableRollie
start: start
graph:
- node: start
edges:
- to: rollie
steps:
- prototype: PaperRolling
icon:
sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
state: cigpaper
name: rolling paper
- prototype: CigaretteFilter
icon:
sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
state: cigfilter
name: cigarette filter
- prototype: GroundCannabis
icon:
sprite: Objects/Misc/reageant_fillings.rsi
state: powderpile
# color: darkgreen
name: ground cannabis
doAfter: 2
- node: rollie
entity: Rollie
- type: constructionGraph
id: smokeableCigarette
start: start
graph:
- node: start
edges:
- to: cigarette
steps:
- prototype: PaperRolling
icon:
sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
state: cigpaper
name: rolling paper
- prototype: CigaretteFilter
icon:
sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
state: cigfilter
name: cigarette filter
- prototype: GroundTobacco
icon:
sprite: Objects/Misc/reageant_fillings.rsi
state: powderpile
# color: brown
name: ground tobacco
doAfter: 2
- node: cigarette
entity: Cigarette
- type: constructionGraph
id: smokeableGroundCannabis
start: start
graph:
- node: start
edges:
- to: ground
steps:
- prototype: LeavesCannabisDried
icon:
sprite: Objects/Specific/Hydroponics/cannabis.rsi
state: dried
name: dried cannabis leaves
- prototype: LeavesCannabisDried
icon:
sprite: Objects/Specific/Hydroponics/cannabis.rsi
state: dried
name: dried cannabis leaves
doAfter: 5
- node: ground
entity: GroundCannabis
- type: constructionGraph
id: smokeableGroundTobacco
start: start
graph:
- node: start
edges:
- to: ground
steps:
- prototype: LeavesTobaccoDried
icon:
sprite: Objects/Specific/Hydroponics/tobacco.rsi
state: dried
name: dried tobacco leaves
- prototype: LeavesTobaccoDried
icon:
sprite: Objects/Specific/Hydroponics/tobacco.rsi
state: dried
name: dried tobacco leaves
doAfter: 5
- node: ground
entity: GroundTobacco

View File

@@ -0,0 +1,47 @@
- type: construction
name: rollie
id: smokeableRollie
graph: smokeableRollie
startNode: start
targetNode: rollie
category: Misc
description: "A roll of dried plant matter wrapped in thin paper."
icon: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png
objectType: Item
- type: construction
name: cigarette
id: smokeableCigarette
graph: smokeableCigarette
startNode: start
targetNode: cigarette
category: Misc
description: "A roll of tobacco and nicotine."
icon: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-icon.png
objectType: Item
# I wanted to put a hand-grinder here but we need construction graphs that use non-consumed catalysts first.
- type: construction
name: ground cannabis
id: smokeableGroundCannabis
graph: smokeableGroundCannabis
startNode: start
targetNode: ground
category: Misc
description: "Ground cannabis, ready to take you on a trip."
icon: Objects/Misc/reageant_fillings.rsi/powderpile.png
# color: darkgreen
objectType: Item
- type: construction
name: ground tobacco
id: smokeableGroundTobacco
graph: smokeableGroundTobacco
startNode: start
targetNode: ground
category: Misc
description: "Ground tobacco, perfect for hand-rolled cigarettes."
icon: Objects/Misc/reageant_fillings.rsi/powderpile.png
# color: brown
objectType: Item