From 94ea31659d56b918b2f7b71d73c29eaf103483d2 Mon Sep 17 00:00:00 2001
From: KittenColony <richardfrankwaynelindsay@gmail.com>
Date: Tue, 5 Mar 2024 22:22:36 +1300
Subject: [PATCH 1/9] added De' Jure and Sugar Rush cigarettes

---
 .../Smokeables/Cigarettes/cartons.yml         |  16 ++++++++
 .../Smokeables/Cigarettes/cigarette.yml       |  35 ++++++++++++++++++
 .../Smokeables/Cigarettes/packs.yml           |  29 +++++++++++++++
 .../Cigarettes/Cartons/purple.rsi/closed.png  | Bin 0 -> 253 bytes
 .../Cartons/purple.rsi/inhand-left.png        | Bin 0 -> 289 bytes
 .../Cartons/purple.rsi/inhand-right.png       | Bin 0 -> 295 bytes
 .../Cigarettes/Cartons/purple.rsi/meta.json   |  25 +++++++++++++
 .../Cigarettes/Cartons/purple.rsi/open.png    | Bin 0 -> 280 bytes
 .../Cigarettes/Packs/pink.rsi/closed.png      | Bin 0 -> 248 bytes
 .../Packs/pink.rsi/equipped-BELT.png          | Bin 0 -> 159 bytes
 .../Cigarettes/Packs/pink.rsi/inhand-left.png | Bin 0 -> 289 bytes
 .../Packs/pink.rsi/inhand-right.png           | Bin 0 -> 295 bytes
 .../Cigarettes/Packs/pink.rsi/meta.json       |  32 ++++++++++++++++
 .../Cigarettes/Packs/pink.rsi/open.png        | Bin 0 -> 262 bytes
 .../Cigarettes/Packs/pink.rsi/trash.png       | Bin 0 -> 258 bytes
 .../Cigarettes/Packs/purple.rsi/closed.png    | Bin 0 -> 248 bytes
 .../Packs/purple.rsi/equipped-BELT.png        | Bin 0 -> 159 bytes
 .../Packs/purple.rsi/inhand-left.png          | Bin 0 -> 289 bytes
 .../Packs/purple.rsi/inhand-right.png         | Bin 0 -> 295 bytes
 .../Cigarettes/Packs/purple.rsi/meta.json     |  32 ++++++++++++++++
 .../Cigarettes/Packs/purple.rsi/open.png      | Bin 0 -> 270 bytes
 .../Cigarettes/Packs/purple.rsi/trash.png     | Bin 0 -> 261 bytes
 22 files changed, 169 insertions(+)
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/closed.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-left.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-right.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/open.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/closed.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-left.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-right.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/open.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/trash.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/closed.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-left.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-right.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/open.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/trash.png

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
new file mode 100644
index 00000000000..243c9bc1e16
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -0,0 +1,16 @@
+- 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
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
new file mode 100644
index 00000000000..deba5ea0509
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -0,0 +1,35 @@
+- type: entity
+  id: CigaretteOlive
+  suffix: olive
+  parent: Cigarette
+  name: cigarette
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
+        reagents:
+          - ReagentId: Nicotine
+            Quantity: 10
+          - ReagentId: OilOlive
+            Quantity: 10
+
+- type: entity
+  id: CigaretteCandy
+  suffix: candy
+  parent: FoodLollipop
+  name: cigarette
+  components:
+  - 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:
+      smokable:
+        maxVol: 10
+        reagents:
+          - ReagentId: Sugar
+            Quantity: 10
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
new file mode 100644
index 00000000000..d236b4d6193
--- /dev/null
+++ b/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: 5
+
+- 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: 5
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/closed.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..dde70af18006b186d216cf89e1f805a43d89efef
GIT binary patch
literal 253
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCiji0(?STr+GJ)Dg|9xZ+>}K!IS5&rmsJ;v|Sr0`FOuNACTfG3Gxg64*?AK
zn)gNm#W)K*B8wRq_zr_G<MI3zDL}y}PZ!4!3;(wlE^-}E;AnlAW_AC6@9~QVPib7Q
z{Xg|VyNl~&z7PKzjY=YSH%#c~(`YceT`&GhpzrOT#@j&$zOpI_Gc<i=GDwzftYw~f
mR>%C6WB85@uNd?hSMgtz6`Sz?+T})|EexKnelF{r5}E++sb8l6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..2101a8c94b5c7eee57d3733e65cb15b609513389
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%xmMR5J^KQJd-u(0D&xZ~j0t)kp%HIG|Y$ZW{!T&*kVe|ea`+*{y
z1s;*b3=DjSL74G){)!Z!V4J6lV@QPi+iTW*2MjovFZ|i@e`>UfSVwzA==5uGT>>_m
z!nxlJm{=-UI6mxQ3eb?qv+WYPbFcB5dx+&<nHe50jyJ3|R4-Y4im^d=!~44$MHe*k
zZgu7J%~Mr!XmD>}=x?ZJDs5!lRw;Djzih?>yNxeTUGiVCeLm~9+y2a@&Fo$*H4Fy3
Z8KfrpN2$KJv<2uQ22WQ%mvv4FO#qkBXz~C6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..4953a234babe1fba29d9871ccc16ca5cb36596d3
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%xmMR5J^KQJd-u(0D&xZ~j0t)kp%HIG|Y$ZW{!T&*kVe|ea`+*{y
z1s;*b3=DjSL74G){)!Z!V2`JZV@QPi+i8w`4GKIgjko^SN6uQXMIgC*-idRpe0L*l
zt{#zZWME=s;%KR7)i#@aGR`?K{isXV^$EKj)wzDMZeOS_6li(tFYnbQTEdl|*QkA+
zJ@@_k6>9Y_7&#OK6dD{F61*KFELaz{W#0SSf5G5!%C~j=#(L6rGvw_QH$2pDJCyO?
gD~X|rm*tGQ&~*Q(^6DCIpt~46UHx3vIVCg!0LP1I&j0`b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/meta.json
new file mode 100644
index 00000000000..f9c76c2ea2e
--- /dev/null
+++ b/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
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/open.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c6d21d23c1f6a531155a8c54a15bdde4109f1a5
GIT binary patch
literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCil&0(?STi-Pi}c{gU%&YQmeNU2iLmG$PAcNIK&{%UEvHc$zNpZjqj#Z?mI
z7yKUv7&e{JIS&-&EbxddW?<ku48n}Z^H-z*1#>-J978Pp-(I-Q*Py`BkjVe=;otZj
z4$B&*mfrrgeokF7U$}TJhsF9LMVB{13NIf?ewf{<&o;w~wP9;Ab3#MUz2hw=t%vXZ
zQ9M0OL7gp$|Ia0F_JHn3)q=X07^0XN<`(PBVAC>wxK4hH*n(@a37IlWS~`Un0WD_m
MboFyt=akR{0PqKAb^rhX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/closed.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3b688720f2df5d91cfcd65b92bc0d019287681e
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij?1AIbU|4%-*O0xIK^H={*ewn`hNJi~Epp4<;aDO1hUJ~RN{2vS$q`aBk
zfI^%F9+AZi419+{nDKc2iWHz=q^FBxh=u>#^NxH66gXT0B_{lq-`SLND}uB7f8UeT
zoReL85nCBt&&(;m!ptDEXWm_%3-6m;ik054_{uwh>j3BGXR@^i{_tKiZjfu}Xg2)R
h7sY*BFGBRd8^-h;F|kE^t3YmI@O1TaS?83{1OWL-S}Fhl

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..d49b6f112c062ca4deab896a5acd022e4f6faeaa
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=X`U{QAr*7p-rC4}KtX`TF=Z!%
z)^cvG#cWA3R%TW+Q<gPcW|z;?1gd1Hxn3Q=c5CUcKH2i5CD)>!&FNfuKXy64h3+TD
z<enouASFQX!AneYqTPf1lS;0NMZX$kyF?fo8rYqFiEX~~pkWe7g{P~Z%Q~loCIE`w
BG&ukO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..160fd7f68e2625b96d38274b406aef24b75e5a7f
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%x{-1pA|H&^uR>*(;{Q1zKLqK7J+Yc`RDYlXzzu^BMz_5A$lKnst
z&H|6fVg?4j!ywFfJby(BP_WI@#W5tp{p~etz5@mv%oqOb_&+sTMXaMeB6Rw-xGn)3
zP2t>c223m!EF2&9Fa>Bx<k@x!-MQCz%{|2OugnaO7sngc8mgBpKE>FeyW#y^jiL)0
zdAGXq`R1uAIW)L8F!VRnGnF>7ZmSf!@n1IMf!)TJr!M)g*gl_i+iid5(q?uqmKp|w
a-3(Hb{G(J~T-pM35re0zpUXO@geCw-dTnk1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fede8b03736ab8d17e2d76e20c6d15c430f49f7
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%x{-1pA|H&^uR>*(;{Q1zKLqK7J+Yc`RDYlXzzu^BMz_5A$lKnst
z&H|6fVg?4j!ywFfJby(BP_W0-#W5tp{p~bIz6J#zmd0EE>mz3^*dmbJJ@3RhR=&HD
zHdl|xH!?6WGI6xjvuc}7J{jknmwwcx>-vP<j_O=LS+_4#7Yekz^_TbR5-s7%&ui4a
z&Yt^z{R*}E7mOSV0tyWd4GG?k5f-eA+A{C`?Z05~IOW?qeq%jpyBYF!iW?s4w;js(
g@0G;R#LIF<U1++0RC#rcH_%-Sp00i_>zopr0FoVUO8@`>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/meta.json
new file mode 100644
index 00000000000..11810896d48
--- /dev/null
+++ b/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
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/open.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..9db23a7d148dad03c996766cb25e4492570e66ec
GIT binary patch
literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij?1AIbU|DXJ_O0swQ`Xd>&^PW6^^?&j?pp4j=A}b)pUJ~RN{2vS$q`aBk
zfI^%F9+AZi419+{nDKc2iWHz=x~Gd{h=u>#^NxH66gXT06OR0r-|3X8v~p_6`}@A1
zoTgM=WGv^LaQw{1wKa|gw;J7#Y)ZSp;3(|KYO-xRgO&V=1DC(Fuv|Gk|AhDorn4NI
xk9>>E513{vasLmS3tPjDd+WJR^KGcw&tNlOtgOU%njX+f22WQ%mvv4FO#n}|V7veT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/trash.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi/trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1e4bb99b3b7564255013c2d8784aa450a8b127d
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikt0(?ST|4%;m<oT=rC%>$c?47>;2vB&zdPy@N#a0sJ7yKUt7&h-;vL7hI
zS>O>_%)r2R7=#&*=dVZs3Z{FyIEGmGzdh&8*I>ZGazS&;_x+oiFTJ?pKV7fn5^JNo
z#w`{58=trsmXtHi@psTvVkuxbtgEr{HJhk=LhOOfM>#g^c=*ic+ZX=VycYL`JH8%f
uWfUou;9uaj>7Ag%#G`Vo;y+n3av4vU2(4XpGmHmlC4;A{pUXO@geCyT6<o6b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/closed.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..7af12a43d2ea14cd597bb08bbd72af1363de0b27
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCiji0(?STr+GJ)Dg|9xZ+>}K!IS5&rmsJ;v|Sr0`FOuNACTfG3Gxg64*?AK
zn)gNm#W)K*B8wRq_zr_G<MI3zDL}zcPZ!4!3;(z09Jvk{aJU4{&Dit5xBFPAr}CxT
ze|ZlSCyB;x$YSi8VOf5KnL$ROe9O*;^W4gZ`sGtX9Of8gzk9*z((#qYg`c6oApPBn
g(!|@WtC?olnmb9p`FicH0MG&kPgg&ebxsLQ0E(YjJpcdz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/equipped-BELT.png
new file mode 100644
index 0000000000000000000000000000000000000000..d49b6f112c062ca4deab896a5acd022e4f6faeaa
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=X`U{QAr*7p-rC4}KtX`TF=Z!%
z)^cvG#cWA3R%TW+Q<gPcW|z;?1gd1Hxn3Q=c5CUcKH2i5CD)>!&FNfuKXy64h3+TD
z<enouASFQX!AneYqTPf1lS;0NMZX$kyF?fo8rYqFiEX~~pkWe7g{P~Z%Q~loCIE`w
BG&ukO

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..2101a8c94b5c7eee57d3733e65cb15b609513389
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%xmMR5J^KQJd-u(0D&xZ~j0t)kp%HIG|Y$ZW{!T&*kVe|ea`+*{y
z1s;*b3=DjSL74G){)!Z!V4J6lV@QPi+iTW*2MjovFZ|i@e`>UfSVwzA==5uGT>>_m
z!nxlJm{=-UI6mxQ3eb?qv+WYPbFcB5dx+&<nHe50jyJ3|R4-Y4im^d=!~44$MHe*k
zZgu7J%~Mr!XmD>}=x?ZJDs5!lRw;Djzih?>yNxeTUGiVCeLm~9+y2a@&Fo$*H4Fy3
Z8KfrpN2$KJv<2uQ22WQ%mvv4FO#qkBXz~C6

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..4953a234babe1fba29d9871ccc16ca5cb36596d3
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%xmMR5J^KQJd-u(0D&xZ~j0t)kp%HIG|Y$ZW{!T&*kVe|ea`+*{y
z1s;*b3=DjSL74G){)!Z!V2`JZV@QPi+i8w`4GKIgjko^SN6uQXMIgC*-idRpe0L*l
zt{#zZWME=s;%KR7)i#@aGR`?K{isXV^$EKj)wzDMZeOS_6li(tFYnbQTEdl|*QkA+
zJ@@_k6>9Y_7&#OK6dD{F61*KFELaz{W#0SSf5G5!%C~j=#(L6rGvw_QH$2pDJCyO?
gD~X|rm*tGQ&~*Q(^6DCIpt~46UHx3vIVCg!0LP1I&j0`b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/meta.json
new file mode 100644
index 00000000000..11810896d48
--- /dev/null
+++ b/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
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/open.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..da246d4c16f35f0b6426698401c6574d88e91b75
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCil21AIbUr+GJ)Dg{knf21fV|H<=LSJs<f-c_))T^lHWry^GjNO6_~`33)n
z0)}A!3L%hSfk$L90|Vb-5N14{zaj-FnC|J~7-Hf7_WVVz0}33i53j`R`!B3N*KyOd
zH~ap-JJ237aS8K0CJix$AJ-nSF1g3Y^U!;?qpH)Yjwy`aa&;Nbvny?|uu*Kds{goE
zn>mz|;n%jfe2s?c3;Tca&Jf-5?DntH#G8z>PVg45la0P<cK<2RN(N6?KbLh*2~7Zv
C?q$3H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/trash.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi/trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b183401caf94a5f2123d3fca42fad9ed9cf8fc3
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij?1AIbUr+GJCS#SR2`K!yj3QCoNrmsH&l#%P=_zk4kOM?7@|APU8lsB^*
zP>8d@BeIx*f$uN~Gak=hkpdJ<^K@|xvG9L;?lfP60*}i@O_6{9C(CYeW0TM6{dkNu
zv!C&br~Qp8b%vBOraS%(GdUPL>(lQvP2sR{cID3z{~%$=c<tSXH#%v*+P?Bx>`%Y2
vUNm4zqHV*auFvxrx-4Wgcf8<UaE<l)VX>+`OCMGPZDjCt^>bP0l+XkKvgTa`

literal 0
HcmV?d00001


From 7b06326e09a3983515682c832b036c2134eeda61 Mon Sep 17 00:00:00 2001
From: KittenColony <richardfrankwaynelindsay@gmail.com>
Date: Tue, 5 Mar 2024 23:15:58 +1300
Subject: [PATCH 2/9] making life easier in the future

---
 .../Objects/Consumable/Smokeables/Cigarettes/cartons.yml        | 1 +
 .../Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
index 243c9bc1e16..50b2ddf5b79 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -14,3 +14,4 @@
     contents:
       - id: CigPackPurple
         amount: 5
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index d236b4d6193..229c11f9e45 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -26,4 +26,4 @@
   - type: StorageFill
     contents:
     - id: CigaretteCandy
-      amount: 5
\ No newline at end of file
+      amount: 5

From cdade7f37b76dd975d7dd892c9c680ca047c524b Mon Sep 17 00:00:00 2001
From: KittenColony <richardfrankwaynelindsay@gmail.com>
Date: Tue, 5 Mar 2024 23:24:44 +1300
Subject: [PATCH 3/9] candy carton :)

---
 .../Smokeables/Cigarettes/cartons.yml         |  18 ++++++++++++-
 .../Cigarettes/Cartons/pink.rsi/closed.png    | Bin 0 -> 254 bytes
 .../Cartons/pink.rsi/inhand-left.png          | Bin 0 -> 289 bytes
 .../Cartons/pink.rsi/inhand-right.png         | Bin 0 -> 295 bytes
 .../Cigarettes/Cartons/pink.rsi/meta.json     |  25 ++++++++++++++++++
 .../Cigarettes/Cartons/pink.rsi/open.png      | Bin 0 -> 271 bytes
 6 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/closed.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-left.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-right.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/open.png

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
index 50b2ddf5b79..d0810259803 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -2,7 +2,7 @@
   id: CigCartonPurple
   parent: CigCartonGreen
   name: De Jure carton
-  description: A carton containing 6 packets of De' Jure.
+  description: A carton containing 6 packets of De Jure.
   components:
   - type: Sprite
     sprite: DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi
@@ -15,3 +15,19 @@
       - 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
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/closed.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2378dd7d1cab293a9030c0b394baf9a03f0153f
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij?1AIbU|4%-*O0xIK^H={*ewn`hNJi~Epp4<;aDO1hUJ~RN{2vS$q`aBk
zfI^%F9+AZi419+{nDKc2iWHz=yr+v}h=u>#bB=rs3Op`>Yqoy3-!!w2tJS0QeEh^O
zfg01cF#Kjab>Z1x)}{)T2Wy(l=3nRiEpU<fPtb|^D-Oi(_ijwEKekGrf#or$z`-5t
p*Z=?3san9{bhj;%djrdix%Ku!_v?4(JOx_C;OXk;vd$@?2>_~mUm^ei

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..160fd7f68e2625b96d38274b406aef24b75e5a7f
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%x{-1pA|H&^uR>*(;{Q1zKLqK7J+Yc`RDYlXzzu^BMz_5A$lKnst
z&H|6fVg?4j!ywFfJby(BP_WI@#W5tp{p~etz5@mv%oqOb_&+sTMXaMeB6Rw-xGn)3
zP2t>c223m!EF2&9Fa>Bx<k@x!-MQCz%{|2OugnaO7sngc8mgBpKE>FeyW#y^jiL)0
zdAGXq`R1uAIW)L8F!VRnGnF>7ZmSf!@n1IMf!)TJr!M)g*gl_i+iid5(q?uqmKp|w
a-3(Hb{G(J~T-pM35re0zpUXO@geCw-dTnk1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fede8b03736ab8d17e2d76e20c6d15c430f49f7
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O_~O1^9%x{-1pA|H&^uR>*(;{Q1zKLqK7J+Yc`RDYlXzzu^BMz_5A$lKnst
z&H|6fVg?4j!ywFfJby(BP_W0-#W5tp{p~bIz6J#zmd0EE>mz3^*dmbJJ@3RhR=&HD
zHdl|xH!?6WGI6xjvuc}7J{jknmwwcx>-vP<j_O=LS+_4#7Yekz^_TbR5-s7%&ui4a
z&Yt^z{R*}E7mOSV0tyWd4GG?k5f-eA+A{C`?Z05~IOW?qeq%jpyBYF!iW?s4w;js(
g@0G;R#LIF<U1++0RC#rcH_%-Sp00i_>zopr0FoVUO8@`>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/meta.json
new file mode 100644
index 00000000000..f9c76c2ea2e
--- /dev/null
+++ b/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
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/open.png b/Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ab682b79530086c9286ca47283a4fa6441f4558
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij?1AIbU|DXKwfAYDE+IiF0A6X^Y`{em6pv)FSbyFb4UJ~RN{2vS$q`aBk
zfI^%F9+AZi419+{nDKc2iWHz=fv1aOh=u>#3#Ww|6gV6LuYCA#zq3N6Np$V(cc&&!
zHgod-CD8DwDN4GOyMyN=-xS>?(rnZ87=t#61Tf8bymKytcN5!#{+OCp#(jTvSUsL!
zuBc+4+w*|o-NKUkE_ow{zx8p+tEaH9D>xKvKSAiiZ$9s2;Sfft!VaL_44$rjF6*2U
FngH)DVG;lU

literal 0
HcmV?d00001


From 6289690f07a6b20ebe6fc32a2bc9a18ae022d85c Mon Sep 17 00:00:00 2001
From: KittenColony <richardfrankwaynelindsay@gmail.com>
Date: Mon, 11 Mar 2024 10:02:37 +1300
Subject: [PATCH 4/9] trying to get this to work

---
 .../Objects/Consumable/Smokeables/Cigarettes/cigarette.yml    | 4 ++--
 .../Objects/Consumable/Smokeables/Cigarettes/packs.yml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index deba5ea0509..7e73eb74038 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -7,12 +7,12 @@
   - type: SolutionContainerManager
     solutions:
       smokable:
-        maxVol: 20
+        maxVol: 15
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: OilOlive
-            Quantity: 10
+            Quantity: 5
 
 - type: entity
   id: CigaretteCandy
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index 229c11f9e45..09ab2e09eec 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -11,7 +11,7 @@
   - type: StorageFill
     contents:
     - id: CigaretteOlive
-      amount: 5
+      amount: 10
 
 - type: entity
   id: CigPackCandy
@@ -26,4 +26,4 @@
   - type: StorageFill
     contents:
     - id: CigaretteCandy
-      amount: 5
+      amount: 10

From 7719da72a297f7dc2f4884d3b5a1ab0eaac30466 Mon Sep 17 00:00:00 2001
From: KittenColony <richardfrankwaynelindsay@gmail.com>
Date: Mon, 11 Mar 2024 16:32:32 +1300
Subject: [PATCH 5/9] !!!

---
 .../Objects/Consumable/Smokeables/Cigarettes/cigarette.yml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 7e73eb74038..2f2f0d1a549 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -17,7 +17,7 @@
 - type: entity
   id: CigaretteCandy
   suffix: candy
-  parent: FoodLollipop
+  parent: [Cigarette, FoodBase]
   name: cigarette
   components:
   - type: Sprite

From 677601679c966cf2548727532295d0b1369a5ca1 Mon Sep 17 00:00:00 2001
From: KittenColony <richardfrankwaynelindsay@gmail.com>
Date: Mon, 11 Mar 2024 18:45:37 +1300
Subject: [PATCH 6/9] YOU CAN EAT EM NOW >:D

---
 .../Consumable/Smokeables/Cigarettes/cigarette.yml   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 2f2f0d1a549..ec6642e7b8d 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -3,6 +3,7 @@
   suffix: olive
   parent: Cigarette
   name: cigarette
+  description: A roll of tobacco and nicotine soaked in some chemical, smells like olives.
   components:
   - type: SolutionContainerManager
     solutions:
@@ -19,7 +20,16 @@
   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
@@ -28,7 +38,7 @@
     slots: [ mask ]
   - type: SolutionContainerManager
     solutions:
-      smokable:
+      food:
         maxVol: 10
         reagents:
           - ReagentId: Sugar

From e12124fac923745e826b9719830f6e1e6f73ef04 Mon Sep 17 00:00:00 2001
From: KittenColony <richardfrankwaynelindsay@gmail.com>
Date: Fri, 22 Mar 2024 17:42:14 +1300
Subject: [PATCH 7/9] added to cig machine / loot spawners

---
 Resources/Prototypes/Catalog/Fills/Crates/service.yml    | 9 +++++++--
 .../Catalog/VendingMachines/Inventories/cigs.yml         | 2 ++
 .../Entities/Markers/Spawners/Random/randomitems.yml     | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 8f8c1a114fc..d198e8e6277 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -50,15 +50,20 @@
   - type: StorageFill
     contents:
       - id: CigCartonGreen
-        prob: 0.50
+        prob: 0.33
         orGroup: CigCarton1
       - id: CigCartonRed
         orGroup: CigCarton1
       - id: CigCartonBlue
-        prob: 0.50
+        prob: 0.33
         orGroup: CigCarton2
       - id: CigCartonBlack
         orGroup: CigCarton2
+      - id: CigCartonPurple # DeltaV
+        prob: 0.33
+        orGroup: CigCarton3 
+      - id: CigCartonCandy
+        orGroup: CigCarton3
       - id: CigarGoldCase
         prob: 0.05
         orGroup: Cigars
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
index cf690580275..262ec55cc85 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
@@ -5,6 +5,8 @@
     CigPackRed: 2
     CigPackBlue: 2
     CigPackBlack: 2
+    CigPackPurple: 2 # DeltaV 
+    CigPackCandy: 2 # Also DV
     CigPackMixed: 2
     CigarCase: 1
     SmokingPipeFilledTobacco: 1
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
index 91e40a8e607..b4c0937fc3c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
@@ -143,6 +143,8 @@
       - CigCartonRed
       - CigCartonBlue
       - CigCartonBlack
+      - CigCartonPurple
+      - CigCartonCandy
       - Joint
       - Blunt
       - CigarGold

From dcaed7b1efd354bcfa9dc821225ad595980d3c07 Mon Sep 17 00:00:00 2001
From: KittenColony <149278380+KittenColony@users.noreply.github.com>
Date: Fri, 29 Mar 2024 18:47:43 +1300
Subject: [PATCH 8/9] # DeltaV (thank you Death)

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: KittenColony <149278380+KittenColony@users.noreply.github.com>
---
 Resources/Prototypes/Catalog/Fills/Crates/service.yml       | 6 +++---
 .../Prototypes/Catalog/VendingMachines/Inventories/cigs.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index d198e8e6277..1d15f49f017 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -50,19 +50,19 @@
   - type: StorageFill
     contents:
       - id: CigCartonGreen
-        prob: 0.33
+        prob: 0.33 # DeltaV
         orGroup: CigCarton1
       - id: CigCartonRed
         orGroup: CigCarton1
       - id: CigCartonBlue
-        prob: 0.33
+        prob: 0.33 # DeltaV
         orGroup: CigCarton2
       - id: CigCartonBlack
         orGroup: CigCarton2
       - id: CigCartonPurple # DeltaV
         prob: 0.33
         orGroup: CigCarton3 
-      - id: CigCartonCandy
+      - id: CigCartonCandy # DeltaV
         orGroup: CigCarton3
       - id: CigarGoldCase
         prob: 0.05
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
index 262ec55cc85..9ea895b629e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
@@ -6,7 +6,7 @@
     CigPackBlue: 2
     CigPackBlack: 2
     CigPackPurple: 2 # DeltaV 
-    CigPackCandy: 2 # Also DV
+    CigPackCandy: 2 # DeltaV
     CigPackMixed: 2
     CigarCase: 1
     SmokingPipeFilledTobacco: 1

From af409f37f9865eb7e7763e83da7f97a73d23eafa Mon Sep 17 00:00:00 2001
From: KittenColony <149278380+KittenColony@users.noreply.github.com>
Date: Fri, 29 Mar 2024 18:48:57 +1300
Subject: [PATCH 9/9] thank also

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: KittenColony <149278380+KittenColony@users.noreply.github.com>
---
 .../Entities/Markers/Spawners/Random/randomitems.yml          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
index b4c0937fc3c..9cadab261ca 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
@@ -143,8 +143,8 @@
       - CigCartonRed
       - CigCartonBlue
       - CigCartonBlack
-      - CigCartonPurple
-      - CigCartonCandy
+      - CigCartonPurple # DeltaV
+      - CigCartonCandy # DeltaV
       - Joint
       - Blunt
       - CigarGold