Fix/improve smokeables (#10497)

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

@@ -5,7 +5,7 @@
   description: A roll of dried plant matter wrapped in thin paper.
   components:
   - type: Sprite
-    sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
+    sprite: Objects/Consumable/Smokeables/Cannabis/joint.rsi
     netsync: false
     state: unlit-icon
   - type: Tag
@@ -15,7 +15,7 @@
   - type: Recyclable
   - type: SpaceGarbage
   - type: Clothing
-    sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
+    sprite: Objects/Consumable/Smokeables/Cannabis/joint.rsi
     slots: [ mask ]
     equippedPrefix: unlit
   - type: Item
@@ -38,7 +38,7 @@
   description: A roll of dried plant matter wrapped in a dried tobacco leaf.
   components:
   - type: Sprite
-    sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
+    sprite: Objects/Consumable/Smokeables/Cannabis/blunt.rsi
     netsync: false
     state: unlit-icon
   - type: Tag
@@ -48,7 +48,7 @@
   - type: Recyclable
   - type: SpaceGarbage
   - type: Clothing
-    sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi
+    sprite: Objects/Consumable/Smokeables/Cannabis/blunt.rsi
     slots: [ mask ]
     equippedPrefix: unlit
   - type: Item

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

@@ -43,12 +43,13 @@
   id: PaperRolling
   name: rolling paper
   description: A thin piece of paper used to make fine smokeables.
+  suffix: Full
   parent: BaseItem
   components:
   - type: Stack
     stackType: PaperRolling
     max: 5
-    count: 1
+    count: 5
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
     state: cigpaper
@@ -62,16 +63,25 @@
   - type: Recyclable
   - type: SpaceGarbage
 
+- type: entity
+  id: PaperRolling1
+  suffix: Single
+  parent: PaperRolling
+  components:
+    - type: Stack
+      count: 1
+
 - type: entity
   id: CigaretteFilter
   name: cigarette filter
   description: A strip of firm paper used as a filter for handmade cigarettes.
+  suffix: Full
   parent: BaseItem
   components:
   - type: Stack
     stackType: CigaretteFilter
     max: 5
-    count: 1
+    count: 5
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
     state: cigfilter
@@ -83,3 +93,11 @@
     - CigFilter
     - Trash
   - type: Recyclable
+
+- type: entity
+  id: CigaretteFilter1
+  suffix: Single
+  parent: CigaretteFilter
+  components:
+    - type: Stack
+      count: 1

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

@@ -55,7 +55,7 @@
         - ReagentId: THC
           Quantity: 10
   - type: Sprite
-    sprite: Objects/Misc/reageant_fillings.rsi
+    sprite: Objects/Misc/reagent_fillings.rsi
     state: powderpile
     color: darkgreen
   - type: Construction
@@ -110,7 +110,7 @@
         - ReagentId: Nicotine
           Quantity: 10
   - type: Sprite
-    sprite: Objects/Misc/reageant_fillings.rsi
+    sprite: Objects/Misc/reagent_fillings.rsi
     state: powderpile
     color: brown
   - type: Construction

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

@@ -6,22 +6,9 @@
       edges:
         - to: joint
           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
+            - material: PaperRolling
+            - material: CigaretteFilter
+            - material: GroundCannabis
               doAfter: 2
     - node: joint
       entity: Joint
@@ -34,22 +21,8 @@
       edges:
         - to: blunt
           steps:
-            - prototype: LeavesTobaccoDried
-              icon:
-                sprite: Objects/Specific/Hydroponics/tobacco.rsi
-                state: dried
-              name: dried tobacco leaves
-            - 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
+            - material: LeavesTobaccoDried
+            - material: GroundCannabis
               doAfter: 2
     - node: blunt
       entity: Blunt
@@ -62,22 +35,9 @@
       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
+            - material: PaperRolling
+            - material: CigaretteFilter
+            - material: GroundTobacco
               doAfter: 2
     - node: cigarette
       entity: Cigarette
@@ -107,6 +67,5 @@
           - material: LeavesTobaccoDried
             amount: 2
             doAfter: 5
-
     - node: ground
       entity: GroundTobacco

Resources/Prototypes/Recipes/Crafting/smokeables.yml

@@ -6,7 +6,7 @@
   targetNode: joint
   category: construction-category-misc
   description: "A roll of dried plant matter wrapped in thin paper."
-  icon: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png
+  icon: Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-icon.png
   objectType: Item
 
 - type: construction
@@ -17,7 +17,7 @@
   targetNode: blunt
   category: construction-category-misc
   description: "A roll of dried plant matter wrapped in a dried tobacco leaf."
-  icon: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png
+  icon: Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-icon.png
   objectType: Item
 
 - type: construction
@@ -41,7 +41,7 @@
   targetNode: ground
   category: construction-category-misc
   description: "Ground cannabis, ready to take you on a trip."
-  icon: Objects/Misc/reageant_fillings.rsi/powderpile.png
+  icon: Objects/Misc/reagent_fillings.rsi/powderpile.png
 #    color: darkgreen
   objectType: Item
 
@@ -53,6 +53,6 @@
   targetNode: ground
   category: construction-category-misc
   description: "Ground tobacco, perfect for hand-rolled cigarettes."
-  icon: Objects/Misc/reageant_fillings.rsi/powderpile.png
+  icon: Objects/Misc/reagent_fillings.rsi/powderpile.png
 #    color: brown
   objectType: Item

Resources/Prototypes/Stacks/consumable_stacks.yml

@@ -17,30 +17,36 @@
 
 - type: stack
   id: PaperRolling
-  name: paper rolling
+  name: rolling paper
+  icon: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpaper.png
   spawn: PaperRolling
 
 - type: stack
   id: CigaretteFilter
   name: cigarette filter
+  icon: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigfilter.png
   spawn: CigaretteFilter
 
 - type: stack
   id: GroundTobacco
   name: ground tobacco
+  icon: /Textures/Objects/Misc/reagent_fillings.rsi/powderpile.png
   spawn: GroundTobacco
 
 - type: stack
   id: GroundCannabis
   name: ground cannabis
+  icon: /Textures/Objects/Misc/reagent_fillings.rsi/powderpile.png
   spawn: GroundCannabis
 
 - type: stack
   id: LeavesTobaccoDried
   name: dried tobacco leaves
+  icon: /Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png
   spawn: LeavesTobaccoDried
 
 - type: stack
   id: LeavesCannabisDried
   name: dried cannabis leaves
+  icon: /Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png
   spawn: LeavesCannabisDried

Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json

@@ -0,0 +1,182 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Adapted 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
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/meta.json

@@ -1,4 +1,4 @@
-{
+{
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",