diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml index 57c69314f6..0a1ab2ec4e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml @@ -36,6 +36,7 @@ - type: entity id: CP14TelegraphyFireRune parent: CP14BaseMagicImpact + categories: [ HideSpawnMenu ] components: - type: PointLight color: "#eea911" @@ -54,6 +55,7 @@ - type: entity id: CP14AreaEntityEffectFireRune parent: CP14BaseMagicImpact + categories: [ HideSpawnMenu ] components: - type: PointLight color: "#eea911" diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml new file mode 100644 index 0000000000..426a5263e1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml @@ -0,0 +1,45 @@ +- type: entity + parent: BaseHandheldInstrument + id: CP14FluteInstrument + name: flute + description: A compact musical wind instrument, popular in villages as well as with large musical troupes. + categories: [ ForkFiltered ] + components: + - type: Instrument + program: 75 + - type: Sprite + sprite: _CP14/Objects/Fun/Instruments/flute.rsi + state: icon + - type: Item + size: Small + sprite: _CP14/Objects/Fun/Instruments/flute.rsi + - type: Tag + tags: + - WoodwindInstrument + +- type: entity + parent: BaseHandheldInstrument + id: CP14LyraInstrument + name: lyra + description: A common stringed instrument throughout Sylate, popular with various bards and musical troupes. + categories: [ ForkFiltered ] + components: + - type: Instrument + program: 46 + - type: Sprite + sprite: _CP14/Objects/Fun/Instruments/lira.rsi + state: icon + - type: Item + size: Normal + sprite: _CP14/Objects/Fun/Instruments/lira.rsi + - type: Clothing + equipDelay: 0.25 + unequipDelay: 0.25 + sprite: _CP14/Objects/Fun/Instruments/lira.rsi + quickEquip: false + breakOnMove: false + slots: + - belt + - type: Tag + tags: + - StringInstrument diff --git a/Resources/Textures/_CP14/Effects/music.rsi/meta.json b/Resources/Textures/_CP14/Effects/music.rsi/meta.json new file mode 100644 index 0000000000..11ab1b893d --- /dev/null +++ b/Resources/Textures/_CP14/Effects/music.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "notes_1", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_2", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_3", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_4", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_5", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_6", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + } + ] +} diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_1.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_1.png new file mode 100644 index 0000000000..2ce16cafc2 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/music.rsi/notes_1.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_2.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_2.png new file mode 100644 index 0000000000..a0dedfb9aa Binary files /dev/null and b/Resources/Textures/_CP14/Effects/music.rsi/notes_2.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_3.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_3.png new file mode 100644 index 0000000000..e76352be54 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/music.rsi/notes_3.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_4.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_4.png new file mode 100644 index 0000000000..9d7be84d55 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/music.rsi/notes_4.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_5.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_5.png new file mode 100644 index 0000000000..35d0a875f4 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/music.rsi/notes_5.png differ diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_6.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_6.png new file mode 100644 index 0000000000..f6f63e7a9d Binary files /dev/null and b/Resources/Textures/_CP14/Effects/music.rsi/notes_6.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/icon.png new file mode 100644 index 0000000000..3dbf136f46 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-left.png new file mode 100644 index 0000000000..cb6e1aa864 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-right.png new file mode 100644 index 0000000000..4f14fbdd00 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/meta.json new file mode 100644 index 0000000000..16961c328f --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..1b50cce58b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/icon.png new file mode 100644 index 0000000000..aad29c7feb Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-left.png new file mode 100644 index 0000000000..c819ea1e66 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-right.png new file mode 100644 index 0000000000..3994380238 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/meta.json new file mode 100644 index 0000000000..1a5c7004b7 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}