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>

Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs

@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.UserInterface.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;

Content.Server/GameObjects/Components/Items/Storage/StorageCounterComponent.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 
 using System.Collections.Generic;
 using Content.Shared.GameObjects.Components;

Content.Shared/GameObjects/Components/SharedStackComponent.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
@@ -137,6 +137,12 @@ namespace Content.Shared.GameObjects.Components
         FloorTileWhite,
         FloorTileDark,
         FloorTileWood,
-        MetalRod
+        MetalRod,
+        PaperRolling,
+        CigaretteFilter,
+        GroundTobacco,
+        GroundCannabis,
+        LeavesTobaccoDried,
+        LeavesCannabisDried
     }
 }

Resources/Prototypes/Catalog/Cargo/cargo_service.yml

@@ -21,3 +21,15 @@
   cost: 1000
   category: Service
   group: market
+
+- type: cargoProduct
+  name: "lung cancer crate"
+  id: cargo.servicesmokeables
+  description: "Tired of a quick death on the station? Order this crate and chain-smoke your way to a coughy demise!"
+  icon:
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
+    state: closed
+  product: CrateServiceSmokeables
+  cost: 2000
+  category: Service
+  group: market

Resources/Prototypes/Catalog/Fills/lockers.yml

@@ -97,6 +97,8 @@
         prob: 1
       - name: SupplyComputerCircuitboard
         prob: 1
+      - name: CigPackGreen
+        prob: 0.50
 
 - type: entity
   id: LockerCaptainFilled
@@ -129,6 +131,8 @@
         prob: 1
       - name: PlushieNuke
         prob: 0.1
+      - name: CigarGoldCase
+        prob: 0.25
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
@@ -155,6 +159,9 @@
         prob: 0.7
       - name: PlushieLizard
         prob: 0.1
+      - name: CigarGoldCase
+        prob: 0.10
+        # Fuck the HoP they don't deserve fucking cigars.
 
 - type: entity
   id: LockerChiefEngineerFilled
@@ -171,6 +178,8 @@
       - name: ClothingEyesGlassesMeson
       - name: ClothingBeltChiefEngineerFilled
       - name: ClothingHeadHatBeretEngineering
+      - name: CigarCase
+        prob: 0.15
 
 - type: entity
   id: LockerElectricalSuppliesFilled
@@ -393,7 +402,8 @@
         prob: 1
       - name: ClothingShoesBootsJack
         prob: 1
-
+      - name: CigarGoldCase
+        prob: 0.50
 
 - type: entity
   id: LockerWardenFilled

Resources/Prototypes/Catalog/VendingMachines/cigs.yml

@@ -5,5 +5,9 @@
   animationDuration: 2.1
   spriteName: cigs
   startingInventory:
-    CigarettePack: 20
+    CigPackGreen: 2
-    Matchbox: 10
+    CigPackRed: 2
+    CigPackBlue: 2
+    CigPackBlack: 2
+    CigarCase: 1
+    Matchbox: 5

Resources/Prototypes/Datasets/Names/rollie.yml

@@ -0,0 +1,42 @@
+- type: dataset
+  id: names_rollie
+  values:
+  - "bifta"
+  - "bifter"
+  - "bird"
+  - "blunt"
+  - "bloint"
+  - "boof"
+  - "boofer"
+  - "bomber"
+  - "bone"
+  - "bun"
+  - "doink"
+  - "doob"
+  - "doober"
+  - "doobie"
+  - "dutch"
+  - "fatty"
+  - "hogger"
+  - "hooter"
+  - "hootie"
+  - "jay"
+  - "jimmy"
+  - "joint"
+  - "juju"
+  - "jeebie weebie"
+  - "number"
+  - "owl"
+  - "phattie"
+  - "puffer"
+  - "reef"
+  - "reefer"
+  - "rollie"
+  - "scoobie"
+  - "shorty"
+  - "spiff"
+  - "spliff"
+  - "toke"
+  - "torpedo"
+  - "zoot"
+  - "zooter"

Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_service.yml

@@ -31,3 +31,29 @@
         amount: 1
       - name: BoxLightbulb
         amount: 1
