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 0000000000..2ac41f043f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/equipped-NECK.png differ 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 0000000000..22ba05e215 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/inhand-left.png new file mode 100644 index 0000000000..a38e280721 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/inhand-left.png differ 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 0000000000..48c683e384 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/meta.json new file mode 100644 index 0000000000..671c183226 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Fun/Instruments/lute.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}