From 8bbb0dad84487a376d4689114e758ec9aedee8ce Mon Sep 17 00:00:00 2001 From: creamybag Date: Sun, 2 Mar 2025 17:03:40 +0300 Subject: [PATCH] lute (#962) --- .../Entities/Objects/Fun/instruments.yml | 36 +++++++++++++++++- .../_CP14/Loadouts/Jobs/general.yml | 7 ++++ .../Instruments/lute.rsi/equipped-NECK.png | Bin 0 -> 833 bytes .../Objects/Fun/Instruments/lute.rsi/icon.png | Bin 0 -> 537 bytes .../Fun/Instruments/lute.rsi/inhand-left.png | Bin 0 -> 930 bytes .../Fun/Instruments/lute.rsi/inhand-right.png | Bin 0 -> 928 bytes .../Fun/Instruments/lute.rsi/meta.json | 26 +++++++++++++ 7 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml index 426a5263e1..e957d4381c 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseHandheldInstrument id: CP14FluteInstrument name: flute @@ -43,3 +43,37 @@ - type: Tag tags: - StringInstrument + +- type: entity + parent: BaseHandheldInstrument + id: CP14LuteInstrument + name: lute + description: A legend among bards. + categories: [ ForkFiltered ] + components: + - type: Instrument + program: 24 + - type: Sprite + sprite: _CP14/Objects/Fun/Instruments/lute.rsi + state: icon + - type: Item + size: Normal + sprite: _CP14/Objects/Fun/Instruments/lute.rsi + - type: Clothing + equipDelay: 0.25 + unequipDelay: 0.25 + sprite: _CP14/Objects/Fun/Instruments/lute.rsi + quickEquip: false + breakOnMove: false + slots: + - neck + - type: MeleeWeapon + wideAnimationRotation: 45 + damage: + types: + Blunt: 5 + soundHit: + collection: MetalThud + - type: Tag + tags: + - StringInstrument \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index a991d3546e..ce9e6c202e 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -493,6 +493,7 @@ - CP14Torch - CP14SmokingPipeFilledTobacco - CP14FluteInstrument + - CP14LuteInstrument - CP14LyraInstrument - CP14ClothingBeltQuiver @@ -574,6 +575,12 @@ back: - CP14LyraInstrument +- type: loadout + id: CP14LuteInstrument + storage: + back: + - CP14LuteInstrument + - type: loadout id: CP14FluteInstrument storage: diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..2ac41f043f0aee767bfb2e79938d4f8758ac0a5f GIT binary patch literal 833 zcmV-H1HSx;P)Px%`$fHcYjF%2LlFQN#J2E71yM7vS@@0n0O z$-FNj0!D*gAQT@@900)KZUeyIC;*bDTPy>}c)oIX6D0MFXYmBkPufasZF4usvpA!gzAP9mW2!bF8 zf*^>jV2qWbZ$N2>ND@ADyM^}>#pw`9eSx{`b#ZYi)0m(dA;-Pr1bV%S<9!3;i4%Ec zo+<*KhCFvYaMwf4FfvzuRm#;2LtAd`i6WJtt8zZ8o8l~5b(DV{F2gl>92uljpbQmW zMzOdKkTQTwyIEeIw{2VLT9GMmv}Xo8dIeX%*N@91LZa44Vi>6!&~9$v>c{#qWyt*` zNTq=I99=Z;-~3X($%-_9c$Y>ko<|ByxxZ45Oq-;p+{cbyS@}G#@DDdOTbs(}jEn%W zvzl@rtG?0ag^)!hQZ+yp4qx+u00000 LNkvXXu0mjfL_vDv literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..22ba05e215a78ec66175ae313b979b9b54e99a4a GIT binary patch literal 537 zcmV+!0_OdRP)Px$(@8`@R9J=WmA!7$P#A`vg9wdI{#;j8hQdS!6vTk6N}vuE3paqoHE<1F5=*Zk z6Lj!URdNvO($)ynNC#u5Ch-t6v?s)kV>?NUknlTM$M$)?_x(N}L#a~#yTn~=`u@#c ztb!2bkNNP)$z-&kS$LrWcDE++EcoE?6oCEi_H^x=3Nj}>OPMq9?)CFj zI6%)C0HFMFE<_J&nhKu-DhQ|7tGZ27W&+yXZ0s8T>S;UitRX9@dt|wX0tsm6J!imv zcY6xff4gJXUn`N!1kSw(<&UQW*K-C};A{A-E`*%>0`lBLP6GNY2YB|d2_%PZ*1c`p zxv-@RknOhM@@IVP`iXT7HR@FiSy|aVPx&TuDShRCt{2n$J(-KorNnHEZokk%}=K1TS(xl8rHqSvl>^>)!ku{0sJv@}Dq! z!eqn25S0Ta8|j4@n^FpvnmBtPQwMCJwBV2ReG*bA)4rMS%$sTFJ%Atxf*=TjAP9o^ zd`NFyfl2J<^Gs6}0D$GVxHgQr*Y``*g1WAc{I1n%0DzODea6q3_5c8I^Y~R7FE=Y< z;|rRMf+pkInEgJLQjt{~%~0W%rd_<7&okgWHlCQ=>-fjI zVFLinZXaitZCH+rYNIK|?e#FYz)_gg+d)Kffxqo8EXRdu%Ogi%*!cI1rYi7KnNU$e z1@KZCNdp+~RRFj)h9je8dC*kF7hw|PE-@>7UWv=J5ixNNs5Y9?_{>{vG$pR6rYiV- zbq4_0+fGAM6;w(^#wX03RG`6&~-ib5-TznMZ=bvMf4a!5Crj27=MF&k4$_L z{0uBifJOBFM;K8HWf2093%qp&2!bF8f*=TjcoSl6TZ?aHa<9Yow$lKBKle+C!{W2p z-&uZO0C0MKH4-n7dmZMbGLeF`k@EwB=(pSKpuG7UxxIJ&iq+q0{0A$na zfn_bng$6K0sKZnN#OTjzE++xQ2DU5@eZX)0*<~9@WdH!ht#uq9mYLWyN#LRSlcRlh zaodGy4^Z4%huQ7p;gzCX{EzY`cy2(;^1z3^m>a+`yZyvb;UG+V0LyVv zH*CN0mg7c>QiloA@v!YjlpI4Lb9DdMOE z{1CbX4Bc=R`*X<;2&&*~JO>2XehvEsK@bE%5dQ`L04)o+?UIs@O#lD@07*qoM6N<$ Eg0~m0r2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..48c683e384c257e62ac0f7d6a3dc4c923e485391 GIT binary patch literal 928 zcmV;R17G}!P)Px&T1iAfRCt{2n#)exKoo|5SH-S&A=zRdtXf&qt zdJOfNt@e&jrkknJ=s2Ui&~d2IXkhR7#E_nk-Geqdy>kFS({W+;yJ~0UO3|@iv(=Z6 zZX1}XObpVp0 zNgNv}6G4Q+U7i3exjo_PdFbkU9ZT-Hn1Ki9Bs*$Rs-M0A|0dqD!9aQYT3Cs7vYw z2>^GLV+wlK!AsA_nq>~zivDiN0I#b{IK9joxk?sIr>)(akZJ|c-XbTOjvMw0%mb^C zLDO+Vn`@SdrsEFTjrJ<#Diwo*PpSi2D}Y*7WV@|$m5Kpe%h2Rh+D;H%$UfO4q753r z_{U&U0<@i`cY!zu;~bb3arPfWj{?Im48t(YljJX{MzwJXaPmF?0000