From fb47c4c83bbf8da588520df1886b73010f394a0b Mon Sep 17 00:00:00 2001
From: Guilherme Ornel <86210200+joshepvodka@users.noreply.github.com>
Date: Fri, 22 Dec 2023 01:21:01 -0300
Subject: [PATCH] Added ashtrays (#22837)

added
---
 .../Smokeables/Cigarettes/cigarette.yml       |   5 ++
 .../Consumable/Smokeables/Cigars/cigar.yml    |   5 ++
 .../Entities/Objects/Decoration/ashtray.yml   |  30 ++++++++++++
 Resources/Prototypes/tags.yml                 |   3 ++
 .../Objects/Decoration/ashtray.rsi/icon-0.png | Bin 0 -> 308 bytes
 .../Objects/Decoration/ashtray.rsi/icon-1.png | Bin 0 -> 331 bytes
 .../Decoration/ashtray.rsi/icon-10.png        | Bin 0 -> 457 bytes
 .../Objects/Decoration/ashtray.rsi/icon-2.png | Bin 0 -> 338 bytes
 .../Objects/Decoration/ashtray.rsi/icon-3.png | Bin 0 -> 361 bytes
 .../Objects/Decoration/ashtray.rsi/icon-4.png | Bin 0 -> 376 bytes
 .../Objects/Decoration/ashtray.rsi/icon-5.png | Bin 0 -> 379 bytes
 .../Objects/Decoration/ashtray.rsi/icon-6.png | Bin 0 -> 374 bytes
 .../Objects/Decoration/ashtray.rsi/icon-7.png | Bin 0 -> 372 bytes
 .../Objects/Decoration/ashtray.rsi/icon-8.png | Bin 0 -> 395 bytes
 .../Objects/Decoration/ashtray.rsi/icon-9.png | Bin 0 -> 436 bytes
 .../Objects/Decoration/ashtray.rsi/meta.json  |  44 ++++++++++++++++++
 16 files changed, 87 insertions(+)
 create mode 100644 Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-2.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png
 create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 3543db2ed1..ab435f3645 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -59,6 +59,11 @@
     solutions:
       smokable:
         maxVol: 20
+  - type: Tag
+    tags:
+      - Cigarette
+      - Trash
+      - Burnt
 
 - type: entity
   id: CigaretteSyndicate
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
index 3495ae26f9..dc8d4eaf3c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
@@ -34,6 +34,11 @@
     solutions:
       smokable:
         maxVol: 20
+  - type: Tag
+    tags:
+      - Cigar
+      - Trash
+      - Burnt
 
 - type: entity
   id: CigarGold
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
new file mode 100644
index 0000000000..613b6cc67c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
@@ -0,0 +1,30 @@
+- type: entity
+  id: Ashtray
+  parent: BaseItem
+  name: ashtray
+  description: Proven by scientists to improve the smoking experience by 37%!
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/ashtray.rsi
+    layers:
+      - state: icon-0
+        map: ["enum.StorageFillLayers.Fill"]
+  - type: Item
+    size: Small
+  - type: StaticPrice
+    price: 1
+  - type: Storage
+    whitelist:
+      tags:
+      - Burnt
+    maxItemSize: Tiny
+    grid:
+    - 0,0,9,0
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: StorageFillVisualizer
+    fillBaseName: icon
+    maxFillLevels: 10
+  - type: Appearance
+  - type: Dumpable
\ No newline at end of file
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 8cb13ab8b6..5be37f243d 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -199,6 +199,9 @@
 - type: Tag
   id: BoxHug
 
+- type: Tag
+  id: Burnt
+
 - type: Tag
   id: BrassInstrument
 
diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bc1eafb97b363d9e539b40c2916c8d4ad026dce
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?5OL=a|NVZS^RDEQ3N
z#W5s;GkH((bH2k4Ov@U#$fSH<!R+RoV8X&y&#_{~iVIs-NPG}TSlIe~f^%;`pnZvR
z!p%4L{;!g%;@O@b!^EBxl4YoDxzICAq(P_rD;Lx4<qKFmmn`Rh|1Ur5wbv%)6J1Ob
z&O1K%{e67`Ptsv0rXy;s6GWLFO`62Bd;41E+sxf;((dI!Z(3KYo@Ttizc#hOmGOj1
zfXSZf-&}bbnmn6i7OYD@SMmAM$^R$B8jno)d1TYcB8C$MMY=BK5;yrA%sFQIulV2?
zcG{yWDW&&H(&VYUD^o2`%n4-gX*-a?0VEpQ85j~6Oj|QTbaa3|X7F_Nb6Mw<&;$VR
C-FLhI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d4142d08d8f398447969766e13977d04a67de03
GIT binary patch
literal 331
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?5OL=a|NVZS^RDEQaY
z#W5s;GkH((bH2k4Ov@U#$fSH<!R+RoV8X&y&#_{~iVIs-NPG}TSlIe~f^%;`pnZvR
z!p%4L{;!g%;@O@b!^EBxl4YoDxzICAq(P_rD;Lx4<qKFmmn`Rh|1Ur5wbv$PkG>{t
z?$7^UZ?sJcxM-9x!=~8o@b~xe2l*OXSynD|DB^f=#6P8`<oT)pFKtVCq&EHG(VuV6
z?%v$H*m`AI^VP|37$&THe}A9Rfkg~Q*j*3r-oD<!XA)y1U%++a^gWd?pVX(^c1Su=
zlXNr1k|D)nr`RIvo*ecC(k*AyLw+c%PE~O=+~k(E(eqr}l}!?9=b&B#`tN`<1B1&H
Wy9YgICD#E1g2B_(&t;ucLK6Vp(u83E

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png
new file mode 100644
index 0000000000000000000000000000000000000000..53f61b9243efb922afc868c54886b6702594475c
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBLdr3q=R9FdPymRLc!$1P2fwUZC_oxF#Ltr!n27d^ssHk8qDwbDz
z|Hmppq9EBJ5ZS(!ks6L5+W{bt`erf0{d;9$K0HJ~p$5Zn1vnTiIK=S^gDhKhm!E-)
z%ZB0Gx4Qpf${!hY;wK_pgI71IBv}rCSk48s{2R~_Tnwx3GBD@>%|(h5q8&qW6x7w#
z{RdeJvm8c)#6f-or43X+;^&d<08nuINIqwnIB_C|BS^Iz<TRojfSkZU!Ov%%$}qjB
zjzL3~pP{|I9ZW}s_%Ogi0l%M7Wr<1ypah0Ucw7wMzkOx6@%SS{Zh9ia(Mbsmu3iNU
zlV{Ecrw6Dbh>ixLLV%y2|3AnPu()5pZ9mu>@7}&*U^R?lc)4c+11M@LDk{KgQ2mIX
z$4ID22FlMMH6WigH8nAIbaecOB|H!fN(&!9enjyxa_LFPe4-tI><^eDKn_9{Cx=bY
z0pu7;iXNiU04WBNs&>=?qaiRF0;3@?;2{72u8xyvE&J2R00000NkvXXu0mjfnqjkx

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-2.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1800a7eea03802f929339cce53f7ed1ada022763
GIT binary patch
literal 338
zcmV-Y0j>UtP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBL1W80eR9FdPymRLc!$1P2fwUZC_oxF#Ltr!n27d^ssHo7is2K1N
zV4;QgkVB17QBPI~Tv?d^AB3slc(NRz6F-sh(l0p%et!P{%Vzh2F}aQ*%K;!uUA=-B
z?p(XTaO3eu1`zx7;oW3~2+0lr1-%~IBL)>M1BS^n=QE_lg@HYP`^F`*0)ga22nzm3
zcdq=O-c!e*A<NJ3^7(THkmWXx?(}g0$d>QlzJh}tW}||V3d6g%uV7q~Xp%z!WV*VZ
zIpfVsCsE=YBu0|WP{m|90OkmCEJW8swgb=&Lgo`He2~>LlA;({BemEhXG3aP3^Qlc
k0iz)>8UmvsFyJ8o0N>_Hm8J?ekpKVy07*qoM6N<$g2S7LtN;K2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a82fd0cf8f22aa6e2d7f75f759a9ae226937c040
GIT binary patch
literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBL8%ab#R9FdPymRLc!$1P2fwUZC_oxF#Ltr!n27d^ssHo7is2K1N
zV4;QgkVB17QBPI~Tv?d^AB3slc(NRz6F-sh(l0p%et!P{%Vzh2F~~8?E4}}NFewfr
z%K;!ubxmv;jvUy{aO3eu1`zwpV;``^k?mU<NpS$lX#f=TdTa~~)()-=`T6+_p@BXO
ztJiN~(ER<MfmF*u4kg(Epx}RW=gR--J#`EkviuA`zI+7J){dQ|cpR>lWCwtBe*gBB
z!PP4WZis@C3d6g%ui$)A7-Ts>UC*5H=B1M;i47!1ip4OsWH|t&nOqBD7Q<+=9RM=`
z8%?P2LDs`aiehAq)MArW4p7T-kU66c7!85Z5Eu=C0S^HH$W2g2(zRNO00000NkvXX
Hu0mjf>8z2a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..92169bb6c551033f6a277cdb1a6304edfae9fb2d
GIT binary patch
literal 376
zcmV-;0f+vHP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBLDoI2^R9FdPymRLc!$1P2fwUZC_oxF#Ltr!n27d^ssHo7is2Kbq
zK&<z#EX@B8Qws_;7>0@AqR9#YkY&ggg4jCo6B%(?f=`?*2Y@WQ^h=I`pP&E#ve~`=
zt@9Ru?O0yv{U3z!S%@x2mIFYR3QDRltXR5;;l|^SU^Blw_5oWQ*}j#ekRaIspy1YH
zd&CeC9mjC|)L8~gGh>GQ{CtMZ)BZD%YB|W|Ea*W(hz|<>M|ZCLpWai)pdri8Ai~cD
zrmY=232DVDPqG6*rhNbQmBH032yUQ)k_yASx3A!QQW#`8KwZzA@#dwID2WXuMvBES
zwPZN}q?ud`VHU$^vK;_302@t8JCl(V#n>#PRE*?oNU4SB`bQlw8UmvsFd6~_9s&Rs
WwNXz7x8C&t0000<MNUMnLSTZR1e<FB

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..cca3f51863b25f5e08c89bfbaf72d175d517ed13
GIT binary patch
literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBLElET{R9FdPymRLc!$1P2fwUZC_oxF#Ltr!n27d^ssHo7is2Kbq
zK&<z#EX@B8Qws_;7>0@AqR9#YkY&ggg4jCo6B%(?f=`?*2Y@WQ^h=I`pP&E#ve~`=
zt@9Ru?O0yv{U3z!S%@x2mIFYR3QDRltXR5;;l|^SU^Blw_5oWQ*}j#ekRaIspy1YH
zd&CeC9mjC|)L8~DE-r@r{CtMZ)BZD%YB|W|Bs%~U{Cw7_4AXn+7&K)08QR<1!L)U9
zCwk}-#b+T(6`G>&-@Y=qdIf<+k4{PevI`jAy?uqIia0LGApkN~UC*2mWFZK%8b*O>
zkQi}RqN*Y*1YnLpHHthQ*$%*G9VzWhMp6{xvy@ypveE##mSNL3>VVM@7!85Z5E$?f
Z006;VS1Nxb(bNC{002ovPDHLkV1iQtn?e8p

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..77181b432eb7705116ef567343c6bf0a86185a67
GIT binary patch
literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBLC`m*?R9FdPymRLc!$1P2fwUZC_oxF#Ltr!n27d^ssHo7is2Kbq
zK&<z#EX@B8Qws_;7>0@AqR9#YkY&ggg4jCo6B%(?f=`?*2Y@WQ^h=I`pP&E#ve~`=
zt@9Ru?O0yv{U3z!S%@x2mIFYR-gx|xp|Y})0Yrnqm&ZO}izC~&k`xjoI{*~idTfsv
zCQh8l@a@|-1}-ixhWz||hRxIdGmvUI$l)YA02KUu)~O8Bd+Hc8WceA|+uOmkb#f=j
zJdyzm$vS`<zJL45;OZ3w)_QbO0+3z6@b2v^a*QH91VFZ^>zOlxECgXz!zeHf5+lb2
zWQ73C5#(5iu7_*~pc{nDC#9XqNQz=)OQ^*rITujNVwgFj4j2uA(GVC7fdLNz0Jgna
UDxHyz2LJ#707*qoM6N<$f;!NcHvj+t

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..c42784db40c4b06709eef6080e4dbbcdb6aa083e
GIT binary patch
literal 372
zcmV-)0gL{LP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBLCP_p=R9FdPymRLc!$1P2fwUZC_oxF#Ltr!n27d^ssHo7is2Kbq
zK&<z#EX@B8Qws_;7>0@AqR9#YkY&ggg4jCo6B%(?f=`?UpCm3hkY&qe_x@j1SNETb
zi;JPXeF4MAj~^M9S9-%jfoR8&6#^j3Z#@3U0J8ksw{HxUm6Z%%9{YeTk8IycwB;ZV
zlI#FbaO<%>VwgB_BG_`6BQ{U_&p@i>WH|s7{Cw7_4AXn+7&K)0fx+Jnrmd4Zam5&3
zakA3D_itYrT)l$81|OZ20Av?1ynFi!uSK{dNsa=LLF#(uj35g^nAI=}OoPO5S%OcT
ztPp@X0-wRe%8~5=d=`+>&SWG-F+NMll_M(+kZTz>eWMN-4S~@R7!82|4*>vUI$V(|
SyqyyO0000<MNUMnLSTaG(2|z`

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..44c7a7e7a20d586d95cc32c8cbf7b7fa774b297e
GIT binary patch
literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBLJxN4CR9FdPymRLc!$1P2fwUZC_oxF#Ltr!n27d^ssHo7is2Kbq
zK&<z#EX@B8Qws_;7>0@AqR9#YkY&ggg4jCo6B%(?f=`?UpCm3hkY&qe_x@j1SNETb
zi;JPXeF4MAj~^M9S9-%jfoR8&6#^j3Z#@3U0J8ksw{HxUm6Z%%9{YeTk8IycwB;ZV
zlI#FbaO<%>VwgB_BG_`6BQ{U_&p@i>WH|s7{Cw7_4AXn+7&K)0fx+Jnrmd4Zam5&3
zagsv-WZL&{Ul~AA;OZ5`aCA}vn3hw~At~r#t|B=R)<F{<$bffmUoo&6MlrnHGlAhH
z0|Qw(fss&?43wYI)xaD9N`RoW0L%d>zDF)S(e=W74x`C(08BGAXo3!)h9&sSAS)5#
pGmuodQ3s5Mz-S1JhQNS_0062ka`!I;CoBK}002ovPDHLkV1mrKoyPzG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png
new file mode 100644
index 0000000000000000000000000000000000000000..250c2ef4884c95cbf4dab1933b9319222648acb0
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBLW=TXrR9FdPymRLc!$1P2fwUZC_oxF#Ltr!n27d^ssHo7is2Kbq
zK&<z#EX@B8Qws_;7>0@AqR9#YkY&ggg4jCo6B%(?f=`?UpCm3hkY&qe_x@j1SNETb
zi;JPXeF4MAj~^M9S9-%jfoR8&6#^j3Z#@3U0J8ksw{HxUm6Z%%9{YeTk8IycwB;ZV
zlI#FbaO<%>VwgB_BG_`6BQ{U_&p@i>L^}XEzE|DlXW+9=WtiSm$Dkq04-EcxFm0XO
zi7UqNiW8LvKyeOo1jurbkH3HW$^eRj-1J0-qmvRCT)heyM5Pr;3VN8Uh>8M!etvK&
zhXwcgZTrFc-@Sdsz-k!9@N&-t2INqJ8BPpMlmmb%oUsm=;wvgD7-5b8(M#8CWiYdK
zV*rH^x!I7BP@51`prEVi=;-(lO8reuO=JZ-a>x*L0J36Qu!)KST38G-bJPK&Aut*O
eqaiThApih6DTGStABi6T0000<MNUMnLSTZAaI#MT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json b/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json
new file mode 100644
index 0000000000..9e45b4ede1
--- /dev/null
+++ b/Resources/Textures/Objects/Decoration/ashtray.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by joshepvodka",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon-0"
+    },
+    {
+      "name": "icon-1"
+    },
+    {
+      "name": "icon-2"
+    },
+    {
+      "name": "icon-3"
+    },
+    {
+      "name": "icon-4"
+    },
+    {
+      "name": "icon-5"
+    },
+    {
+      "name": "icon-6"
+    },
+    {
+      "name": "icon-7"
+    },
+    {
+      "name": "icon-8"
+    },
+    {
+      "name": "icon-9"
+    },
+    {
+      "name": "icon-10"
+    }
+  ]
+}
-- 
2.51.2