From 86f63a17d476ebb09bd59eef160f60d7adf9df70 Mon Sep 17 00:00:00 2001 From: ChilbroBaggins <107660393+ChilbroBaggins@users.noreply.github.com> Date: Fri, 16 Sep 2022 09:40:49 -0500 Subject: [PATCH] Rasta hat (#11269) Co-authored-by: Jeff --- .../Inventories/clothesmate.yml | 1 + .../VendingMachines/Inventories/theater.yml | 1 + .../Entities/Clothing/Head/hats.yml | 11 ++++++++ .../Head/Hats/rasta.rsi/equipped-HELMET.png | Bin 0 -> 962 bytes .../Clothing/Head/Hats/rasta.rsi/icon.png | Bin 0 -> 309 bytes .../Head/Hats/rasta.rsi/inhand-left.png | Bin 0 -> 624 bytes .../Head/Hats/rasta.rsi/inhand-right.png | Bin 0 -> 632 bytes .../Clothing/Head/Hats/rasta.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 39 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/rasta.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/rasta.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/rasta.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/rasta.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/rasta.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index eaabfe897c..aec11a87ee 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -54,3 +54,4 @@ ClothingHeadHatCake: 2 ClothingOuterWinterCoat: 3 ClothingHeadFishCap: 2 + ClothingHeadRastaHat: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 274a31b001..d7422fa54c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -26,5 +26,6 @@ ClothingHeadPaperSack: 2 ClothingHeadPaperSackSmile: 2 ClothingEyesBlindfold: 1 + ClothingHeadRastaHat: 2 emaggedInventory: ClothingShoesBling: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 37ce4edd8c..4d593bdcd8 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -467,3 +467,14 @@ sprite: Clothing/Head/Hats/nursehat.rsi - type: Clothing sprite: Clothing/Head/Hats/nursehat.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadRastaHat + name: rasta hat + description: Right near da beach, boyee. + components: + - type: Sprite + sprite: Clothing/Head/Hats/rasta.rsi + - type: Clothing + sprite: Clothing/Head/Hats/rasta.rsi diff --git a/Resources/Textures/Clothing/Head/Hats/rasta.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/rasta.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..334516efa32a44d5385a4f65a23d62d31e42f827 GIT binary patch literal 962 zcmV;z13mnSP)y_(!&DUzd0jhvur#J8M<0twH_>KV@q>VWJ-S*Y?L&U& z@HEJ02m?dJ7lZw@f4NG22T{-PcQReTY*fM=|6VK$xUqY&` z_u$$0-(JkPW>5l#h%Y6eR{G<|_kau+u!Qp80*bPP)AwI&Vx+z$MNp6b1moj>miSX( ze8BjBBIAoda={_AF42>$k!0#xWBaBxA6|W{mOgxWyJ033W-$RKV4KJpks?4+01{G& z0G_b1nZKCB==G@KA|$?u0F&79^BFunnR;zVCk!CXrvZe4#1=7i26yHQ81I!}u$lF|Z|K{cRswk9L-gijs(`iMyykCjU5A6SX?4HtQ@N9X zwqD#=u{R$LX7}ZPQD%-YfE)LK1Exnzvx^e__^mHT*DI$0`N?? z!XiBw>Wug0W2F(TZg7)p%~N|P&lz;}-niFoCZH{QCW=+w4FY)bEXattFjqig8>SBTKU_49Pz<^cJpcdz07*qoM6N<$f)E?DRsaA1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/rasta.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/rasta.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a9a93f55a919b550899f2aaf39cff3f4697ac42 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJKb|g*ArbD$DG~_>EDn4#?y*WR zVR3VY5E*R@>$e`OkC6TJ^9660jpLSQ)$ThVPJ6WKz?3!ng>vQ2@GLU9Blfr<`W(}h zpX?p`|NlAup?zlOL;VSV-`guU3uwD^zFIBsGShPtbKHha#y9N#c5ME}W;H2|&w;bb z&s&tuZNZ6pg_J*E`x_fOJ0ISjx%&m5vXuyjmWyA3L9||(ZCmt;c(rapttBcxi)0#d z6whqi-&ij>gTe~DWM4f Dg(Y~U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/rasta.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/rasta.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a4fb5d08d7b88c2dd2eec585f4de37893d33b311 GIT binary patch literal 624 zcmV-$0+0QPP)|bVvvqgcQ-Ch)0mI*-c_=V{AP3 z&Js^{97T%aef;z7KkLT?;Q0}F9zO^Gae(IpBn3P-fNX-20+Irr6Oa_}+yHVF;FbcJ z-jvF@+yG>8YuzLeoB`PGALRnagF9#Q*gAn!*yCWUc2)NKZ>Tx{3m{4ihVuRHMjrf{ z>JY2%$0UI`3gKJ*PSOB&db1{nFQ29JQUb(i)@?`ujC$*E_WW8ow}Mm&fC3;kXtNy^ zfCcMso*Y1+{z=s*_(}l65Z-SeiuxAj)&Oh(wh5lh0cO5tLWWmQxu)aGy2PA zr2{YnF5BqL{MJBB00aQr#!s^cWWkNjV>lg8D$`2aJi3XdVogXIfDORb(Nk}Nf9>%4 zT(;2_uL8CJI{`q6(0Pp6R7=}c!7+owv}p7ReThM1Un^B(httQ zxV107RF#mp+IPSI|C}}#iNLQY@cIPnq5Sc_emvlaRyLFE1fr1Z)5p_SVJO%iF>}laRaxfE94=sk(V`AR;MtE??1i zCPW;IkK4y-FkZPp0l)}Y6jAS&vdX)w=c?f2%e@&_cy=&0&Mp%HD**L^=N)wQ{!&1E z0?c?gk0~R=}CNz<(!vdC>TF7ic43U2WAzItQC> zoULzdTI=YDGcQJ`V66l^2+|d%5!WREC=D0@3R{Oh#180?n5a_N0Vr&aKa|VgXwgJE z@c9LlDme$pii@285@!IA!qESzIY9jqlMg7WD=-IKh(uf$Pw1>&)Er=~@NyvrU>zy3 z1=#__1hbwlJHR?pVhgeZRwP(F^$l)C+rrzlc7W~_7EZ-Y1PTCV3hSmkcvoWp*eNWW zikk=&0L&EDO?mLHrU1}WSU43o5k>&oOkv%W2k&YO06T?+Q*jev1fb0n)=hcvu0{aV za@Z*>oQj(WV*oNu)D+fDdGM|n0Pw1WA{YQ6v6hl5J76hT2`$PFASBjOQvC%;zx6@n S${4@^0000