diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
index a7f6dbd76d..dfbf2c1c9d 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
@@ -5,6 +5,7 @@
     CigPackRed: 2
     CigPackBlue: 2
     CigPackBlack: 2
+    CigPackMixed: 2
     CigarCase: 1
     SmokingPipeFilledTobacco: 1
     Vape: 1
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
index 2ae53cad2b..4d0b442c46 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -1,79 +1,97 @@
-- type: entity
-  id: CigCartonGreen
-  parent: [ BoxCardboard, BaseBagOpenClose ]
-  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
-      - state: open
-        map: ["openLayer"]
-  - type: Storage
-    capacity: 36
-  - type: Item
-    sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
-    size: 36
-  - type: StorageFill
-    contents:
-      - id: CigPackGreen
-        amount: 6
-  - type: Tag
-    tags:
-    - Trash
-  - type: PhysicalComposition
-    materialComposition:
-      Plastic: 50
-  - type: SpaceGarbage
-
-- 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:
-      - id: 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:
-      - id: 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:
-      - id: CigPackBlack
-        amount: 6
+- type: entity
+  id: CigCartonGreen
+  parent: [ BoxCardboard, BaseBagOpenClose ]
+  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
+      - state: open
+        map: ["openLayer"]
+  - type: Storage
+    capacity: 36
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
+    size: 36
+  - type: StorageFill
+    contents:
+      - id: CigPackGreen
+        amount: 6
+  - type: Tag
+    tags:
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 50
+  - type: SpaceGarbage
+
+- 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:
+      - id: 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:
+      - id: 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:
+      - id: CigPackBlack
+        amount: 6
+
+- type: entity
+  id: CigCartonMixed
+  parent: CigCartonGreen
+  name: Dan's soaked smokes
+  description: A carton containg 3 packets of Dan's soaked smokes.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
+    layers:
+      - state: closed
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi
+  - type: StorageFill
+    contents:
+      - id: CigPackMixedMedical
+      - id: CigPackMixed
+      - id: CigPackMixedNasty
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index cb58637be3..d46e787838 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -1,53 +1,405 @@
-- type: entity
-  id: Cigarette
-  parent: BaseCigar
-  name: cigarette
-  description: A roll of tobacco and nicotine.
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
-    state: unlit-icon
-  - type: Tag
-    tags:
-      - Cigarette
-      - Trash
-  - type: SpaceGarbage
-  - type: Clothing
-    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
-    slots: [ mask ]
-    equippedPrefix: unlit
-  - type: Item
-    size: 1
-  - type: Construction
-    graph: smokeableCigarette
-    node: cigarette
-
-- type: entity
-  id: CigaretteSpent
-  parent: Cigarette
-  suffix: spent
-  components:
-  - type: Sprite
-    state: burnt-icon
-  - type: Smokable
-    state: Burnt
-  - type: SolutionContainerManager
-    solutions:
-      smokable:
-        maxVol: 20
-
-- type: entity
-  id: CigaretteSyndicate
-  suffix: syndicate
-  parent: Cigarette
-  name: cigarette
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      smokable:
-        maxVol: 40
-        reagents:
-          - ReagentId: Nicotine
-            Quantity: 10
-          - ReagentId: Omnizine
-            Quantity: 30
+- type: entity
+  id: Cigarette
+  parent: BaseCigar
+  name: cigarette
+  description: A roll of tobacco and nicotine.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+    state: unlit-icon
+  - type: Tag
+    tags:
+      - Cigarette
+      - Trash
+  - type: SpaceGarbage
+  - type: Clothing
+    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+    slots: [ mask ]
+    equippedPrefix: unlit
+  - type: Item
+    size: 1
+  - type: Construction
+    graph: smokeableCigarette
+    node: cigarette
+
+- type: entity
+  id: SoakedCigarette
+  parent: BaseCigar
+  name: cigarette
+  description: A roll of tobacco and nicotine soaked in some chemical.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+    state: unlit-icon
+  - type: Tag
+    tags:
+      - Cigarette
+      - Trash
+  - type: SpaceGarbage
+  - type: Clothing
+    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+    slots: [ mask ]
+    equippedPrefix: unlit
+  - type: Item
+    size: 1
+  - type: Construction
+    graph: smokeableCigarette
+    node: cigarette
+
+- type: entity
+  id: CigaretteSpent
+  parent: Cigarette
+  suffix: spent
+  components:
+  - type: Sprite
+    state: burnt-icon
+  - type: Smokable
+    state: Burnt
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
+
+- type: entity
+  id: CigaretteSyndicate
+  suffix: syndicate
+  parent: Cigarette
+  name: cigarette
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Omnizine
+            Quantity: 30
+
+- type: entity
+  id: CigaretteOmnizine
+  parent: SoakedCigarette
+  name: Hot Dog Water Flavor Explosion
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Omnizine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteIron
+  parent: SoakedCigarette
+  name: Rusty Orange Baja Blast
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Iron
+            Quantity: 10
+
+- type: entity
+  id: CigaretteTricordrazine
+  parent: SoakedCigarette
+  name: Licorice Allsorts
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Tricordrazine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteDylovene
+  parent: SoakedCigarette
+  name: Urinal Cake Disolver
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Dylovene
+            Quantity: 10
+
+- type: entity
+  id: CigaretteDermaline
+  parent: SoakedCigarette
+  name: Aloe Peanut Butter Medley
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Dylovene
+            Quantity: 10
+
+- type: entity
+  id: CigaretteArithrazine
+  parent: SoakedCigarette
+  name: Roman Pipe Works
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Arithrazine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteIpecac
+  parent: SoakedCigarette
+  name: Grandma's Christmas Fruitcake
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Ipecac
+            Quantity: 2
+
+- type: entity
+  id: CigaretteBicaridine
+  parent: SoakedCigarette
+  name: Wet Dog Enhanced Cigarette
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Bicaridine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteDexalin
+  parent: SoakedCigarette
+  name: Rocky Mountain Musk
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Dexalin
+            Quantity: 10
+
+- type: entity
+  id: CigarettePax
+  parent: SoakedCigarette
+  name: Switzerland Express
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Pax
+            Quantity: 2
+
+- type: entity
+  id: CigaretteBbqSauce
+  parent: SoakedCigarette
+  name: Spicy Wood Aroma
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: BbqSauce
+            Quantity: 10
+
+- type: entity
+  id: CigaretteBlackPepper
+  parent: SoakedCigarette
+  name: English Spice
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Blackpepper
+            Quantity: 10
+
+- type: entity
+  id: CigaretteCapsaicinOil
+  parent: SoakedCigarette
+  name: Chilly P
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: CapsaicinOil
+            Quantity: 10
+
+- type: entity
+  id: CigaretteBread
+  parent: SoakedCigarette
+  name: Double Toasted
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+
+- type: entity
+  id: CigaretteMilk
+  parent: SoakedCigarette
+  name: Bovine Extract
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Milk
+            Quantity: 10
+
+- type: entity
+  id: CigaretteBanana
+  parent: SoakedCigarette
+  name: Clown Adjancency Bonus
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: BananaHonk
+            Quantity: 10
+
+- type: entity
+  id: CigaretteSpaceDrugs
+  parent: SoakedCigarette
+  name: 80's Power Hour
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: SpaceDrugs
+            Quantity: 10
+
+- type: entity
+  id: CigaretteMuteToxin
+  parent: SoakedCigarette
+  name: Mixed Lozenges
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: MuteToxin
+            Quantity: 2
+
+- type: entity
+  id: CigaretteMold
+  parent: SoakedCigarette
+  name: Beneath The Sink Experience
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Mold
+            Quantity: 2
+
+- type: entity
+  id: CigaretteLicoxide
+  parent: SoakedCigarette
+  name: Wake Up Call
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: Licoxide
+            Quantity: 5
+
+- type: entity
+  id: CigaretteWeldingFuel
+  parent: SoakedCigarette
+  name: Plasma Sauce
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: WeldingFuel
+            Quantity: 5
+
+- type: entity
+  id: CigaretteTHC
+  parent: SoakedCigarette
+  name: Hippy Romance Novel
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: THC
+            Quantity: 5
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index bca512c2bd..1d161b160a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -1,123 +1,274 @@
-- type: entity
-  id: CigPackBase
-  parent: [ BaseStorageItem, BaseBagOpenClose ]
-  name: cigarette pack
-  abstract: true
-  components:
-  - type: Sprite
-    layers:
-    - state: closed
-    - state: open
-      map: ["openLayer"]
-      visible: false
-    - state: cig1
-      map: ["cig1"]
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
-      visible: false
-    - state: cig2
-      map: ["cig2"]
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
-      visible: false
-    - state: cig3
-      map: ["cig3"]
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
-      visible: false
-    - state: cig4
-      map: ["cig4"]
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
-      visible: false
-    - state: cig5
-      map: ["cig5"]
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
-      visible: false
-    - state: cig6
-      map: ["cig6"]
-      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
-      visible: false
-  - type: Tag
-    tags:
-    - CigPack
-    - Trash
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 50
-  - type: SpaceGarbage
-  - type: Storage
-    capacity: 5
-  - type: Item
-    size: 5
-  - type: StorageFill
-    contents:
-    - id: Cigarette
-      amount: 5
-  - type: ItemCounter
-    count:
-      tags: [Cigarette]
-    composite: true
-    layerStates:
-    - cig1
-    - cig2
-    - cig3
-    - cig4
-    - cig5
-    - cig6
-  - type: Appearance
-
-- 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
-  - type: Item
-    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
-
-- 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
-  - type: Item
-    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
-
-- 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
-  - type: Item
-    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
-
-- 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
-  - type: Item
-    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
-
-- type: entity
-  id: CigPackSyndicate
-  parent: CigPackBase
-  name: Interdyne herbals packet
-  description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves.
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
-  - type: Item
-    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
-  - type: StorageFill
-    contents:
-    - id: CigaretteSyndicate
-      amount: 5
+- type: entity
+  id: CigPackBase
+  parent: [ BaseStorageItem, BaseBagOpenClose ]
+  name: cigarette pack
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: closed
+    - state: open
+      map: ["openLayer"]
+      visible: false
+    - state: cig1
+      map: ["cig1"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig2
+      map: ["cig2"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig3
+      map: ["cig3"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig4
+      map: ["cig4"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig5
+      map: ["cig5"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig6
+      map: ["cig6"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+  - type: Tag
+    tags:
+    - CigPack
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+  - type: SpaceGarbage
+  - type: Storage
+    capacity: 5
+  - type: Item
+    size: 5
+  - type: StorageFill
+    contents:
+    - id: Cigarette
+      amount: 5
+  - type: ItemCounter
+    count:
+      tags: [Cigarette]
+    composite: true
+    layerStates:
+    - cig1
+    - cig2
+    - cig3
+    - cig4
+    - cig5
+    - cig6
+  - type: Appearance
+
+- type: entity
+  id: CigPackMixedBase
+  parent: [ BaseStorageItem, BaseBagOpenClose ]
+  name: soaked cigarette pack
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: closed
+    - state: open
+      map: ["openLayer"]
+      visible: false
+    - state: cig1
+      map: ["cig1"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig2
+      map: ["cig2"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig3
+      map: ["cig3"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig4
+      map: ["cig4"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig5
+      map: ["cig5"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+    - state: cig6
+      map: ["cig6"]
+      sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
+      visible: false
+  - type: Tag
+    tags:
+    - CigPack
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
+  - type: SpaceGarbage
+  - type: Storage
+    capacity: 10
+  - type: Item
+    size: 10
+  - type: StorageFill
+    contents:
+    - id: CigaretteRandom
+      amount: 10
+  - type: ItemCounter
+    count:
+      tags: [Cigarette]
+    composite: true
+    layerStates:
+    - cig1
+    - cig2
+    - cig3
+    - cig4
+    - cig5
+    - cig6
+  - type: Appearance
+
+- 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
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
+
+- 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
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
+
+- 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
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
+
+- 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
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
+
+- type: entity
+  id: CigPackSyndicate
+  parent: CigPackBase
+  name: Interdyne herbals packet
+  description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi
+  - type: StorageFill
+    contents:
+    - id: CigaretteSyndicate
+      amount: 5
+
+- type: entity
+  id: CigPackMixedMedical
+  parent: CigPackMixedBase
+  name: Dan's soaked smokes
+  description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: StorageFill
+    contents:
+    - id: CigaretteIron
+    - id: CigaretteTricordrazine
+    - id: CigaretteDylovene
+    - id: CigaretteDermaline
+    - id: CigaretteArithrazine
+    - id: CigaretteBicaridine
+    - id: CigaretteIpecac
+    - id: CigaretteOmnizine
+      prob: 0.25
+    - id: CigaretteDexalin
+      prob: 0.25
+    - id: CigarettePax
+      prob: 0.10
+
+
+- type: entity
+  id: CigPackMixed
+  parent: CigPackMixedBase
+  name: Dan's soaked smokes
+  description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: StorageFill
+    contents:
+    - id: CigaretteBbqSauce
+      prob: 0.70
+    - id: CigaretteBlackPepper
+      prob: 0.70
+    - id: CigaretteCapsaicinOil
+      prob: 0.70
+    - id: CigaretteBread
+      prob: 0.70
+    - id: CigaretteMilk
+      prob: 0.70
+    - id: CigaretteBanana
+      prob: 0.10
+    - id: CigaretteTHC
+      prob: 0.70
+    - id: CigaretteTricordrazine
+      prob: 0.25
+    - id: CigaretteSpaceDrugs
+      prob: 0.50
+    - id: CigaretteLicoxide
+      prob: 0.10
+
+- type: entity
+  id: CigPackMixedNasty
+  parent: CigPackMixedBase
+  name: Dan's soaked smokes
+  description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: Item
+    sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi
+  - type: StorageFill
+    contents:
+    - id: CigaretteSpaceDrugs
+      amount: 2
+    - id: CigaretteWeldingFuel
+      amount: 2
+    - id: CigaretteMold
+      amount: 2
+    - id: CigaretteTHC
+    - id: CigaretteLicoxide
+      prob: 0.50
+    - id: CigarettePax
+      prob: 0.10
+    - id: CigaretteMuteToxin
+      prob: 0.05
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png
new file mode 100644
index 0000000000..d0598011a3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png
new file mode 100644
index 0000000000..ea9384ff29
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png
new file mode 100644
index 0000000000..14ea17075c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json
new file mode 100644
index 0000000000..e4be1ba5f4
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.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
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png
new file mode 100644
index 0000000000..fe7e453441
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png
new file mode 100644
index 0000000000..992b30b7aa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..d49b6f112c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png
new file mode 100644
index 0000000000..d879baa48b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png
new file mode 100644
index 0000000000..4e239e6532
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json
new file mode 100644
index 0000000000..892cbe9a31
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "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": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "trash"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png
new file mode 100644
index 0000000000..5f076005e3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png
new file mode 100644
index 0000000000..874c15245b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png differ