From 158beda6665334906c17a046f810db77aeb683ff Mon Sep 17 00:00:00 2001
From: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com>
Date: Wed, 24 Jan 2024 20:02:33 -0500
Subject: [PATCH] Paper cups as party hats (#24334)

* Water cups wearable as party hats

* Removed extra commented lines
---
 .../Entities/Clothing/Head/hats.yml           |  11 +++++++++
 .../Objects/Consumable/Drinks/drinks_cups.yml |   6 +++++
 .../equipped-HELMET-hamster.png               | Bin 0 -> 2172 bytes
 .../party_water_cup.rsi/equipped-HELMET.png   | Bin 0 -> 3233 bytes
 .../Head/Hats/party_water_cup.rsi/icon.png    | Bin 0 -> 3180 bytes
 .../Head/Hats/party_water_cup.rsi/meta.json   |  22 ++++++++++++++++++
 6 files changed, 39 insertions(+)
 create mode 100644 Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET-hamster.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index eac7a80edc..5123866253 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -868,6 +868,17 @@
   - type: Clothing
     sprite: Clothing/Head/Hats/party_blue.rsi
 
+- type: entity
+  parent: ClothingHeadHatPartyRed
+  id: ClothingHeadHatPartyWaterCup
+  name: water cup party hat
+  description: Not as fulfilling as you had hoped...
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/party_water_cup.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/party_water_cup.rsi
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatGreyFlatcap
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index d4b44fe4f8..a1748700f9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -330,5 +330,11 @@
   - type: Tag
     tags:
     - Trash
+    - DroneUsable
+    - WhitelistChameleon
   - type: TrashOnSolutionEmpty
     solution: drink
+  - type: Clothing
+    slots:
+    - HEAD
+    sprite: Clothing/Head/Hats/party_water_cup.rsi
diff --git a/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 0000000000000000000000000000000000000000..e853ca5a0eed27c295ff2fdce50ae8b020a4e00b
GIT binary patch
literal 2172
zcmbVOYiJZ#6rPYK@qvA5C5VP$q|l_!&SPhG9%N(Uu9}o?lEwwo{s_If_wMeH-I>YE
zB)f_I5ye7n(G*({(-5VmKQvSjl$HwBv|x%*5ZYo)p)C~qr&^^FOVO6z*_V$d8XTCJ
zJ9oZw&i9>j&)nJ9*}i?%igha}idxmy8to$YX8&APO|B=5{-4Ngx!wA@OHnIV`)36;
zHeO3n)jt^VZm&D`st&D803fRu2XYykped?xbIt~^4|{YkP8w#IxpDR!LmMc}?381C
z%#Prc(K_tl9mDN$INS#{#B6S&8*@5wkij0HbD6a1>bWqJ_p6h!Kg}_89^&<dnHE1F
z-5u+sBbI|{Eg-Ov=LK3JBPk@Rnzo4+c`?ZGAx@N8k=J=amu0$mFeIFV5_(s3TQL}U
z3NtCsvvrQkX0w58Fkm@JPS7-s<3&ysS%P5QA=3jn)^s<PJVdbz9mDnv%cOmepw}Ak
z!VIBW(2%jqZcVqCCz3HP2W(CV@V=%z5WzCe9&pn6;0SU!jWgKvT!IzKSUY8TmYcE`
zab14>Kmd~4SgaglK`xn0IfUzN9V9Y}30V;B#)oXobz#>Ua3J0~NN8^K)!2H(!N9Ye
zxMihFmFg@}rbRg*&@b&YOk`!<`uhxU6nHqykg7>6FOZVOd0rQTx+Jr_tn+*U8ncj*
z82UeyRF~If^#LeZGYEL#v0w!Cgym!a5o}~Y5_7hhWax4l^@x?W91@tY3+7qGVtSkD
zdccIZEgEKs=73=!UE)zf1(M1_Rp8m6Dk-d{s630s5K<&T6%+(Z_E8HC_?0c$BVsQ@
z5LA$YS%{<%t16Pn_KJLn1xQwcDprA@f|7lQW02MY=_mF>I^dqdl9v{u$R(w7i~X?$
zB#Wc8(Nt(gWI;mpo~fiIBmgyqO(>|BMJge!0WHW%N(l48AVyGwjhx>a#6_X&$iPq8
zQY9~L4L~9YWT>)05=fd939}jr$%a%-;AI(spe){Joo7*y#N89HkoJ7D=&gpIi=iUx
z9k{>DpU(G(4xr!nVFvmO9wVkWZ7i@hmR8$>+iVIGr;lia0?f4%UKTjGB}vxNV;hZI
zjJyj5A5DE}%X%^D4>jhKP%owxrhu8mWEbHWUrfH5g`#i|*DL?-zE5)rPQLg4u)Ncd
zhw@&9P2$=iJ5kN;y#_^9#M+`Q@!a_JvFUwZHP>!Cw`rpBk0IfO?wLJ5?yic?KL6Cz
z%{4dXrhCp%Q?;{o&fV~`_j0#7ZoWOg>)CH!Jbb9;@N#tGol7s@+P3nNO0mtqQm3i?
zm6Ipu#xI;1ynS;>J>S3UfEn7*vG?2hFRsLAu4`9!;HJG_KK<_K)%JtmpExd7J~REw
z+4m=ZjvPDkNmtzm*M9l^&-%88hSx67f4A|&uHH|lzRr%`nfz_!?_Gao+Z*rx^Z92@
zqX&np{$1TuZB(qQIa-xkKeF~{KlR4Qg^JV?CdS?xId!-0(8Srz&Fikz?Vh+(x#qd!
z@YHDP<Nep>BO79;Pt9(hJ9c?}vw5KQ;`F(hB?swgI$u>^QN8wJRl`UA|3TZ<_UOqi
HZ|?aIYst!+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc7b38dcebd68dc1ac9e2976210d4660ba3fdd32
GIT binary patch
literal 3233
zcmcInYitx%6rS3oViDpaMAT@;DH;pT&U<!eV5Ox?X&bgI?KYG|6Yt)+(~jMp8D^&4
zEh&m7#y~*)gCSTG(IQHs!2o~2$PWmb7zx1y5+#cGAjBX<Qc2*4-n);XV3$^rNoHr}
z-gD36JKs6??uJz7vRU<y)Ke5StGzAJg`Z92o>7N?cUx<|$B%p5w$(mG&3usDHPrUe
zxfE6Zt(EQ#dXvj_=;R{6a55-T$hlaWq82SKxBw2IfX<*k%Z@V_4<2G@%ZM|plq8>Y
zTTs8%w$?-4Ydh0$?EusaX7RK1qJoYU<WK<ULN06jdLhmf_3HSY408-!6bT06OfxY^
z_a;+xi{l|$iwG>_d4Z1NH(3>9n)VDW@}k7?Dkmze$m_hID+*n{7;MfnOuZ}7S~iBi
z;!J-KxH`w>^Z7_#ia1^$Cuo|+@ggURES6yXVLJc?*7h4J8WPBdp5+FXW79+<$T)*R
zoWZV^V#v9nTH7z<gc0Kkz~zJpPhu(x8ZeY|2fb|3xB)qoMLA>#K9&_iS-0N_9KYYG
zqB@+u!2rfKnG9`A>Ps#cn(%|ALpY2wAd^b_>0uXfUC4I^J&2YLVK*Bp(fC0Zx{l{G
zmSgd7abTHM){>bUf<gtWiYS>0MP0qcLm+UxwBuwe<VjUfq(vnn&`+<jY{SX>jU<Nh
z0+av&iZhr<GRq5?MQNVbMM;+xmREG1FNr1{!!n2eDJtl)rYm^m1W`<50|a17VFT)>
z<K+O(ft3S&h;!{eh7L2Uw>VkH!-lbUQqhZKQg65Y0N4<<C*lkaA!1pEZYrVzjcA5d
zk*cziEJxXxnc-PEW+<|vn7ow9RMsaPI7rAw)|U#;a3I!k-71!rqjFSZaj8L81G2=%
zRLHXil2tWhYB58KRkW?}EL{5_J5ej~%D@@{FeRYC7z<=UWkFO%tR_i_Rb!gKD~bUm
zMPz7_Z5^w@E&)<saYiT)_7c`*2TOxdk;fM&kl*tB>M7>0Pxsgsh8P<od?}&Yje8e{
zRaF#8DUYYD0?PI#ER2p{bVQXW&aA$1hO{zLY<ipJW6lkidrdc5Q+~@@bg{m4081f2
z!cJr`<zZ`*L{1N~lG=Pf!eHHkwIwm%F@rqtP;(zfc*?5asygr3L&%%pz6(5n`!(|X
zIAeNFjt&`22M!HfH*3LSLb)N^D7VCrV@y>$J{Y<+L=c%UBN~|NT1;jQO~(Av49t2#
z$p94-Uf@9m;>jRVV!A9=s`bA>R8Al42X-IAyB&8M!2sS6C6QEzpbD&l<P5G8sNsq+
zOa-bLDFd|X!Q9k(?r<=0N(M}kbi#{}B-KGPkY`Qcz(k&fF3?5B{Xh1mWZd++Yqg@h
zV@cx3L8R1fxSKms={r$EvXxY4aj(`V?K#urAl|%nyj4uGdB~b61E@t=Gm2}}h~Zk(
zfF`kWR7E`Q{sz<_VKmX^-0tQ<x=0a*3FouQ5I*#g*YLQBKf(hmvT@yd_&9pDd)+Wa
z)#Ta}&FRAEh3%gvYlXS3hg#B&AFW(e<EQpC*Tu#*-M6NDtfTJBx_$XMJs<2jGQ08R
z`mq^1_pbYK$EEoBv4N47hBq$wYvYVLiyfH$_~6NJ&iK2Q9K9fPe)XEXeC2^Z=il2s
z`qs?N-@&ab9$NYN@4viTc<#cJ?F+}B|N5wZY4^Ie6X$lEy4KP2_?7){JAdq**SKI=
z$N5tYKaaxqo!18s=QnOyKQA61J$CWPmP4nn>{`*-v+T@UA6~ut^aHb-W*(1GY|~HF
zK5BFA@w?<{45aqIxNXT{d2dI<)>Gr-mupV^u;Do0kQ&jp`zNn9ymPL0-r&OVo!5@F
z{<f*<^2qwJ)b2++`_UT@zjC(W&8`EVZTaG<#IM`#zclhM&6YjAe6e<<=Do+}&KI9p
S&`176v@h*Ue6r+)SN{ejA}|90

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c723dc087b4e0d71843b316df03e7afeeda3d83a
GIT binary patch
literal 3180
zcmcIndu-KI81J0CgDi{~L^DfCjG$fHd)wOwyW-#uHsFrAjj$03oSvR;&F*bW+wI;h
zs0(2uppr;{7z9Cq|9pTbh>Ala#$bYkKL{}~VB#Mv!j#~HEirg{A7z7$ErLyY+n)2C
z@9{go@B7Z(Qd7NT>f~9I34)kfRT-<rPtw09j>o@lN5>!dG0CoMbO~Zgv40m3yZ6i_
zh{+d>`UbBdzFdJ;vJ_~Rib~T-8%q;J*@CnUU<>j{6*U=Vl=|)S9*Q)yD78w6vvGS7
zYBnl698}j)T@O22psY~~o+HcB3RaLr9w5`ngy|~jD3#Hx;CFwRp~#Gg*Ak`5eS>5}
zyoOw4If#@?IU2GoM~e83kAx&yewGZep)kWnn2<n+ScT;jK_GJ%h0QsduGGdB=ZxX6
zDAnwFw!$!}RH`%;F14H{hLdHPVM9zPL}LlsZ8trTrcHNFUPBDI&@pV!uuRg|2vn=p
zi&EItYz#>|P;0t5oG@Zc8rTe1%K9;71T`4Q*{x0@V_bs_N}wb%Jr~PzfvnwZd6wI3
zji5T19%2Av8;=JzhV><x3{1FQMH>zy2gtC}ZhgCrm|Emotqw#LZP?8@`Dk3P7Tv~k
z49l^2u-G&75!U)MLxMtSV+2uuCJ?oiMGgX<<<whNB2S*0Jc?vUDCNkfR~e>erQErG
z47mj;20Rp{Fp+qg<uHrtSyl;!6<(lOL1EdfXx!2az5Q-cPT?hm6NiXm8f(A<qY7(K
z(Jdzl@E#aR(1aM<Y@*0uXO%@(!g8=->|HqHMLe!lnXU&+h^k^y3Wrc?7#gO$<R^np
z13>^ZtMOr4k|dE9I9?YeT^0Fous&wNR-bJC`fTE97Q{MkTa|QKRV66UnhGMcAoDB@
z!n{a}va0ba%c;5^$$PWHF>vmK#9*zyR~pu+av}me(CM&<ARW<pNXv2r(J&;d0ze!q
z>)0!Qw-u}gy9E6Fic(x|u)$|tqBT1xhFE+tod27fZyaU*_Vh~Azz~Nh(&tMS)jC|e
zFs#^CW~|0YqeMf@z{t26C&GE@%uM6Z8NZDAiKbK<F6LW%uFlk<^|`l%L1uDG0Wj-6
z^qGk?DmQElvx#GaE2}ouj4)95U~E>*wRA5998}(f(H%7-m=T?~%r@i<a^D6Hz_l7V
zZj{m;D@g|IB|VD-ww*9wW;2;KQ_GdZfM3*zc3jYQZ-_LG<yfd|v=){)IwJESS`wg2
zBM3N2gQ~7YU>@STA>tHHP=p{;{|iL9?Ssw0Y(luxG4~OS1d*olJfcMr0$Rlljh1Ab
zW-=#<5XnH~b#$*_hLoNEIT$!914h|&pBDj1Mg~nojxmS>gLxLXKxP>CVC;>`xUp5%
zk&^O`-tgcyiSZ91*>c0&S&6dWu`H5{{p`&2X=S*YGgc1b#;xEsF-qgm^a!ho0C&+a
zK1Ioh*JxQ%1zHutxIqar8<Iqy(Y`k8ejA5hMKUl9I-BK(@PW^N4UU@lBRH%g6X&gi
zkD@oWmi<T&1!YyS^7@9ZYrBptEi5nU?kQeN%9}d7Kau*Tp1*i#((Z*D3Qn9^STz60
zQMPMmS4GL?lCR9F;-3}y@v7NNiXJ_`XZl-Zr&h0dZTh*Nevw|?Yc{3yo`0Gyu36C%
z-+AnX-o8gp6-b@8h{MLL{W}ICXFpoL8C;<UHWj^c_W1UP8h7=Q6DzlWGoY+lHtE>r
zCodeiK%DM9y>9E;53hH;WF6YLe%g$-{)-2%KXoP5$=&>O_sWuI#(j434fAUEjq3-m
z75;9wwY>NB(&)KMbv?|y!skDpwrk*c_21u5xboNHW#~)k<?-Y;cp%gug4wrTpSfR$
zL|<F?@=I$!omYJM3*nukhx=E|ucr@ec)NFB&D^dXwF~xc=-;Llck=Nq?|v6PvGsj|
zIJjdL`NNI=7iUzIym@lmx5Tf<&g_E|E)!357T$a~R=Do!l+};*`Tqy1Dym~2EL^wo
EUm!jxVE_OC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/meta.json
new file mode 100644
index 0000000000..e51d9a24c6
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Krunklehorn (GitHub), shape by netwy(583844759429316618), colors from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
-- 
2.51.2