From bd1f2af691264c5646086e68ae021753181eea6d Mon Sep 17 00:00:00 2001 From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Tue, 22 Apr 2025 15:34:39 -0400 Subject: [PATCH] Ashtray Resprite and Fix (#31643) * The meat and potatoes Yup * Stupid recycler bruh * guh guh --- .../Entities/Objects/Decoration/ashtray.yml | 57 +++++++++++++++--- Resources/Prototypes/Recipes/Lathes/misc.yml | 7 +++ .../Decoration/ashtray.rsi/ashtray1.png | Bin 0 -> 136 bytes .../Decoration/ashtray.rsi/ashtray10.png | Bin 0 -> 258 bytes .../Decoration/ashtray.rsi/ashtray2.png | Bin 0 -> 121 bytes .../Decoration/ashtray.rsi/ashtray3.png | Bin 0 -> 166 bytes .../Decoration/ashtray.rsi/ashtray4.png | Bin 0 -> 148 bytes .../Decoration/ashtray.rsi/ashtray5.png | Bin 0 -> 136 bytes .../Decoration/ashtray.rsi/ashtray6.png | Bin 0 -> 190 bytes .../Decoration/ashtray.rsi/ashtray7.png | Bin 0 -> 129 bytes .../Decoration/ashtray.rsi/ashtray8.png | Bin 0 -> 176 bytes .../Decoration/ashtray.rsi/ashtray9.png | Bin 0 -> 196 bytes .../Objects/Decoration/ashtray.rsi/icon-0.png | Bin 308 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon-1.png | Bin 331 -> 0 bytes .../Decoration/ashtray.rsi/icon-10.png | Bin 457 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon-2.png | Bin 338 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon-3.png | Bin 361 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon-4.png | Bin 376 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon-5.png | Bin 379 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon-6.png | Bin 374 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon-7.png | Bin 372 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon-8.png | Bin 395 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon-9.png | Bin 436 -> 0 bytes .../Objects/Decoration/ashtray.rsi/icon.png | Bin 0 -> 333 bytes .../Objects/Decoration/ashtray.rsi/meta.json | 24 ++++---- 25 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray1.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray10.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray2.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray3.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray4.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray5.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray6.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray7.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray8.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray9.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-0.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-1.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-10.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-2.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-5.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-8.png delete mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png create mode 100644 Resources/Textures/Objects/Decoration/ashtray.rsi/icon.png diff --git a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml index 61554d0621..9908e2a028 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml @@ -7,26 +7,69 @@ - type: Sprite sprite: Objects/Decoration/ashtray.rsi layers: - - state: icon-0 - map: ["enum.StorageFillLayers.Fill"] + - state: icon + - state: ashtray1 + map: ["ashtray1"] + visible: false + - state: ashtray2 + map: ["ashtray2"] + visible: false + - state: ashtray3 + map: ["ashtray3"] + visible: false + - state: ashtray4 + map: ["ashtray4"] + visible: false + - state: ashtray5 + map: ["ashtray5"] + visible: false + - state: ashtray6 + map: ["ashtray6"] + visible: false + - state: ashtray7 + map: ["ashtray7"] + visible: false + - state: ashtray8 + map: ["ashtray8"] + visible: false + - state: ashtray9 + map: ["ashtray9"] + visible: false + - state: ashtray10 + map: ["ashtray10"] + visible: false - type: Item size: Small - - type: StaticPrice - price: 1 + - type: PhysicalComposition + materialComposition: + Steel: 10 - type: Storage whitelist: tags: - Burnt - Cigarette - Cigar + hideStackVisualsWhenClosed: false maxItemSize: Tiny grid: - 0,0,9,0 - type: ContainerContainer containers: storagebase: !type:Container - - type: StorageFillVisualizer - fillBaseName: icon - maxFillLevels: 10 + - type: ItemCounter + count: + tags: [ Cigarette, Cigar, Burnt ] + composite: true + layerStates: + - ashtray1 + - ashtray2 + - ashtray3 + - ashtray4 + - ashtray5 + - ashtray6 + - ashtray7 + - ashtray8 + - ashtray9 + - ashtray10 - type: Appearance - type: Dumpable diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 27316ed08a..7d4c80b795 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -245,3 +245,10 @@ materials: Cloth: 100 Steel: 50 + +- type: latheRecipe + id: Ashtray + result: Ashtray + completetime: 1 + materials: + Steel: 30 \ No newline at end of file diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray1.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray1.png new file mode 100644 index 0000000000000000000000000000000000000000..34d1937e2cccbb2dadbe09a0d915db512d4f6f77 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}PM$7~ArY-_ z&pYxmDDXI6WUZgtpwg1qpl#0M!%!jN&2h5+`?|T33<{3FVdQ&MBb@0FNswDF6Tf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray10.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray10.png new file mode 100644 index 0000000000000000000000000000000000000000..b0ff0d9d19ff41e2e7785dee5d12c40fffa41e9c GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dpunnLn2y} z6C_v{Cy4Yk1sY6o^zb6VlSs ze*Ab~(`=y6e)#rzdkMbSI;RUYlNK>Z-`JKbeP`1C`u|2Bv?YXcEt#1m6&v0pv$3(Y yRi!7gt=*Ez6BroC^XAPPi_0f9z)t0fVqh?MXjNgc{EaBk9}J$ZelF{r5}E+ZkzU^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray2.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray2.png new file mode 100644 index 0000000000000000000000000000000000000000..c95889553be5fe72186617a2c07dd0fd9076c648 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}#-1*YArY-_ z&oK%z2naA3+OIXWzK>M83&h+!2Trw4uvX~hTOxLry!QJ&G S_{UkGb_P#ZKbLh*2~7Zik0uiU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray3.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray3.png new file mode 100644 index 0000000000000000000000000000000000000000..8baf89e0cd56e6ffd376fd53f4e27c999c5f95ef GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}37#&FArY;~ z2@8JS-Uwy7@iTv>6#1ZmYa}%ch!nTi0`2wdtx=ZqL)D iKI}bT!o<)JYyYo+y74xc=j}5!7^o!q5}(0`%5JDEf7mk z3}s$E#q6-WnHd{fn>F)ehP1Rawz9G^Hhul||6^ie3O<@bitMUtfQf+KE5| iF1LdkU~70d7#LJ;i{@=_(K!Kh1B0ilpUXO@geCyA>poHd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray7.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray7.png new file mode 100644 index 0000000000000000000000000000000000000000..6e1d607ab073f2ff4428eea82d1c57d4b87e05ed GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R})}AhoArY-_ zFKpyxFyLWwboV-%apslmV?E}GyhVS$D!8yPFs$EHt5#KJuJN*Og2>FBYHVA5_A)Xs a{0j-xXTSU1$fy8l41=eupUXO@geCx$ttSrv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray8.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray8.png new file mode 100644 index 0000000000000000000000000000000000000000..0d6f17a1220f30027f9e02000f83a06f24dcc499 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}S)MMAArY;~ z2@)YNxFPAo&(G2`8*`d9z^ zTW@1`cX#61S*8WXe&3G$+h6uy()rPpy(u%jCovbCocpF%*0%>{W}6rT!++c)I$ztaD0e0su{2KpFr5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray9.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/ashtray9.png new file mode 100644 index 0000000000000000000000000000000000000000..8e62bef89cf3ba89bc5af976fc4d1bb79dc5d7f4 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b)GJcArY-_ zFYOjQWFWwDq4i93ld;S$=B|J;y`!uFeNq8#o=dEqRg^e7c5F2Ic68T%24iF6%}Y97 zD1V;2nQ@Zawd0zfEtGbtO!#ARDa!llk7>6WRB}!W|1M=ZdH85B@06gbwW6<6kG=iZ uutf3y!{?m$Ub8byVla5ala}`XEh}G$cHQzI{%t^)FnGH9xvX{t z?$7^UZ?sJcxM-9x!=~8o@b~xe2l*OXSynD|DB^f=#6P8`%|(h5q8&qW6x7w# z{RdeJvm8c)#6f-or43X+;^&d<08nuINIqwnIB_C|BS^IzixLLV%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 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-2.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-2.png deleted file mode 100644 index 1800a7eea03802f929339cce53f7ed1ada022763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 338 zcmV-Y0j>UtP)M1BS^n=QE_lg@HYP`^F`*0)ga22nzm3 zcdq=O-c!e*AQlzJh}tW}||V3d6g%uV7q~Xp%z!WV*VZ zIpfVsCsE=YBu0|WP{m|90OkmCEJW8swgb=&Lgo`He2~>LlA;({BemEhXG3aP3^Qlc k0iz)>8UmvsFyJ8o0N>_Hm8J?ekpKVy07*qoM6N<$g2S7LtN;K2 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-3.png deleted file mode 100644 index a82fd0cf8f22aa6e2d7f75f759a9ae226937c040..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmV-v0ha!WP)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 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-4.png deleted file mode 100644 index 92169bb6c551033f6a277cdb1a6304edfae9fb2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmV-;0f+vHP)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&t00000fhdEP)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 diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-6.png deleted file mode 100644 index 77181b432eb7705116ef567343c6bf0a86185a67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmV-+0g3*JP)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`zOlxECgXz!zeHf5+lb2 zWQ73C5#(5iu7_*~pc{nDC#9XqNQz=)OQ^*rITujNVwgFj4j2uA(GVC7fdLNz0Jgna UDxHyz2LJ#707*qoM6N<$f;!NcHvj+t diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-7.png deleted file mode 100644 index c42784db40c4b06709eef6080e4dbbcdb6aa083e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmV-)0gL{LP)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(| SyqyyO00000@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)zDF)S(e=W74x`C(08BGAXo3!)h9&sSAS)5# pGmuodQ3s5Mz-S1JhQNS_0062ka`!I;CoBK}002ovPDHLkV1mrKoyPzG diff --git a/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png b/Resources/Textures/Objects/Decoration/ashtray.rsi/icon-9.png deleted file mode 100644 index 250c2ef4884c95cbf4dab1933b9319222648acb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 436 zcmV;l0ZaagP)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 eqaiThApih6DTGStABi6T0000Px$2T4RhR9J=Wlrd_>=LHR< zY1#=Pc-(F$>(Bc=-g}y+nVl;_mOt%w0JLp8*)tOB=1R;K7#162zO5T$&{~H?&KJ;H z^Kv*Kgy3$mnC$tyUh&=sNd(=%!)k?8ir2bk>Je`89A_