+
+- type: entity
+  id: CrateServiceSmokeables
+  name: smokeables crate
+  description: "Tired of a quick death on the station? Order this crate and chain-smoke your way to a coughy demise!"
+  parent: CrateGenericonimo
+  components:
+  - type: StorageFill
+    contents:
+      - name: CigCartonGreen
+        prob: 0.50
+        orGroup: CigCarton1
+      - name: CigCartonRed
+        orGroup: CigCarton1
+      - name: CigCartonBlue
+        prob: 0.50
+        orGroup: CigCarton2
+      - name: CigCartonBlack
+        orGroup: CigCarton2
+      - name: CigarGoldCase
+        prob: 0.05
+        orGroup: Cigars
+      - name: CigarCase
+        orGroup: Cigars
+      - name: Matchbox
+        amount: 2

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml

@@ -0,0 +1,21 @@
+- type: entity
+  id: Rollie
+  parent: BaseSmokeable
+  name: blunt
+  description: "A roll of dried plant matter wrapped in thin paper."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
+      netsync: false
+      state: unlit-icon
+    - type: Tag
+      tags:
+        - Cigarette
+    - type: Clothing
+      sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
+      Slots: [ mask ]
+      HeldPrefix: unlit
+      size: 1
+    - type: Construction
+      graph: smokeableRollie
+      node: rollie

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml

@@ -0,0 +1,73 @@
+- type: entity
+  id: CigCartonGreen
+  parent: BoxBase
+  name: Spessman's Smokes carton
+  description: "A carton containing 6 packets of Spessman's Smokes."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
+      layers:
+        - state: closed
+    - type: Storage
+      capacity: 36
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
+    - type: StorageFill
+      contents:
+        - name: CigPackGreen
+          amount: 6
+    - type: Appearance
+      visuals:
+        - type: BagOpenCloseVisualizer
+          openIcon: open
+
+- type: entity
+  id: CigCartonRed
+  parent: CigCartonGreen
+  name: Dromedaryco carton
+  description: "A carton containing 6 packets of Dromedarycos."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
+      layers:
+        - state: closed
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
+    - type: StorageFill
+      contents:
+        - name: CigPackRed
+          amount: 6
+
+- type: entity
+  id: CigCartonBlue
+  parent: CigCartonGreen
+  name: AcmeCo carton
+  description: "A carton containing 6 packets of AcmeCo."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
+      layers:
+        - state: closed
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
+    - type: StorageFill
+      contents:
+        - name: CigPackBlue
+          amount: 6
+
+- type: entity
+  id: CigCartonBlack
+  parent: CigCartonGreen
+  name: Nomads carton
+  description: "A carton containing 6 packets of Nomads."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
+      layers:
+        - state: closed
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
+    - type: StorageFill
+      contents:
+        - name: CigPackBlack
+          amount: 6

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml

@@ -0,0 +1,25 @@
+- type: Tag
+  id: Cigarette
+
+- type: entity
+  id: Cigarette
+  parent: BaseSmokeable
+  name: cigarette
+  description: "A roll of tobacco and nicotine."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+      netsync: false
+      state: unlit-icon
+    - type: Tag
+      tags:
+        - Cigarette
+    - type: Clothing
+      netsync: false
+      sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+      Slots: [ mask ]
+      HeldPrefix: unlit
+      size: 1
+    - type: Construction
+      graph: smokeableCigarette
+      node: cigarette

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml

@@ -0,0 +1,88 @@
+- type: entity
+  id: CigPackBase
+  parent: BaseItem
+  name: cigarette pack
+  abstract: true
+  components:
+    - type: Sprite
+      netsync: false
+      state: closed
+    - type: Storage
+      capacity: 6
+    - type: Item
+      size: 6
+    - type: StorageFill
+      contents:
+        - name: Cigarette
+          amount: 6
+    - type: StorageCounter
+      countTag: Cigarette
+    - type: Appearance
+      visuals:
+        - type: BagOpenCloseVisualizer
+          openIcon: open
+        - type: StackVisualizer
+          composite: true
+          stackLayers:
+            - cig1
+            - cig2
+            - cig3
+            - cig4
+            - cig5
+            - cig6
+
+- type: entity
+  id: CigPackGreen
+  parent: CigPackBase
+  name: Spessman's Smokes packet
+  description: "A label on the packaging reads, 'Wouldn't a slow death make a change?'"
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
+      layers:
+        - state: closed
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
+      size: 6
+
+- type: entity
+  id: CigPackRed
+  parent: CigPackBase
+  name: DromedaryCo packet
+  description: "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
+      layers:
+        - state: closed
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
+      size: 6
+
+- type: entity
+  id: CigPackBlue
+  parent: CigPackBase
+  name: AcmeCo packet
+  description: "For those who somehow want to obtain the record for the most amount of cancerous tumors."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
+      layers:
+        - state: closed
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
+      size: 6
+
+- type: entity
+  id: CigPackBlack
+  parent: CigPackBase
+  name: Nomads packet
+  description: "Nomads's extra strong, for when your life is more extra hard."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
+      layers:
+        - state: closed
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
+      size: 6

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml

