From 11c499039ad5e966dc547a539ff491c8d51abac0 Mon Sep 17 00:00:00 2001 From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Date: Thu, 27 Jul 2023 19:05:32 -0400 Subject: [PATCH] Back-Equippable Guitars (#18383) * added back equip sprites for guitars that didnt have them * Corrected meta.json copyright fields --- .../Fun/Instruments/instruments_string.yml | 19 +++++- .../bassguitar.rsi/equipped-BACKPACK.png | Bin 0 -> 862 bytes .../Fun/Instruments/bassguitar.rsi/meta.json | 32 +++++----- .../eguitar.rsi/equipped-BACKPACK.png | Bin 0 -> 845 bytes .../Fun/Instruments/eguitar.rsi/meta.json | 42 +++++++------ .../rockguitar.rsi/equipped-BACKPACK.png | Bin 0 -> 803 bytes .../Fun/Instruments/rockguitar.rsi/meta.json | 58 ++++++++++-------- 7 files changed, 89 insertions(+), 62 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-BACKPACK.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml index 5f38bdca3e..c29c482dfd 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseHandheldInstrument id: ElectricGuitarInstrument name: electric guitar @@ -17,6 +17,11 @@ - type: Item size: 24 sprite: Objects/Fun/Instruments/eguitar.rsi + - type: Clothing + quickEquip: false + slots: + - back + sprite: Objects/Fun/Instruments/eguitar.rsi - type: Tag tags: - StringInstrument @@ -41,6 +46,11 @@ - type: Item size: 24 sprite: Objects/Fun/Instruments/bassguitar.rsi + - type: Clothing + quickEquip: false + slots: + - back + sprite: Objects/Fun/Instruments/bassguitar.rsi - type: Tag tags: - StringInstrument @@ -64,6 +74,11 @@ - type: Item size: 24 sprite: Objects/Fun/Instruments/rockguitar.rsi + - type: Clothing + quickEquip: false + slots: + - back + sprite: Objects/Fun/Instruments/rockguitar.rsi - type: Tag tags: - StringInstrument @@ -223,4 +238,4 @@ sprite: Objects/Fun/Instruments/cello.rsi - type: Tag tags: - - StringInstrument \ No newline at end of file + - StringInstrument diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/equipped-BACKPACK.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 926a59eb20..0891477f1b 100644 --- a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json @@ -1,22 +1,26 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Created by EmoGarbage404", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage404. Back equip sprite created by RiceMar.", + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/equipped-BACKPACK.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 7d3a373c1b..7fb73d450d 100644 --- a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json @@ -1,30 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331. Back equip sprite created by RiceMar.", + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] }