From 2d2fe1229150407afa4a91f8c75236e9cbec21b2 Mon Sep 17 00:00:00 2001 From: Jack Fox <35575261+DubiousDoggo@users.noreply.github.com> Date: Sun, 13 Feb 2022 16:35:56 -0600 Subject: [PATCH] Update Keyboards (#6687) --- .../Entities/Objects/Fun/instruments.yml | 1 + .../Structures/Furniture/instruments.yml | 14 +++++++++++++- .../Furniture/instruments.rsi/meta.json | 4 ++++ .../instruments.rsi/piano-upright.png | Bin 0 -> 17356 bytes .../Furniture/instruments.rsi/piano.png | Bin 1973 -> 17604 bytes 5 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Structures/Furniture/instruments.rsi/piano-upright.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml index b65e89e9bf..ea0085e687 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml @@ -39,6 +39,7 @@ parent: BaseHandheldInstrument id: AcousticGuitarInstrument name: acoustic guitar + description: Anyway, here's Wonderwall. components: - type: Instrument program: 25 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml index fc50b8aa88..abb5c66151 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml @@ -49,6 +49,18 @@ state: piano - type: Climbable +- type: entity + name: upright piano + parent: BasePlaceableInstrumentRotatable + id: UprightPianoInstrument + description: I said Piannie! + components: + - type: Instrument + program: 3 + - type: Sprite + state: piano-upright + - type: Climbable + - type: entity name: minimoog parent: BasePlaceableInstrumentRotatable @@ -67,7 +79,7 @@ description: This thing really blows! components: - type: Instrument - program: 20 + program: 19 - type: Sprite state: church-organ diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json b/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json index e84fc5bfc7..02009bec88 100644 --- a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json @@ -23,6 +23,10 @@ "name": "piano", "directions": 4 }, + { + "name": "piano-upright", + "directions": 4 + }, { "name": "piano-broken", "directions": 4 diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/piano-upright.png b/Resources/Textures/Structures/Furniture/instruments.rsi/piano-upright.png new file mode 100644 index 0000000000000000000000000000000000000000..ed0f6d1efa379250c455d8c08c26e5f096acc3fd GIT binary patch literal 17356 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 Wkhl>(zQ%v-AoL6I-7|V}+J69QrY`{i literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/piano.png b/Resources/Textures/Structures/Furniture/instruments.rsi/piano.png index 545386ff33838ddadf18def0c052919df262c8fd..8f5662e90195271e918cd225f5c5a001e22296eb 100644 GIT binary patch literal 17604 zcmeI4dsGwG*1!i5MJNgt6wymVd|^wNBqRaS5Cy`^D}so;R4^nH2#^GlKzPU%5sQFa z6&0VL@~A~#ii)%qQ9(ddilRahL_|SEM5Ll#wB8Bf<%qNFckf!?`o1-@RwmhJpS|}v zzkSZ0nLj28&MWOS)b!K<0MKx-XSu-N%j6%`De(COKjc3AH7(fQQvv|$Gvyy8;NW3h z0AR5Bt{zek#}#yrNMOw7ihLpCa6vHK8`doi4`y=$At}xm^5Y9F@V&p5;cT+N zNOTOghWz>Vkz#0dCs=>b)VlI#F!m=F>2TK-sf2lN>4uUe7%vfe(EE4;HBy)3fkVpo}WCGlSAc+u4 z+2I7CWWK`5h#wXt;fVRcQocxtllx`+ibACpc)UE&=rKGmLGWlGp=6jHOc4xc2ZJPI zA~=x|mosV;94ZbP8XA`aLP3xK5=teo9ceMV8*5R!b4$`2t1;RIh#r}VbjQFL#yFq^RbZ) zyB>)??E1^6su6oJ}y}!Bx=QltU$OslGH4+l&GcX|$0v|D`mH6j%6$fkdNIVNp?_ z|M$`$2d;?D@n;MDATARenb}Cg|E0`*Sp`%~_yLFN=Y@#C5}a+UbBhBD-L zM0B|R!nJ@sRQE^>@RPQ&HKXY7A+MuBp+o&m$wc@7N%Hfs>3B8L)Dzuwyc%gbX1PYl zmomx2(Gbn!tmLS z=jRN^DTWOdsT%hzFmxGHw8Bps@Iwwb`jqp@6>jwU^WXe2HlzQhSA;Jt2m%PYh~Yx# zgV18Q5J1pH3>P{dgciev0D>-JxX}3^v=}Y~5Ofj4h0X_|#c&~jpoIKLI6P*Fzw&|aa&Ih5za3O%8ix@6+J_s#_3jqXO#BibWL1-~t2q5Sp zh6|k!LW|)-06`ZqT}M&_xUvIv<1ubD1c0X- z0D!(90A`C)e6H96z|(*1PenHZLoyOZn75fQ)xPsx0Ej{3OzpbT@bR-!tuY)OEjd&T;LCEZz8)e3^Kr zsfV`WYCmJq{r>3I%U@OKme0AfZ|>Z=x4r}N3Jaaqg&vt2<9o{gdP!%5Q6he_rRJs# z!^E;fHmb$Xc!dqtxpz{$2j4Tj^6ysY#N6%oJfm-;RoPCm&AeG5%e<-D-ltnEDDP*a z>S&~vs4ycN(i}4Qe{}9nc|7>%itGJ*u07sxkEXUYwl8(VcE|Y-YE-6vcb2ivZ(89V z?=Rq)Os)!V)_-{apM~$e_4?!DJgZaYTry0Yl@Yz3uxr5a?kYp=?W=G$0Qf#4 zMR3pdw;ffSM`CjU!Eb$GzB;)3O7%dOQP%gS5mRPrH~uoS{?TdG%M~vVsl`6ur73NX zGdb~o!Ac{wEoJ8nAF333?YK^T8Dh0aX@SAR2sNu8E>bM(PPg}Y{9V;AWqWFEMUr-$ zSwRj?8izZpWT|;EmTt8bPQ@$EA=lc_{J8>h-t8LoT)T}O zb5)PlcU1^?703K!kQR_Ut%sugjM7!MSl#ZTt7S#ek24J$LX`l9o}sO?!DetxNO8G% z-eN7Kg6<-lpKCWVX8<8<=%;Xa%gd~ttQEVG+O}x;u48Ec&w6?swyt<&HvN~Df`Gmz z%Dm~vpRckx2wt1pcDlZ6nRLe)e^1RTiz%_VP)arzmwcIcd)EF_ISYI1dcqbrb6lti z4?v-*PRoT0jJ^+TH%;d0|BX|&v@Wu2Rc%}I%dcw*N770*bsozgR&SE#(%{j!)4y{A0|WDZ4=UQSMY*`Rcv0!g-?|u}ZEQl?F^aa?KX>asy(PtQVn0{fVB{w17O@%u55WU*~6qNVRCXUoEOMS=jQLQ0ehBgL&QsayK?B>95;J zh>D6z{ow_9w^3DD=w9~mIS=lyY*>CzoU`_*TQ2FrH+i>TZp*mPH_6@I{XhY+h)4*` zfK%GYPtPlD5w1O;Y@ik%v#_MrB_P^yja%l6{c*e2XjYWyMketo`Jra>ek`tew!pBD z^wuGu>E?<4RR&vkX!+kEU zUh8qP29)#lwf*kNX|@do>#a+@t2#P5{+RXTRb*px^L8zws3*xDr|o=wCyQRitq>Sw z_Vo1R>8yg#|&#Oq!9=X!g?e7!+ytS-wVA9^@ zDr?uSh5fyGn{;m0iRhW8i@(oKfu5CT`gPG_G=rCHn&-~rW@ktE`xvD@)lV`>+xM+? zyj_)C`Qq_ZQHF<+!B^#5{f{hv?AdZS=Va0q{J@}c7u#{kq!a4RgC|^mPUtwD@x0^4 zp`RMM8=IPz+g-#DT*z}>+2mxs!mTGsxN{G|2C#|kzdeb-%yAVS^x?iTdo*RQ>QVcX z^u;~>dhUB`W_PV&{Sx)sxaM(@p3)6CWbyRY4_R8%CS6S1 z;WL%kbufMU^skd)$Od;)~B-A6Y0QGUQ+^PPW1bG z(;6#++`gL)#P~2bDFe>=Zj0ZQctn1EpfkVJ!8*>)(o192;|SNppWJdo+`dbiOsLci zIIFih?WH{@-A6O|W=~lDnZs7MFLeL1qJwZt4NoT}B%TZVHQGgICH-Bs)3<|%zF8L^ zqVvc1X)BvIJg%aw-&a$RCt`dTRU$XM-cuPpU8j^UkWLPRUlmB7^z&w5dx@i z5x@viq;a8&E&>ED0;^1bq?MBZZeyfS;WhzW8gL4MMg9PBDF}C#C=$BUQ6Nm}oJ+yX zdAYZHyL%6PfNT0A+v&*0v^9CVLtc%|2E0Q zEDs7yS-}RpB$Uf#CA}~Pm<*x|%aRVI4VrxwNN^n_a;1N3W}?B_z9tNbz%O?)zLLg~ zxk2`6;RerBa9};+^Y2%UL$pbJWLAK#;A#9{wcM!$Pog2DRzOiRPDm2oMDXQunXd(y z2u?IgB5-{ovyW|g=hluTxtQ$RX|tkBH`1{ejaBBt#OhV z&^dUp^guiYmZDN!ijgG?B8pav9-B@t<4*2?T=p?Fk#zv z*z5JePNx$#8V%`Rr_%|0y0u}7rF7#fygxxsMZ7K+ zi^S46z$iduO6;Lzbu?XVBSon)Vu}=zw-Wd|0XsI&&x+UAkqk*I*n7arREEPLhQlES zg8?4xg~I(bAt_ZB1cBDg3=`;Fh)93R6wPKcJlYE}7z{vi(o!2;k#SuY{eB<&`}^9A z$#QmiDnTT?X!domzrT-uzrS`{C31mQtA(depTc!r{PF##i7z4(R9#QW3#!Bn@uJEX z9vvM;+hal|3jmS}CRwdOlp;?%`+%ke0Ko6xeyn_%t`)FK&<%{b_W^)-@g{!>&!0b! zwM7bWT^9!j2N;jX`22&nS}!E9=EpKbPs$al6d_vXWEN&R`{$Q$aqr$ebh}*~9v(*R z!WeM);5L9&W=51^Vwq6Q0IQ6oWl|^7^U#@n$}XK>Ua4aM-Tgc9mdex<58WD~XoWCc z=1gb5R;%H}Tf+0aNKV3<1@wRWeT>Ir#FJlg=vVi{kW zkZ*kV^(RIzCdgueh>o=a)xEzgv(Mt_=m-GvwE$wubVk^{yy=y^G_wz^mO-Tjc%Fx! z9(-o}a)PcE=pwJ#2Y@F}o}k%m$}J!Z(pW(nWEq1Js4Rs008p<{mqZ1vZ&Eaf%0 zJQPbVpxg&!4T36WsgOd@EyQNEFypg8(k4g+*}gz_X~MFs7@g={reI~zJ`El|xQ*FA z@_axNlB_^>aZ0xkn^qCC*$lmA8Nd7%w*bjmU<1JV()8xybd4Dmc$#Xp8kxPQO3NyQ zPkFKNL}0mFl?VR_X}U0iDQ>YHsMb2tB>9hR4Ns`a6-Ir z(#M1>eMIh}!ViA}Kq+>b)jA7!o`=7F{sI7^TNSFHq#Ln`j=z6NLX~LNMP%=jWrJlr zw%hF}!7JJcmVi~wPh@JUUuNkjfo*4_K3`j8c@VjcYz)=vK<*}zZ8DjZ)_kxCu!GYW zvcf7AUqyY2;A=D*z59_c8;Iz7yG(l~U`@T(>xCyLCy9AMo+fK*T_zLp6*EJg_&Unq vMM5Q0Ot|a518^Z7FqY}M?*Lo}WHS8+gh^>lmt6|V00000NkvXXu0mjfaXF