@@ -0,0 +1,50 @@
+- type: entity
+  parent: BaseItem
+  name: pack of rolling paper
+  id: PackPaperRolling
+  description: "A pack of thin pieces of paper used to make fine smokeables."
+  components:
+    # I know but it just works.
+  - type: FoodContainer
+    prototypes:
+      PaperRolling: 100
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+    state: cigpapers
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+    state: cigpapers
+
+- type: entity
+  id: PaperRolling
+  name: rolling paper
+  description: "A thin piece of paper used to make fine smokeables."
+  parent: BaseItem
+  components:
+    - type: Stack
+      stacktype: enum.StackType.PaperRolling
+      max: 5
+      count: 1
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+      state: cigpaper
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+      state: cigpaper
+
+- type: entity
+  id: CigaretteFilter
+  name: cigarette filter
+  description: "A strip of firm paper used as a filter for handmade cigarettes."
+  parent: BaseItem
+  components:
+    - type: Stack
+      stacktype: enum.StackType.CigaretteFilter
+      max: 5
+      count: 1
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+      state: cigfilter
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+      state: cigfilter

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml

@@ -0,0 +1,48 @@
+- type: entity
+  id: CigarCase
+  parent: BaseItem
+  name: cigar case
+  description: "A case for holding your cigars when you are not smoking them."
+  components:
+    - type: Sprite
+      netsync: false
+      sprite: Objects/Consumable/Smokeables/Cigars/case.rsi
+      layers:
+        - state: closed
+    - type: Storage
+      capacity: 8
+    - type: Item
+      sprite: Objects/Consumable/Smokeables/Cigars/case.rsi
+      size: 8
+    - type: StorageFill
+      contents:
+        - name: Cigar
+          amount: 8
+    - type: StorageCounter
+      countTag: Cigar
+    - type: Appearance
+      visuals:
+        - type: BagOpenCloseVisualizer
+          openIcon: open
+        - type: StackVisualizer
+          composite: true
+          stackLayers:
+            - cigar1
+            - cigar2
+            - cigar3
+            - cigar4
+            - cigar5
+            - cigar6
+            - cigar7
+            - cigar8
+
+- type: entity
+  id: CigarGoldCase
+  parent: CigarCase
+  name: premium cigar case
+  description: "A case of premium Havanian cigars. You'll only see heads with these."
+  components:
+    - type: StorageFill
+      contents:
+        - name: CigarGold
+          amount: 8

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml

@@ -0,0 +1,39 @@
+- type: Tag
+  id: Cigar
+
+- type: entity
+  id: Cigar
+  parent: BaseSmokeable
+  name: cigar
+  description: "A brown roll of tobacco and... well, you're not quite sure."
+  components:
+    - type: Smoking
+      duration: 70
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
+      netsync: false
+      state: unlit-icon
+    - type: Tag
+      tags:
+        - Cigar
+    - type: Clothing
+      sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
+      Slots: [ mask ]
+      HeldPrefix: unlit
+      size: 1
+
+- type: entity
+  id: CigarGold
+  parent: Cigar
+  name: premium Havanian cigar
+  description: "A cigar fit for only the best of the best."
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
+      netsync: false
+      state: unlit-icon
+    - type: Clothing
+      sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
+      Slots: [ mask ]
+      HeldPrefix: unlit
+      size: 1

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base.yml

@@ -0,0 +1,11 @@
+- type: entity
+  description: "If you want to get cancer, might as well do it in style."
+  id: BaseSmokeable
+  parent: BaseItem
+  abstract: true
+  components:
+    - type: Smoking
+      duration: 50
+    - type: Appearance
+      visuals:
+        - type: BurnStateVisualizer

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/pipes.yml

@@ -0,0 +1,17 @@
+- type: entity
+  id: SmokingPipe
+  parent: BaseSmokeable
+  name: smoking pipe
+  description: "A pipe, for smoking. Probably made of meershaum or something."
+  components:
+    - type: Smoking
+      duration: 70
+    - type: Sprite
+      sprite: Objects/Consumable/Smokeables/Pipes/pipe.rsi
+      netsync: false
+      state: unlit-icon
+    - type: Clothing
+      sprite: Objects/Consumable/Smokeables/Pipes/pipe.rsi
+      Slots: [ mask ]
+      HeldPrefix: unlit
+      size: 1

