From d3495fc51c811d6fbd8dbaa1a20bb1da77c8dbcd Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Wed, 10 Jul 2024 01:28:10 +0200 Subject: [PATCH] made the guitars be able to be worn on suitstorage (#29048) * made the guitars be able to be worn on suitstorage * minor fix --- .../Fun/Instruments/instruments_string.yml | 4 ++++ .../bassguitar.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 862 bytes .../Fun/Instruments/bassguitar.rsi/meta.json | 4 ++++ .../eguitar.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 845 bytes .../Fun/Instruments/eguitar.rsi/meta.json | 4 ++++ .../guitar.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1515 bytes .../Objects/Fun/Instruments/guitar.rsi/meta.json | 4 ++++ .../rockguitar.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 803 bytes .../Fun/Instruments/rockguitar.rsi/meta.json | 4 ++++ 9 files changed, 20 insertions(+) create mode 100644 Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml index 7224efa9e0..6ceb5e23ed 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml @@ -21,6 +21,7 @@ quickEquip: false slots: - back + - suitStorage sprite: Objects/Fun/Instruments/eguitar.rsi - type: Tag tags: @@ -50,6 +51,7 @@ quickEquip: false slots: - back + - suitStorage sprite: Objects/Fun/Instruments/bassguitar.rsi - type: Tag tags: @@ -78,6 +80,7 @@ quickEquip: false slots: - back + - suitStorage sprite: Objects/Fun/Instruments/rockguitar.rsi - type: Tag tags: @@ -120,6 +123,7 @@ quickEquip: false slots: - back + - suitStorage sprite: Objects/Fun/Instruments/guitar.rsi - type: Wieldable - type: Damageable # Smash it! Does 20 damage a hit, but breaks after 1 hit. diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..72146d40e5a27251471ab50183fd21a0f611e125 GIT binary patch literal 862 zcmV-k1EKthP)R?X_mg)Z_$Q*M$%QQ6~(AfpF|hA}ua9NUMEvJe9Ev(uq%Yo*QPf$8ig zofqJLve8=iEGHD)qFEfTn8oo*)9!1n!yKlRGD@kYvmck+a<-EyrA)P24f|8FiH25b z`Uh5ObJpY95DjtK^@IINI2VQb{OmLUgpus~e#^C3FH}lt;s%S$x{l+d<^VFjG1MQw zzY~6c^xz&kF`P(sr@8^1b%Kn4{%j0O%c~t5PQ=~~4s<$}78hqvC~ zmsVgLXBu!!7UnF ziS9ySq*|@!gb<4;43QIT7G*PDn#9d{_tjtP=dGo& z#`2h}PCJo!Z3-mX;oIv|>%M*IfP?)C#BGVU+hZ3-ZQnVd-2#nkbFOVz7%iKi?pyCZ o&}R`4)csyBfngYiVXhPZ02e#ZDRbKY*8l(j07*qoM6N<$f=Fek;gOdstXE#BFB3PVsDh_5V z4X;B}$k3q(g27@Tf%Xj@I+fc&&TA51UY_wL(QrNpyyTwTd(XM&ocDO=01U%048t%C z0|3b7i>A?-<2Vh+x{c#FCTxFUdif}&j8e)32|JEsq?Gs8001DR3^YP6Uo@m!{a7De zD5Z=L0zwF67iQYM*N&21m_aI)f)E1rM(7LrLy#bGpS&QQj2rqil2J;To&6(JDwV)- z-vB%NNANrkp63C$X$04GV~IopK=+M6N^eY!VqdI(C!j<)KQ!R~_Wa!kyc&B_BWL^W(-L7%Wp|x7 zos64YzG!m!V$&zUsN5+Bq?2*eX{%SeJHs#x!!QiPFbu;m3}c%}HT7PF>T2~ypqgN} z3#7IPe4nSaHlF7pl}h34?CeI-p}sCyDwR6+UQkMDY_1pBAF#E(2LLrS_39IMT{lMM z@TSzptcgNwQ1CPLUgiy#`apFu0)|QI5>!Mxg1)5v+bH;IF4g%gMQ}ST!!QiPFoFC7 X?$d`GV%U4o00000NkvXXu0mjfG|h-o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json index 0891477f1b..8723daef06 100644 --- a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-BACKPACK", "directions": 4 }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..71667f4e21cef619cd105ef332058d670f6adebd GIT binary patch literal 1515 zcmV~osik1& z3tj^F3E@v`mN65L$M|=B-r-X9c2xEH|K6XgXH~Z}aCHe!YKB=6mT8EsR}975!hKpk zy()Yt95!V@;VY$Q9DY`ubNF4cnM}-rTlEa)esJaoYk9LMJR%$_7OGln9`z+Yy|ged zbwKtY773z62$G@78U-qhN-ardfBVLozB$U`(d2DV!xTr3ym-T+R;8;hH7mLPIo>uoJ`0KJ=VcG=c4 zyKue*{SQXkOgANuYLLgPBfId*E(^kfqN^w>EHCn+3oDG07F$-! zoYU#%w$pi5Co(_w?3{N;7w-c@(D(eG|MPpF_dWBx2aq8NNCJ{T1_;!aLdk%vaLHWZ zimD(L?#V0XaoI?t38 zWo2a^jzl&Ns~eP3Un zu637=+ehbW6>B7lYmYym@mMpQy*ClF<{5xyg7;rSxPGM>0nZ*pVhIGsM-3NG0_;722Ai?dPuCrx;SgH3xe;|ZaQ6IZ zv^Q2FcToLrOAWm0A+BfEBQbi@Bin-OnFYXBoNeU;LOs*zYqlZadS*Qnr1f;E-h-wW3B==ZSk&kA z6v1F{&K{L(6GG<{4)t+4h32ijDi_TUd&Rw|@$|6g&w2d6ouKzzUPMRDl$(yz$g_wX zNsa9uhtjd5bVfn#s7zQwhR|#|$t!tg$bhv8Hk3I~l=rLcrwckJGZO;kn(b(gypm^5 zu#U#u?&ZI=`Z=0&KBi>lQj{cJc*S^Gv&5!6J5`mkrOfC8P7d-)p2bwJs*qrP#ln<= zW^9O@9ORWVVFZY^2L#sa!_ke-lt9fmJ?7*fujH8%tUVy{par8b_4SM_iP7N*id4^> zU;()CdXS?vZ^m@?1=(I$0Q~AnY&J!<`OPM_(yJsO2}lBxfFvLZNCN*4fuCb0go|%H R58(g+002ovPDHLkV1g2w*Hi!i literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/meta.json index 6813282372..bcd517578f 100644 --- a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/meta.json @@ -29,6 +29,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..36cb11d801bfcf45f16274f89a34c7ed8b56d6ee GIT binary patch literal 803 zcmV+;1Kj+HP)Z-fv`&7ES&b;^C_uk070SJO12!bF8B9%s?5ggivI2w&c zu!((!`lZYH(g3%fx43WHb|8d+r(DY$ob!M&2G?~LHYWK50HyFCEz3g7vUX?X0k{|p zP&LiSdn*FGOs9C6P64c{2h3H@+Q41V>Ib%M2LK?10DxT71T|7ymW7Jr z;Lr6no+c9jt9h@YZTyeZ)8O0l^HNa+{s|%ZS}sF*$gM85-N^^*Io}lFE0V;IWF0G_--SBtU;_)!k34K zm1jny5ng*e0Kl)eHvsE74@9g2c_i%oXfy%<)M_-k&|Eyfb=bIbU zYBd0J5#;B`P6tnuNj?PFG~{*04T}H(-_OqhZ1(nnf~0_o>im7X4PbNUfdUF3xo@{I z_WiBL(Ow4gfSAqj*y%vbX0iY5)+N_PFpOLp<(tn!fWoCfmd+CdK@bE%5ClOG1aX{1 zZYuQa^&oEJL2ZoYp)a^Ci913q%UbEpd7fu5#=sZ@=RDYVr#S2R5(SXw1i}-$u4~A4 zxfCKxqxMOp0R7?6keiQH(_9=q38MedD5g21=hT7mN>Y1EfqY9pd5Q!-u zMQ92Ud&Wkx&nQSsKY2W+U$3Xyle#UgMuLt}`$A2>F!E)MeIIEeX!Ql82s%dTjF%-* zbKZT_E*-QRBmLp9Fl+ugkyxnSpe{`zFvdI;iuB@$EYPX^Duru~CZT(zPUXK6;OJR5 h`~ivpf*^?F<{gKAM`X|(z<2-v002ovPDHLkV1j}ba;g9T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json index 7fb73d450d..96bd8a37e5 100644 --- a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-BACKPACK", "directions": 4 }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 -- 2.51.2