Smoke.mp4 (#931)

* added De' Jure and Sugar Rush cigarettes

* making life easier in the future

* candy carton :)

* trying to get this to work

* !!!

* YOU CAN EAT EM NOW >:D

* added to cig machine / loot spawners

* # DeltaV (thank you Death)

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: KittenColony <[email protected]>

* thank also

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: KittenColony <[email protected]>

---------

Signed-off-by: KittenColony <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>

Resources/Prototypes/Catalog/Fills/Crates/service.yml

@@ -51,15 +51,20 @@
   - type: StorageFill
     contents:
       - id: CigCartonGreen
-        prob: 0.50
+        prob: 0.33 # DeltaV
         orGroup: CigCarton1
       - id: CigCartonRed
         orGroup: CigCarton1
       - id: CigCartonBlue
-        prob: 0.50
+        prob: 0.33 # DeltaV
         orGroup: CigCarton2
       - id: CigCartonBlack
         orGroup: CigCarton2
+      - id: CigCartonPurple # DeltaV
+        prob: 0.33
+        orGroup: CigCarton3 
+      - id: CigCartonCandy # DeltaV
+        orGroup: CigCarton3
       - id: CigarGoldCase
         prob: 0.05
         orGroup: Cigars

Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml

@@ -5,6 +5,8 @@
     CigPackRed: 2
     CigPackBlue: 2
     CigPackBlack: 2
+    CigPackPurple: 2 # DeltaV 
+    CigPackCandy: 2 # DeltaV
     CigPackMixed: 2
     CigarCase: 1
     SmokingPipeFilledTobacco: 1

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

@@ -0,0 +1,33 @@
+- type: entity
+  id: CigCartonPurple
+  parent: CigCartonGreen
+  name: De Jure carton
+  description: A carton containing 6 packets of De Jure.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi
+    layers:
+      - state: closed
+  - type: Item
+    sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi
+  - type: StorageFill
+    contents:
+      - id: CigPackPurple
+        amount: 5
+
+- type: entity
+  id: CigCartonCandy
+  parent: CigCartonGreen
+  name: Sugar Rush carton
+  description: A carton containing 6 packets of Sugar Rush.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi
+    layers:
+      - state: closed
+  - type: Item
+    sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi
+  - type: StorageFill
+    contents:
+      - id: CigPackCandy
+        amount: 5

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

@@ -0,0 +1,45 @@
+- type: entity
+  id: CigaretteOlive
+  suffix: olive
+  parent: Cigarette
+  name: cigarette
+  description: A roll of tobacco and nicotine soaked in some chemical, smells like olives.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 15
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: OilOlive
+            Quantity: 5
+
+- type: entity
+  id: CigaretteCandy
+  suffix: candy
+  parent: [Cigarette, FoodBase]
+  name: cigarette
+  description: Sugar sticks designed to look like a roll of nicotine and tobacco.
+  components:
+  - type: Appearance
+  - type: Food
+  - type: Tag
+    tags:
+      - FoodSnack
+  - type: FlavorProfile
+    flavors:
+      - sweet
+  - type: Sprite
+    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+    state: unlit-icon
+  - type: Clothing
+    sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
+    slots: [ mask ]
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+          - ReagentId: Sugar
+            Quantity: 10

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

@@ -0,0 +1,29 @@
+- type: entity
+  id: CigPackPurple
+  parent: CigPackBase
+  name: De Jure packet
+  description: Your divine right to smoke. Tastes like olives and fake gold.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi
+  - type: Item
+    sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi
+  - type: StorageFill
+    contents:
+    - id: CigaretteOlive
+      amount: 10
+
+- type: entity
+  id: CigPackCandy
+  parent: CigPackBase
+  name: Sugar Rush packet
+  description: It's sweetened!
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi
+  - type: Item
+    sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi
+  - type: StorageFill
+    contents:
+    - id: CigaretteCandy
+      amount: 10

Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml

@@ -143,6 +143,8 @@
       - CigCartonRed
       - CigCartonBlue
       - CigCartonBlack
+      - CigCartonPurple # DeltaV
+      - CigCartonCandy # DeltaV
       - Joint
       - Blunt
       - CigarGold

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

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

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

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

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

@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "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
+    }
+  ]
+}

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

@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Github KittenColony / Discord kittencolony (297865728374210561)",
+  "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
+    }
+  ]
+}