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
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$I14-?iy0WWg+Z8+Vb&Z8
z1_rjPnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls
zTcvPQUjyF)=hTc$kE){7;3~h6<f`ms%M>MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$
zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;mU@P|$p!|73g(u2h9+i47M7Me3PuJ-
z#`*?k`bMU@Mg~>}hE}Gg3Q(YAr(jc*l4cd;;s&*>C?(BSDWjyMz)D}gyu4hm+*mKa
zC|%#s($Z4jz)0W7NVg~@O}Dr*uOzWTH?LS3W`av<adJ^+K}lwQo&w0k#H9Sv5?duD
zsIe8f1#n~YilO0@oS&;-kyxN_sAmB36WFsU$#8WArA0Yl%Tto|Q*%;tQ}arS^$qn5
z;c5#q@=NlIGxBj54VOl-pdz=x*B5RFR=4El!mTJSaV;ysuevy-vLIDID784hv?w{%
zwJbHSL>c7m0xRdD)WnkfqLBRj99T>Rz?`gLWU6PVpb?&#my%yztcj!{)g`ec)mF*K
zz{o_`z);u7AjH7H%E;Kt#8lV7)XKmBqSQA(B{QuOQ>meqsezTL1&Y$tlEjq6l0<@v
zQ<AOH@{4j4OKg=ga}(23^$YUSl@#E?Xyu%rlV9YUpOR{;WDItNudkJ7UU5lcUUI6Z
zi>*>cZh>BAW{Q=GK}woMqKSoWvW206uCaxQxvr(Tg@JCWky(nliJ^s|c}g-&ze|2{
zDJW)P`cpDftW1*=jm=ZcQ+1P5Ow4pG%uS4RlZ*_^bQ4od&5bQmEfNha5@GuNi!#$Q
z^AdB&HpfoE2H``PDUNx`sl_GvMa9tk;gpyTW#werK{8`XesX4t6+)|tWtvH1vZc9h
znt4i+Zi<D8k*;N;rLnGwxml`#v2kijvSqT3J}7JCWFpK01sSnk#;rRsG0iy9G}%Ho
z(ZtY9H__ZARoBwkI91oo!qU*d)HEg0*whF~H`o;rFX<yZfX(mV%wpw{2?~o!sH=lh
z3!$u>Oa*ZMuu4n@<$GJDWKe=nO;LghXJSbk#KkSd*z%0jJiHkJqO3SSt)x7$DAh4N
zHLrwVM$^aT_~OJe{7xq>Swq}}>2$P=2~kFx)1kqdoROH9o|<B-q^|_>3^+C+k)n?t
zUtl?;qS;OXk_>`e+(1llH3F(q>=Y1nRcc;}tx}Pay&e0vmP`f)Mqf`C$B>FSZ)Y9s
zJmetZwqIwS&AUoN(TL+sw;NeqZV0ig{vh)H*1@=~467w>$QAvu<>;>X?Ej(lYqh`$
z)tS@TXL6>j>bRi&*^T>x1%s}`V}>mZz06D2-I{Z3YuUFCl@<pItNZfIWc^#tYVNuj
za{R63)8JIQmVJC({ZIWSU0Jo#h?)PO*X{{R?mI7@zcfg0@|y>*KWTbuX$4;YdRci&
zP}17fhs*naFL~DRv-*3vpUt1YJGR^PPpV@5CmhF?$tcCXfHgy=L2N-GLsY{t#tb3^
zX4N!o{3ADg-fnvbshe_*^L{gn2(C=t*q^be_sv&lS>G)iZ@AxDd|k#NuTSFC!TraH
dwj|E(0IMb=o7gE<t=XXVfv2mV%Q~loCID;6%9{WH

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
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

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
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9GG!XV7ZFl&wk
z0|VE!%#etZ2wxwo<osN{#FYG`RK1Ga0tOJUv9BmdOwLX%QAkQn&&;z`dcS+Wl0s&R
ztx~wDuYqrYb81GWM^#a3aFt(3a#eP+Wr~u$oq|n;RYh(=ZfZ%QLPc&)Ua?h$trFN=
ztGr?>kg&dz0$52&wylyQ$U=n(-v9;Y{GwC^OFcu~WCH_31#?S1LlZM23rkBK1tS9^
zV|@cNeIrv{BLgb~Ln~8L1t?ImQ?MyYNwW%aaf4b`l#*tvlu=SrV5P5LUS6(OZmgGI
zl&)`RX=$l%V5Dzkq+67drdwQ@SCUwvn^&w1Gr=XbIJqdZpd>RtPXT0NVp4u-iLH_n
z)YyvL0=Thx#n5m{&d=4aNG#Ad)H4A23GCUFWVpJ5(xM!&<tfSfsX3{+sd**E`i6Rj
zaJ2;)`6c<q8TmMjhD)PZP?1~U>kGF7t6Oq&;Z_uvxR#aRS6v)ZS&*t9lv<o$T9lmX
zT9%quq73tPaY;}rB0RBLhN?X%H4U!0Br^?%UXTomr&232aVQ1Jz?BwQITxiSmgE<O
z<mczW5>Egu6cvn2^$Zm>!ZY(y^2>`gL4JU0NOegpNwrlnGB7gHH89jQG6*p+ure~X
zGBMRPFtsu;fGG9NPsvQH#8hf%Wny7vXpW*ZwInemu_Te8;*?~owEUvn#1dPj%-qEE
zRQ-aybR`9N%vw3;=j0dp=BK3EDj9=a;p=PVnO9trn3tUD>0+x?kz1gbnVDi`YH9(>
z3~9QFrlyIy1}P@Sx)v4|=DMbaCTZptX-VcL#&G>E`N^fA#0Jt2$#^OG$(bou2wN@E
zER&Kfl1+6}k`m2yO)X6fbQ6tD%yrEzlTu8Q3=EUf(#&A4@h{3u&&*5AK{gfSs+7zW
zt0Y77)I^iSG+kr!)MQ<=G?QdqOG~p<-DD%nB-6xHLj%h+V<iPpY+LykWv1qpB!cpn
zt&$;BFanh7a!MhB=0*kv1_t_uAQCDcNkASU9h#R}Vyk4NqyS1UkWdXSNK8%z+XWU2
z$gD`siEzoxP0cIL%+Iq`GKQ%J%S58efQm6tMziwBEH23}s)Uv^!KsB%R!*h@IB!`c
zCPSQ`3`&`)DN0b`Oe~Q|TyQ~*Ezd~J!<%9u%8K*TO3D+9QXSJ%^GXQj2z{K6&(AAM
zEh<4czaX(FF*mg&wW!!uDXl0!R{@@S6-x3I5(^4)GLylPsb7|t0xb^V=}QTxJ;jM-
z2s^L^QHr5~p+Rz5if)Rrg`uvQrHPTQg=un<ZfbI(p+!n^Qd){xGAxKOgUHaz(A3Hl
zo>R#QB53p_XC&sOr>58{=~Lhti{#XlBomWVU32r~MBOAq6Ej^4OA~WlOG69u<W$Q<
zbCa}Ge4armc4+LGWP&MxK%|4x1w4`94z!fiqD-VTfSk_YPEY`+IO^C(FvSs9vO+>1
zTZ*GmB<X`1A&}xmA6(@ll|&G}3nV1nK)DlKPg`NjP{gLepwu+06oM5;N}8ELig}`m
zu7Pn%nyzK4Ns6weMUts*lBuz&g^{VHfsutdC`E%z%cr#B0F@%(U_fe{*(un7g@Rn%
zKumBu64a)&Q$RFUQ}a@6m5P+??LK$e++tv0wDELt42fucJ8h#Ev!g)Ue&Kip%a(?=
ztrqWiFWp$mIm@Yrapx%~0qc#M4O*wRy2?F}JDBGw{Lso$+EdY8K<v^Sq1iSEqGEf5
zF5G=$(LFaWy*zFI-}D=?{@K1$w*|g@$9I6yqTxTohD@miQ+}D9+vL-p_(Jzri$MLk
z?UR@yr@d6*@R)SumsPAc=eBnFYa6dI9DR8-p(}p<$Ew==rA>wWB4s~sEcvMRqP)TI
z$Jbe*a@wrB_D;-u)Asq}lDEts3d*wA9P+Zga6fpzz815?7XE3!w)=fQ&Hmz>n|JCy
zi#j%izU0M55$1`C|9d4Cq$M-FD{J$)AHPFO_`x32g_}40^tTStU0gHo<@^B6)+s^u
zb8CL~r3g2e_;xNjVZ5_zEd#@nDN+jOKmUvoah02~m-QIK>usmzC$m3bkZEB4!Q#T4
V@P<1|@*Su@;OXk;vd$@?2>>8IC}98q

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
+    }
+  ]
+}