Resources/Prototypes/Entities/Objects/Consumable/fancy.yml

@@ -1,62 +0,0 @@
-- type: Tag
-  id: Cigarette
-- type: entity
-  name: "Base Cigarette"
-  id: BaseCigarette
-  parent: BaseItem
-  abstract: true
-  components:
-    - type: Sprite
-      sprite: Objects/Consumable/Fancy/mask_cig.rsi
-      netsync: false
-      state: icon
-    - type: Clothing
-      sprite: Objects/Consumable/Fancy/mask_cig.rsi
-      Slots: [ mask ]
-      HeldPrefix: unlit
-      size: 1
-    - type: Tag
-      tags:
-        - Cigarette
-    - type: Smoking
-      duration: 30
-    - type: Appearance
-      visuals:
-        - type: BurnStateVisualizer
-
-- type: entity
-  id: Cigarette
-  parent: BaseCigarette
-  name: cigarette
-  description: "If you want to get cancer, might as well do it in style."
-
-- type: entity
-  id: CigarettePack
-  parent: SmallboxItem
-  name: cigarette pack
-  description: "Pack of cigarettes"
-  components:
-    - type: Sprite
-      sprite: Objects/Consumable/Fancy/cigarettes.rsi
-      netsync: false
-      layers:
-        - state: cig
-    - type: StorageFill
-      contents:
-        - name: Cigarette
-          amount: 6
-    - type: StorageCounter
-      countTag: Cigarette
-    - type: Appearance
-      visuals:
-        - type: BagOpenCloseVisualizer
-          openIcon: cig_open
-        - type: StackVisualizer
-          composite: true
-          stackLayers:
-            - cigarette_1
-            - cigarette_2
-            - cigarette_3
-            - cigarette_4
-            - cigarette_5
-            - cigarette_6

Resources/Prototypes/Entities/Objects/Misc/box.yml

@@ -4,6 +4,7 @@
   abstract: true
   components:
   - type: Sprite
+    netsync: false
     sprite: Objects/Storage/boxes.rsi
   - type: Item
     sprite: Objects/Storage/boxes.rsi

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml

@@ -247,3 +247,117 @@
       sprite: Objects/Specific/Hydroponics/chanterelle.rsi
     - type: Produce
       seed: chanterelle
+
+# Leaves
+
+- type: entity
+  name: cannabis leaves
+  parent: ProduceBase
+  id: LeavesCannabis
+  description: "Recently legalized in most galaxies."
+  components:
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/cannabis.rsi
+    - type: Produce
+      seed: cannabis
+    - type: Food
+    - type: SolutionContainer
+      contents:
+        reagents:
+          - ReagentId: chem.THCOil
+            Quantity: 5
+
+- type: entity
+  name: dried cannabis leaves
+  parent: BaseItem
+  id: LeavesCannabisDried
+  description: "Dried cannabis leaves, ready to be ground."
+  components:
+    - type: Stack
+      stacktype: enum.StackType.LeavesCannabisDried
+      max: 5
+      count: 1
+    - type: SolutionContainer
+      contents:
+        reagents:
+          - ReagentId: chem.THC
+            Quantity: 2
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/tobacco.rsi
+      state: dried
+
+- type: entity
+  name: ground cannabis
+  parent: BaseItem
+  id: GroundCannabis
+  description: "Ground cannabis, ready to take you on a trip."
+  components:
+    - type: Stack
+      stacktype: enum.StackType.GroundCannabis
+      max: 5
+      count: 1
+    - type: SolutionContainer
+      contents:
+        reagents:
+          - ReagentId: chem.THC
+            Quantity: 10
+    - type: Sprite
+      sprite: Objects/Misc/reageant_fillings.rsi
+      state: powderpile
+      color: darkgreen
+    - type: Construction
+      graph: smokeableGroundCannabis
+      node: ground
+
+- type: entity
+  name: tobacco leaves
+  parent: ProduceBase
+  id: LeavesTobacco
+  description: "Dry them out to make some smokes."
+  components:
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/tobacco.rsi
+    - type: Produce
+      seed: tobacco
+
+- type: entity
+  name: dried tobacco leaves
+  parent: BaseItem
+  id: LeavesTobaccoDried
+  description: "Dried tobacco leaves, ready to be ground."
+  components:
+    - type: Stack
+      stacktype: enum.StackType.LeavesTobaccoDried
+      max: 5
+      count: 1
+    - type: SolutionContainer
+      contents:
+        reagents:
+          - ReagentId: chem.Nicotine
+            Quantity: 2
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/tobacco.rsi
+      state: dried
+
+- type: entity
+  name: ground tobacco
+  parent: BaseItem
+  id: GroundTobacco
+  description: "Ground tobacco, perfect for hand-rolled cigarettes."
+  components:
+    - type: Stack
+      stacktype: enum.StackType.GroundTobacco
+      max: 5
+      count: 1
+    - type: SolutionContainer
+      contents:
+        reagents:
+          - ReagentId: chem.Nicotine
+            Quantity: 10
+    - type: Sprite
+      sprite: Objects/Misc/reageant_fillings.rsi
+      state: powderpile
+      color: brown
+    - type: Construction
+      graph: smokeableGroundTobacco
+      node: ground

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

