From 8f2f3b8ba386d5bdff08569b2b12f032a60e2a18 Mon Sep 17 00:00:00 2001 From: Fragoler Date: Sat, 17 Aug 2024 00:30:37 +0300 Subject: [PATCH 1/2] add guitar bar --- .../entities/objects/misc/guitar_bag.ftl | 2 ++ .../Entities/Objects/Misc/guitar_bag.yml | 23 +++++++++++++ .../Objects/Misc/guitarbag.rsi/closed.png | Bin 0 -> 824 bytes .../Misc/guitarbag.rsi/equipped-BACK.png | Bin 0 -> 1339 bytes .../Objects/Misc/guitarbag.rsi/icon.png | Bin 0 -> 824 bytes .../Misc/guitarbag.rsi/inhand-left.png | Bin 0 -> 903 bytes .../Misc/guitarbag.rsi/inhand-right.png | Bin 0 -> 874 bytes .../Objects/Misc/guitarbag.rsi/meta.json | 32 ++++++++++++++++++ .../Objects/Misc/guitarbag.rsi/open.png | Bin 0 -> 805 bytes 9 files changed, 57 insertions(+) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/misc/guitar_bag.ftl create mode 100644 Resources/Prototypes/Exodus/Entities/Objects/Misc/guitar_bag.yml create mode 100644 Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/closed.png create mode 100644 Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/equipped-BACK.png create mode 100644 Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/icon.png create mode 100644 Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/inhand-left.png create mode 100644 Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/inhand-right.png create mode 100644 Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/meta.json create mode 100644 Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/open.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/misc/guitar_bag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/misc/guitar_bag.ftl new file mode 100644 index 0000000000..1fc5b1bf8a --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/exodus/entities/objects/misc/guitar_bag.ftl @@ -0,0 +1,2 @@ +ent-ClothingBackpackGuitarBag = чехол для гитары + .desc = Это чехол для гитары, но в него помещается не только гитара diff --git a/Resources/Prototypes/Exodus/Entities/Objects/Misc/guitar_bag.yml b/Resources/Prototypes/Exodus/Entities/Objects/Misc/guitar_bag.yml new file mode 100644 index 0000000000..c40847e24d --- /dev/null +++ b/Resources/Prototypes/Exodus/Entities/Objects/Misc/guitar_bag.yml @@ -0,0 +1,23 @@ +- type: entity + parent: [ ClothingBackpack, BaseBagOpenClose ] + id: ClothingBackpackGuitarBag + name: guitar bag + description: guitar bag, but also can contain something else + components: + - type: Storage + grid: + - 0,0,1,4 + - type: Sprite + layers: + - state: closed + - state: open + map: ["openLayer"] + visible: false + sprite: Exodus/Objects/Misc/guitarbag.rsi + - type: Appearance + - type: GenericVisualizer + visuals: + enum.SharedBagOpenVisuals.BagState: + openLayer: + Open: { visible: true } + Closed: { visible: false } diff --git a/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/closed.png b/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..ba8847b716bbf8e167aa4ce5989b31b79db95e18 GIT binary patch literal 824 zcmV-81IPS{P)Px%@<~KNR9J=0mOD@DFc^m4IH~K1Ap-FaP=y#Qq%8d<{9;C=E(lds2M{|$)x^PZ zY@Y$_V>js~z`1-0#@9*#Ex(?0(05Ha2v)TCjK>?g|y9;&}t{)PkwMN^v9&W8gmVMyTG(9X}yWQ?{ z>?AQoQABWK4Dvij(==d=VYyuTeZ3;&oZB&Z4#liit0d2JR8j0;Lqoy8l5Sn^uMDA*Vor}wOSn&5ccw7u}C=QRtN#c7}~alF$TsMXsvtjU5g?RDmw&L zO8K>$n;Yvq9t-aYIA$RjK-A-ekkN1;D8gga&pEda>aN`ZGZqevjKD6`AChIh@W#M_ zAOh}yA>*9eeQ@CSWFv%NHk;YOKkc!D5pZFz>l#Ti?3f#`)9KU~@oYA;>-GAiNO%EF z(*XFWbXRP3U85+9{hPB4X_|sk>i3VeC;|>%*EO`(m`A>2k|ape6jDmOy}jY~_BMKhITJ!)yWM&qA>+Sq{EpoocOtabczSw5Q51tB z{6U}auIupp{CsjJM3RLNgCeAq*lad?MSK+Ir4)IdMPx(^+`lQRCt{2nq6!1FcioCX|l(c?ZRCNPQ(>9*v4Ss_x}`QyAk#xQyBC{omkT( z=eZ~;owl`|t5fI?b}_BVdCNJcNq~xqii(O&27>|J-`~?;%TYE?(uc0=l9UpQ#R7xD z;3$o7e}7MTWZy7=>$+r&f$#g^oI^@kj)WyL7z}8!SU^e%*L5?EuweksIZjSaqW^v0 z-#W;lA*BT89KP?v7?UZ#*r#Coz;#{neLwm??#v`MB49WiGOac29}q@Go`hI-q+DHH z(bd%zrOoq``B~PNc0kTKhQndzv)9+x1OP!0;Pv%2^VwbKcDvMQG@!M{%gakNkL$X0 zdU^`$ed{~`-=141u?npJaGUY~pp-&9^vdGn0a}@H_<>e*CCm)SQrG@;u@{Z$tQ#KA`44iW;mrK08y_K^B0F=JQlZY!n zpU=SFH_Vc}j_Ze!ovrN=zn`o#NAG|3;$$#u$hQ zLh(H+F!AN-RMYtN2(WGHuFCI=orLW7`&2aR7Nyha(7%8G&}cMZORx|kDtWuk ze-vHno+i`}_OR$X-!VQBhG*QBiS-WVVyHx3}at4u}X(PfthHdfwgL5n~L- z7(72e7e5$zczB@MY=*C|FU;rja-=Mg`FxJAuP@AIGdw&z6h9mdf&fAYIL@!XG4BP( zao{)(gb)aVApN)fZ=e+&d$!lhmJ4`tjuR;XPG-j zxik~vVE0Z_$t!cF0qh{ZdDyWptjyaCk!gS+2*4OS+8n?b%S?bkjwKM^gFiO%$e!5; z#Or^r*E*2*tx+2mvW&W+mwLdemyQesn%xlv=HZR;!h11Y-=Olu-r9 zS_YX*fO8J5_10w4YPH~bUa80BmeFX$JkLX`)yjO1h@iFJxKOc9q5*;+fH5ZWy5l&h z1NC}6@;q;^&5{rTp68`T0p~pG1g#!v%OEuZj4>c0aL!?jfz}%Bc6(z&yYBbleT$td zDd)7?ZPHr97z55Zh$wUUCK_Nmox;8c7-OOv7)gon^YfGa#X;y~GGR$M$A-P#3jo6R zf$4ObI8LGgh$ynI?F5Mkp64CZrpRbCVx3MWipqAoO`hj5dxUPw;A*u>&0~oM7>~zn z{RfBoMmU*FSi9Y(PNzekpPvlal$D4u9*+~9mzufkI~E7v{~bVWr)MMcFC@gIuc@}rw{qul@i002ovPDHLkV1oV5mAn7| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/icon.png b/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ba8847b716bbf8e167aa4ce5989b31b79db95e18 GIT binary patch literal 824 zcmV-81IPS{P)Px%@<~KNR9J=0mOD@DFc^m4IH~K1Ap-FaP=y#Qq%8d<{9;C=E(lds2M{|$)x^PZ zY@Y$_V>js~z`1-0#@9*#Ex(?0(05Ha2v)TCjK>?g|y9;&}t{)PkwMN^v9&W8gmVMyTG(9X}yWQ?{ z>?AQoQABWK4Dvij(==d=VYyuTeZ3;&oZB&Z4#liit0d2JR8j0;Lqoy8l5Sn^uMDA*Vor}wOSn&5ccw7u}C=QRtN#c7}~alF$TsMXsvtjU5g?RDmw&L zO8K>$n;Yvq9t-aYIA$RjK-A-ekkN1;D8gga&pEda>aN`ZGZqevjKD6`AChIh@W#M_ zAOh}yA>*9eeQ@CSWFv%NHk;YOKkc!D5pZFz>l#Ti?3f#`)9KU~@oYA;>-GAiNO%EF z(*XFWbXRP3U85+9{hPB4X_|sk>i3VeC;|>%*EO`(m`A>2k|ape6jDmOy}jY~_BMKhITJ!)yWM&qA>+Sq{EpoocOtabczSw5Q51tB z{6U}auIupp{CsjJM3RLNgCeAq*lad?MSK+Ir4)IdMPx&K}keGRCt{2noCRbKoo}G%%!Pup%jHepwX6yZd~~Pe}yhZt%4v31u30en#uVV zWn$CDR$~=EI1hA@q;oFsoS9ji0T_m17=~dOhG7_nVHk#CnDz{ZLt1_w3CdZK2A?hNht--^WghFZf>iULIIE1<3IWm*ehtpxz=@9$$an^gfCV-N%Z%CdwI0!K$j zP)dEdgtgW%#sC0czk^PvyF~8j>#B1lVw@0 z1>W!X$=wTZcHDh|vMg)eVrR>BqFqPXTDxZV%K|txx3#B<2%hJGh>+(wthGqf6iO+i zX<7;6W_k7Qknj7o@4(^~%JTT-iCFgO{I166zAN={np*{!PN$Gk)_V0#2qCJ#t+jZ4 zeO)WLe!ov?nnG*cSOLJIy{@%x+-G{dUM)kV6o?2#QB-#bgb)xyRMlv$#dJFTFuzZ2 zR=r-2oCp9KgF8MxCYRJ?GWpR>&Vzu<1xf$_002ovPDHLkV1jjYq)Y$+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/inhand-right.png b/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..714cc9ce5d5c81a19fab26b9d0587b20a33303d1 GIT binary patch literal 874 zcmV-w1C{)VP)Px&BuPX;RCt{2nq5olKoExC&2AFNjZhSXKng8_H}?Pk3NO4=Y^@*&LJ^9a{mh;V z*__%osrA%S4)Z{v>1=0b-r32`EI<$hK@bE%5ClOG1VIo4K>$@%h1KWLXcW5Eo)YVE z?ut9D4m?9i{ug=j}fU=W z#=sau2%!}QKx=c(wMWnx1I{_5lyJ_qpKbREwAQVdz-J|kqJZ}v(U+7GP17KR?pJ{K zzKwO==iUMcA>h5=*f2gvAwmf4cVi5^_fSef2mz&3D@?5L>fNJAJWX*80DOFWeDM*J zTaBTM7}M%KfxQJ-E|=}BJ#OAK4VtEDlj58sNs=~b?>*k$-nRCpQVMCBcAfy>^Lk5~ zrg(jQ-S9CO4BD)_5?ei~-g_*U%bf!B_Qzl_2vLNH_a5GREEWqE?J=pvV)3gl!6*Xf zyi@4)7Px%-$_J4R9J=Omd$SJFc5{0e+WgWis+tYi;5Ig>ia)KHx(-uMd})fiiXIsW8VcG z*G?QrDfe#fNQlIW{hc!&PXhe!!TtqgKA$_fet&e7RgYV+=Y4cB%VQ z@DRLMESwMmN-5-d9%q1#+qrmte)i@3^76upqHw$24ggNVm&>J7O8J^7%Q6r}FaQ{1eAaGnZ?WI+!8wPu*6;hn z!-JDjdUND{G#VkQfphy`6on%wMSIJvwWz8JoO4Vj6O2Y9XszL#17i$QN@%TpV``e_ zXBh|`hasheF$SD-Os7*np2`?w%oi$S>{~$SEakor4jlJ9HJ_YQxr{MAI}FkH_9&DzYqt5CT)OC%zu3@bO@Vy)7YXnKUt3YvHMG_p5ma>7aNiNIUauKJ=s)ZaVWYWLBwgI!-}_Ilunw;6 jzE?m>2<`bb;Q;Uly=*DiefP*D00000NkvXXu0mjfX>xBz literal 0 HcmV?d00001 From 50c849281da96592ca69cfb6b960c18d2493e3a4 Mon Sep 17 00:00:00 2001 From: Fragoler Date: Sat, 17 Aug 2024 00:36:02 +0300 Subject: [PATCH 2/2] fix meta --- Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/meta.json b/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/meta.json index 51e2c696fc..aec0aec9b0 100644 --- a/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/meta.json +++ b/Resources/Textures/Exodus/Objects/Misc/guitarbag.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-NC-ND-4.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "By neo3301", "size": { "x": 32,