@@ -140,3 +140,25 @@
       seed: eggy
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/eggy.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of tobacco seeds
+  description: "These seeds grow into tobacco plants."
+  id: TobaccoSeeds
+  components:
+    - type: Seed
+      seed: tobacco
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/tobacco.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of cannabis seeds
+  description: "Taxable."
+  id: CannabisSeeds
+  components:
+    - type: Seed
+      seed: cannabis
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/cannabis.rsi

Resources/Prototypes/Hydroponics/seeds.yml

@@ -286,3 +286,49 @@
       Min: 1
       Max: 10
       PotencyDivisor: 10
+
+- type: seed
+  id: cannabis
+  name: cannabis
+  seedName: cannabis
+  displayName: cannabis
+  plantRsi: Objects/Specific/Hydroponics/cannabis.rsi
+  productPrototypes:
+    - LeavesCannabis
+  harvestRepeat: Repeat
+  lifespan: 75
+  maturation: 8
+  production: 12
+  yield: 2
+  potency: 20
+  growthStages: 3
+  idealLight: 9
+  idealHeat: 298
+  chemicals:
+    chem.THC:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+
+- type: seed
+  id: tobacco
+  name: tobacco
+  seedName: tobacco
+  displayName: tobacco plant
+  plantRsi: Objects/Specific/Hydroponics/tobacco.rsi
+  productPrototypes:
+    - LeavesTobacco
+  harvestRepeat: Repeat
+  lifespan: 75
+  maturation: 5
+  production: 5
+  yield: 2
+  potency: 20
+  growthStages: 3
+  idealLight: 9
+  idealHeat: 298
+  chemicals:
+    chem.Nicotine:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10

Resources/Prototypes/Reagents/botany.yml

@@ -80,3 +80,25 @@
       amount: 4
     - !type:AdjustWeeds
       amount: -6
+
+- type: reagent
+  id: chem.THC
+  name: THC
+  desc: The main psychoactive compound in cannabis.
+  color: "#808080"
+  physicalDesc: crystalline
+  plantMetabolism:
+    - !type:AdjustNutrition
+      amount: -5
+    - !type:AdjustHealth
+      amount: -1
+
+- type: reagent
+  id: chem.Nicotine
+  name: Nicotine
+  desc: Dangerous and highly addictive.
+  color: "#C0C0C0"
+  physicalDesc: strong smelling
+  plantMetabolism:
+    - !type:AdjustHealth
+      amount: -5

Resources/Prototypes/Reagents/medicine.yml

@@ -305,3 +305,10 @@
   desc: An illegal compound which induces a number of effects such as loss of balance and visual artefacts.
   physicalDesc: syrupy
   color: "#63806e"
+
+- type: reagent
+  id: chem.THCOil
+  name: THC oil
+  desc: Pure THC oil, extracted from the leaves of the cannabis plant. Much stronger than in it's natural form and can be used to numb chronic pain in patients.
+  physicalDesc: skunky
+  color: "#DAA520"

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -334,12 +334,20 @@
   solids:
     FoodMiloSoup: 1
 
-#Handy template for copy **pasta**. Get it? Pasta? Aw whatever fuck you.
+# NOT ACTUAL FOOD
-# - type: microwaveMealRecipe
-#   id:
-#   name:
-#   result:
-#   time: 5
-#   reagents:
 
-#   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

Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml

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

Resources/Prototypes/Recipes/Crafting/smokeables.yml

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

Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/meta.json

@@ -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"
-    }
-  ]
-}

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json

@@ -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
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json

@@ -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
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json

@@ -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
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json

@@ -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
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json

@@ -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
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json

@@ -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
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json

@@ -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
+    }
+  ]
+}