diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index aefcb7d17e..44bb41c964 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -15,7 +15,7 @@ id: FunBrass description: "Bring some jazz to the station with the brass ensemble. Contains a variety of brass instruments for the whole station to play." icon: - sprite: Structures/Furniture/instruments.rsi + sprite: Objects/Fun/Instruments/structureinstruments.rsi state: tuba product: CrateFunBrass cost: 3500 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml index 8d4f7166fd..8b1858cf23 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml @@ -24,8 +24,20 @@ - XylophoneInstrument - BikeHornInstrument - RecorderInstrument + - FluteInstrument + - ClarinetInstrument + - CelloInstrument + - KalimbaInstrument + - MicrophoneInstrument + - BassGuitarInstrument + - OcarinaInstrument + - PanFluteInstrument chance: 0.95 rarePrototypes: - SynthesizerInstrument - GunpetInstrument + - BagpipeInstrument + - RockGuitarInstrument + - MusicBoxInstrument + - ViolaInstrument rareChance: 0.05 diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml new file mode 100644 index 0000000000..3bff802b41 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml @@ -0,0 +1,78 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseHandheldInstrument + description: That's an instrument. + components: + - type: Sprite + netsync: false + - type: Instrument + - type: ActivatableUI + inHandsOnly: true + singleUser: true + verbText: verb-instrument-openui + key: enum.InstrumentUiKey.Key + - type: UserInterface + interfaces: + - key: enum.InstrumentUiKey.Key + type: InstrumentBoundUserInterface + - type: Item + size: 24 + +#These are for instruments that are larger, can't be picked up, or have collision +- type: entity + name: baseinstrument + id: BasePlaceableInstrument + parent: BaseStructureDynamic + abstract: true + components: + - type: Instrument + - type: ActivatableUI + allowSpectator: false # otherwise they can play client-side music + inHandsOnly: false + singleUser: true + requireHands: true + verbText: verb-instrument-openui + key: enum.InstrumentUiKey.Key + - type: InteractionOutline + - type: Sprite + sprite: Objects/Fun/Instruments/structureinstruments.rsi + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: UserInterface + interfaces: + - key: enum.InstrumentUiKey.Key + type: InstrumentBoundUserInterface + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.45 + mass: 50 + mask: + - Impassable + - HighImpassable + - MidImpassable + layer: + - Opaque + - HighImpassable + - MidImpassable + - BulletImpassable + +- type: entity + parent: BasePlaceableInstrument + id: BasePlaceableInstrumentRotatable + name: baseinstrumentrotatable + abstract: true + components: + - type: Rotatable + rotateWhileAnchored: true \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml new file mode 100644 index 0000000000..e8ac6f7ce5 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml @@ -0,0 +1,76 @@ +- type: entity + parent: BaseHandheldInstrument + id: TrumpetInstrument + name: trumpet + description: The favorite instrument of jazz musicians and egotistical middle schoolers. + components: + - type: Instrument + program: 56 + - type: SwappableInstrument + instrumentList: + "Standard": {56: 0} + "Muted": {59: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/trumpet.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/trumpet.rsi + - type: Tag + tags: + - BrassInstrument + +- type: entity + parent: BaseHandheldInstrument + id: TromboneInstrument + name: trombone + description: Everyone's favorite sliding brass instrument. + components: + - type: Instrument + program: 57 + - type: Sprite + sprite: Objects/Fun/Instruments/trombone.rsi + state: icon + - type: Item + size: 48 + sprite: Objects/Fun/Instruments/trombone.rsi + - type: Tag + tags: + - BrassInstrument + +- type: entity + parent: BaseHandheldInstrument + id: FrenchHornInstrument + name: french horn + description: The fact that holding it involves using your hand to muffle it may suggest something about its sound. + components: + - type: Instrument + program: 60 + - type: Sprite + sprite: Objects/Fun/Instruments/frenchhorn.rsi + state: icon + - type: Item + size: 48 + sprite: Objects/Fun/Instruments/frenchhorn.rsi + - type: Tag + tags: + - BrassInstrument + +- type: entity + parent: BaseHandheldInstrument + id: EuphoniumInstrument + name: euphonium + description: A baby tuba? A Baritone? Whatever it is, it's a pretty cool mess of pipes. + components: + - type: Instrument + program: 3 + bank: 1 + - type: Sprite + sprite: Objects/Fun/Instruments/euphonium.rsi + state: icon + - type: Item + size: 48 + sprite: Objects/Fun/Instruments/euphonium.rsi + - type: Tag + tags: + - BrassInstrument diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml new file mode 100644 index 0000000000..ac8aa046a4 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml @@ -0,0 +1,127 @@ +- type: entity + parent: BaseHandheldInstrument + id: MusicalLungInstrument + name: musical lung + description: The spiritual and magical lung of a former opera singer. Though, to be honest, the vocal chords make the performance. + components: + - type: Sprite + sprite: Mobs/Species/Human/organs.rsi + state: lung-l + - type: Instrument + program: 121 + - type: Item + size: 10 + +- type: entity + parent: BaseHandheldInstrument + id: SeashellInstrument + name: seashell + description: For laying down the shoreline beat. + components: + - type: Sprite + sprite: Objects/Fun/Instruments/otherinstruments.rsi + state: seashell + - type: Instrument + program: 122 + - type: Item + size: 10 + +- type: entity + parent: BaseHandheldInstrument + id: BirdToyInstrument + name: bird whistle + description: A delightful little whistle in the shape of a bird. It sings beautifully. + components: + - type: Sprite + sprite: Objects/Fun/Instruments/otherinstruments.rsi + state: birdtoy + - type: Instrument + program: 123 + - type: Item + size: 5 + +- type: entity + parent: BaseHandheldInstrument + id: PhoneInstrument + name: red phone + description: Should anything ever go wrong... + components: + - type: Sprite + sprite: Objects/Fun/Instruments/otherinstruments.rsi + state: red_phone + - type: EmitSoundOnLand + sound: + path: /Audio/Items/ring.ogg + - type: Instrument + program: 124 + - type: Item + size: 10 + +- type: entity + parent: BaseHandheldInstrument + id: HelicopterInstrument + name: toy helicopter + description: Ch-ka-ch-ka-ch-ka-ch-ka-ch-ka-ch-ka... + components: + - type: Sprite + sprite: Objects/Fun/Instruments/otherinstruments.rsi + state: helicopter + - type: Instrument + program: 125 + - type: Item + size: 10 + +- type: entity + parent: BaseHandheldInstrument + id: CannedApplauseInstrument + name: canned applause + description: Seems like someone already used it all up... + components: + - type: Sprite + sprite: Objects/Fun/Instruments/otherinstruments.rsi + state: cannedapplause + - type: Instrument + program: 126 + - type: Item + size: 5 + +- type: entity + parent: BaseHandheldInstrument + id: GunpetInstrument + name: gunpet + description: Why do you need to examine this? Is it not self-explanatory? + components: + - type: Instrument + program: 127 + - type: Sprite + sprite: Objects/Fun/Instruments/gunpet.rsi + state: icon + - type: Item + size: 15 + sprite: Objects/Fun/Instruments/gunpet.rsi + - type: Tag + tags: + - BrassInstrument + +- type: entity + parent: BaseHandheldInstrument + id: BikeHornInstrument + name: gilded bike horn + description: An exquisitely decorated bike horn, capable of honking in a variety of notes. + components: + - type: Instrument + program: 1 + bank: 1 + - type: Sprite + sprite: Objects/Fun/Instruments/bike_horn.rsi + state: icon + - type: Tag + tags: + - BrassInstrument #Go figure. + - type: Item + sprite: Objects/Fun/Instruments/bike_horn.rsi + size: 10 + - type: Clothing + sprite: Objects/Fun/Instruments/bike_horn.rsi + slots: [Belt] + quickEquip: false \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml new file mode 100644 index 0000000000..1ab803c5e2 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml @@ -0,0 +1,139 @@ +- type: entity + parent: BaseHandheldInstrument + id: GlockenspielInstrument + name: glockenspiel + components: + - type: Instrument + program: 9 + - type: Sprite + sprite: Objects/Fun/Instruments/glockenspiel.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/glockenspiel.rsi + - type: Tag + tags: + - PercussionInstrument + +- type: entity + parent: BaseHandheldInstrument + id: MusicBoxInstrument + name: music box + description: Playing this makes you feel safe from scary animatronics. + components: + - type: Instrument + program: 10 + - type: Sprite + sprite: Objects/Fun/Instruments/musicbox.rsi + state: icon + +- type: entity + parent: BaseHandheldInstrument + id: XylophoneInstrument + name: xylophone + description: Rainbow colored glockenspiel. + components: + - type: Instrument + program: 13 + - type: Sprite + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: xylophone + - type: Tag + tags: + - PercussionInstrument + +- type: entity + parent: BaseHandheldInstrument + id: MicrophoneInstrument + name: microphone + description: Perfect for singing your heart out. + components: + - type: Instrument + program: 52 + - type: SwappableInstrument + instrumentList: + "Aah": {52: 0} + "Ooh": {53: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/microphone.rsi + state: icon + - type: Item + size: 10 + sprite: Objects/Fun/Instruments/microphone.rsi + +- type: entity + parent: BaseHandheldInstrument + id: SynthesizerInstrument + name: synthesizer + components: + - type: Instrument + program: 62 + - type: SwappableInstrument + instrumentList: + "Electro": {62: 0} #i needed generic sounding synth presets, sue me + "Bubbles": {63: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/h_synthesizer.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/h_synthesizer.rsi + - type: Tag + tags: + - KeyedInstrument + +- type: entity + parent: BaseHandheldInstrument + id: KalimbaInstrument + name: kalimba + description: The power of a piano right at your thumbs. + components: + - type: Instrument + program: 108 + - type: Sprite + sprite: Objects/Fun/Instruments/kalimba.rsi + state: icon + - type: Tag + tags: + - KeyedInstrument + +- type: entity + parent: BaseHandheldInstrument + id: WoodblockInstrument + name: woodblock + description: If you listen to this enough it'll start driving itself into your mind. + components: + - type: Instrument + program: 115 + - type: Sprite + sprite: Objects/Fun/Instruments/woodblock.rsi + state: icon + +- type: entity + parent: BaseHandheldInstrument + id: ReverseCymbalsInstrument + name: reverse cymbals + description: I think you have it the wrong way around? + components: + - type: Instrument + program: 119 + - type: Sprite + sprite: Objects/Fun/Instruments/reversecymbal.rsi + state: icon + +- type: entity + parent: BaseHandheldInstrument + id: SuperSynthesizerInstrument + name: super synthesizer + description: Blasting the ghetto with Touhou MIDIs since 2020. + components: + - type: Instrument + allowPercussion: true + allowProgramChange: true + respectMidiLimits: false + - type: Sprite + sprite: Objects/Fun/Instruments/h_synthesizer.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/h_synthesizer.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml new file mode 100644 index 0000000000..88a39b00f9 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml @@ -0,0 +1,195 @@ +- type: entity + parent: BaseHandheldInstrument + id: ElectricGuitarInstrument + name: electric guitar + description: Now this makes you feel like a rock star! + components: + - type: Instrument + program: 27 + - type: SwappableInstrument + instrumentList: + "Clean": {27: 0} + "Jazz": {25: 0} + "Muted": {28: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/eguitar.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/eguitar.rsi + - type: Tag + tags: + - StringInstrument + +- type: entity + parent: BaseHandheldInstrument + id: BassGuitarInstrument + name: bass guitar + description: You feel really cool holding this. Shame you're the only one that thinks that. + components: + - type: Instrument + program: 33 + - type: SwappableInstrument + instrumentList: + "Fingered": {33: 0} + "Pick": {34: 0} + "Slap": {36: 0} + "Slap (XTra Funky)": {37: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/bassguitar.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/bassguitar.rsi + - type: Tag + tags: + - StringInstrument + +- type: entity + parent: BaseHandheldInstrument + id: RockGuitarInstrument + name: rock guitar + description: What an axe! + components: + - type: Instrument + program: 29 + - type: SwappableInstrument + instrumentList: + "Overdrive": {29: 0} + "Distortion": {30: 0} + "Harmonics": {31: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/rockguitar.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/rockguitar.rsi + - type: Tag + tags: + - StringInstrument + - type: MeleeWeapon + damage: + types: + Blunt: 4 + Slash: 8 + - type: Wieldable + - type: IncreaseDamageOnWield #they don't call it an axe for nothing + modifiers: + flatReductions: + Blunt: -2 + Slash: -6 + +- type: entity + parent: BaseHandheldInstrument + id: AcousticGuitarInstrument + name: acoustic guitar + description: Anyway, here's Wonderwall. + components: + - type: Instrument + program: 24 + - type: SwappableInstrument + instrumentList: + "Nylon": {24: 0} + "Steel": {25: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/guitar.rsi + state: icon + - type: Tag + tags: + - StringInstrument + - type: Item + sprite: Objects/Fun/Instruments/guitar.rsi + size: 24 + - type: Clothing + quickEquip: false + slots: + - back + sprite: Objects/Fun/Instruments/guitar.rsi + +- type: entity + parent: BaseHandheldInstrument + id: GuitarlessFretsInstrument + name: guitarless frets + description: who even needs a body? + suffix: Admeme #the sound is awful + components: + - type: Instrument + program: 120 + - type: Sprite + sprite: Objects/Fun/Instruments/guitarlessfrets.rsi + state: icon + +- type: entity + parent: BaseHandheldInstrument + id: BanjoInstrument + name: banjo + components: + - type: Instrument + program: 105 + - type: Sprite + sprite: Objects/Fun/Instruments/banjo.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/banjo.rsi + - type: Tag + tags: + - StringInstrument + +- type: entity + parent: BaseHandheldInstrument + id: ViolinInstrument + name: violin + description: The favorite of musical virtuosos and bluegrass bands. + components: + - type: Instrument + program: 40 + - type: SwappableInstrument + instrumentList: + "Classical": {40: 0} + "Bluegrass": {110: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/violin.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/violin.rsi + - type: Tag + tags: + - StringInstrument + +- type: entity + parent: BaseHandheldInstrument + id: ViolaInstrument + name: viola + description: Like a violin, but worse. + components: + - type: Instrument + program: 41 + - type: Sprite + sprite: Objects/Fun/Instruments/viola.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/viola.rsi + - type: Tag + tags: + - StringInstrument + +- type: entity + parent: BaseHandheldInstrument + id: CelloInstrument + name: cello + description: The nerds call these violoncellos. + components: + - type: Instrument + program: 42 + - type: Sprite + sprite: Objects/Fun/Instruments/cello.rsi + state: icon + - type: Item + size: 48 + sprite: Objects/Fun/Instruments/cello.rsi + - type: Tag + tags: + - StringInstrument \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml similarity index 60% rename from Resources/Prototypes/Entities/Structures/Furniture/instruments.yml rename to Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml index f321af379f..5296e7f346 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml @@ -1,63 +1,4 @@ - type: entity - name: baseinstrument - id: BasePlaceableInstrument - parent: BaseStructureDynamic - abstract: true - components: - - type: Instrument - - type: ActivatableUI - allowSpectator: false # otherwise they can play client-side music - inHandsOnly: false - singleUser: true - requireHands: true - verbText: verb-instrument-openui - key: enum.InstrumentUiKey.Key - - type: InteractionOutline - - type: Sprite - sprite: Structures/Furniture/instruments.rsi - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - type: UserInterface - interfaces: - - key: enum.InstrumentUiKey.Key - type: InstrumentBoundUserInterface - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeCircle - radius: 0.45 - mass: 50 - mask: - - Impassable - - HighImpassable - - MidImpassable - layer: - - Opaque - - HighImpassable - - MidImpassable - - BulletImpassable - - type: Transform - anchored: true - -- type: entity - parent: BasePlaceableInstrument - id: BasePlaceableInstrumentRotatable - name: baseinstrumentrotatable - abstract: true - components: - - type: Rotatable - rotateWhileAnchored: true - -- type: entity name: piano parent: BasePlaceableInstrumentRotatable id: PianoInstrument @@ -82,15 +23,25 @@ - type: Climbable - type: entity - name: minimoog + name: vibraphone + id: VibraphoneInstrument parent: BasePlaceableInstrumentRotatable - id: MinimoogInstrument - description: This is a minimoog, like a space piano, but more spacey! + description: Good vibes all around. components: - type: Instrument - program: 81 + program: 11 - type: Sprite - state: minimoog + state: vibraphone + +- type: entity + name: marimba + id: MarimbaInstrument + parent: BasePlaceableInstrumentRotatable + components: + - type: Instrument + program: 12 + - type: Sprite + state: marimba - type: entity name: church organ @@ -105,7 +56,7 @@ - type: entity name: tuba - parent: BasePlaceableInstrumentRotatable + parent: BasePlaceableInstrument id: TubaInstrument description: The big daddy of the brass family. Standing next to its majesty makes you feel insecure. components: @@ -114,6 +65,86 @@ - type: Sprite state: tuba +- type: entity + id: HarpInstrument + parent: BasePlaceableInstrument + name: harp + description: Plucking at the strings cuts your fingers, but at least the music is pretty. + components: + - type: Instrument + program: 46 + - type: Sprite + state: harp + +- type: entity + id: TimpaniInstrument + parent: BasePlaceableInstrumentRotatable + name: timpani + description: It goes BOOM BOOM BOOM BOOM! + components: + - type: Instrument + program: 47 + - type: Sprite + state: timpani + +- type: entity + id: TaikoInstrument + parent: BasePlaceableInstrumentRotatable + name: taiko + description: A large drum. Looking at it fills you with the urge to slap it. + components: + - type: Instrument + program: 116 + - type: Sprite + state: taiko + +- type: entity + id: ContrabassInstrument + parent: BasePlaceableInstrument + name: contrabass + description: Perfect for laying down a nice jazzy beat. + components: + - type: Instrument + program: 43 + - type: Sprite + state: contrabass + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.30 + mass: 50 + mask: + - Impassable + - HighImpassable + - MidImpassable + layer: + - Opaque + - HighImpassable + - MidImpassable + - BulletImpassable + +- type: entity + name: minimoog + parent: BasePlaceableInstrumentRotatable + id: MinimoogInstrument + description: This is a minimoog, like a space piano, but more spacey! + components: + - type: Instrument + program: 81 + - type: Sprite + state: minimoog + +- type: entity + id: TomDrumsInstrument + parent: BasePlaceableInstrumentRotatable + name: tom drums + description: Where'd the rest of the kit go? + components: + - type: Instrument + program: 117 + - type: Sprite + state: toms - type: entity parent: BasePlaceableInstrument diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml new file mode 100644 index 0000000000..09db613313 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml @@ -0,0 +1,178 @@ +- type: entity + parent: BaseHandheldInstrument + id: SaxophoneInstrument + name: saxophone + description: An instrument. You could probably grind this into raw jazz. + components: + - type: Instrument + program: 66 + - type: SwappableInstrument + instrumentList: + "Soprano": {64: 0} + "Alto": {65: 0} + "Tenor": {66: 0} + "Baritone": {67: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/saxophone.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/saxophone.rsi + - type: Tag + tags: + - WoodwindInstrument + - type: Extractable + grindableSolutionName: sax + - type: SolutionContainerManager + solutions: + sax: + reagents: + - ReagentId: Saxoite + Quantity: 10 + +- type: entity + parent: BaseHandheldInstrument + id: AccordionInstrument + name: accordion + components: + - type: Instrument + program: 21 + - type: SwappableInstrument + instrumentList: + "Standard": {21: 0} + "Tango": {23: 0} + - type: Sprite + sprite: Objects/Fun/Instruments/accordion.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/accordion.rsi + - type: Tag + tags: + - KeyedInstrument + +- type: entity + parent: BaseHandheldInstrument + id: HarmonicaInstrument + name: harmonica + components: + - type: Instrument + program: 22 + - type: Sprite + sprite: Objects/Fun/Instruments/harmonica.rsi + state: icon + - type: Item + size: 10 + sprite: Objects/Fun/Instruments/harmonica.rsi + - type: Tag + tags: + - WoodwindInstrument + +- type: entity + parent: BaseHandheldInstrument + id: ClarinetInstrument + name: clarinet + description: Skweedward tintacklays. + components: + - type: Instrument + program: 71 + - type: Sprite + sprite: Objects/Fun/Instruments/clarinet.rsi + state: icon + - type: Item + size: 20 + sprite: Objects/Fun/Instruments/clarinet.rsi + - type: Tag + tags: + - WoodwindInstrument + +- type: entity + parent: BaseHandheldInstrument + id: FluteInstrument + name: flute + description: Reaching new heights of being horrifyingly shrill. + components: + - type: Instrument + program: 73 + - type: Sprite + sprite: Objects/Fun/Instruments/flute.rsi + state: icon + - type: Item + size: 20 + sprite: Objects/Fun/Instruments/flute.rsi + - type: Tag + tags: + - WoodwindInstrument + +- type: entity + parent: BaseHandheldInstrument + id: RecorderInstrument + name: recorder + description: Comes in various colors of fashionable plastic! + components: + - type: Instrument + program: 74 + - type: Sprite + sprite: Objects/Fun/Instruments/recorder.rsi + state: icon + - type: Item + size: 24 + sprite: Objects/Fun/Instruments/recorder.rsi + - type: Tag + tags: + - WoodwindInstrument + +- type: entity + parent: BaseHandheldInstrument + id: PanFluteInstrument + name: pan flute + description: Perfect for luring ancient mythical beings to dance with you. + components: + - type: Instrument + program: 75 + - type: Sprite + sprite: Objects/Fun/Instruments/panflute.rsi + state: icon + - type: Item + size: 15 + sprite: Objects/Fun/Instruments/panflute.rsi + - type: Tag + tags: + - WoodwindInstrument + +#if you change this to some cringe-ass zelda reference so help me god i will shoot you dead. +- type: entity + parent: BaseHandheldInstrument + id: OcarinaInstrument + name: ocarina + description: Good for playing lullabies. + components: + - type: Instrument + program: 79 + - type: Sprite + sprite: Objects/Fun/Instruments/ocarina.rsi + state: icon + - type: Item + size: 15 + sprite: Objects/Fun/Instruments/ocarina.rsi + - type: Tag + tags: + - WoodwindInstrument + +- type: entity + parent: BaseHandheldInstrument + id: BagpipeInstrument + name: bagpipe + description: Pairs nicely with a kilt. + components: + - type: Instrument + program: 109 + - type: Sprite + sprite: Objects/Fun/Instruments/bagpipes.rsi + state: icon + - type: Item + size: 48 + sprite: Objects/Fun/Instruments/bagpipes.rsi + - type: Tag + tags: + - WoodwindInstrument \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml deleted file mode 100644 index 9efd4955ba..0000000000 --- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml +++ /dev/null @@ -1,394 +0,0 @@ -- type: entity - abstract: true - parent: BaseItem - id: BaseHandheldInstrument - description: That's an instrument. - components: - - type: Sprite - netsync: false - - type: Instrument - - type: ActivatableUI - inHandsOnly: true - singleUser: true - verbText: verb-instrument-openui - key: enum.InstrumentUiKey.Key - - type: UserInterface - interfaces: - - key: enum.InstrumentUiKey.Key - type: InstrumentBoundUserInterface - - type: Item - size: 24 - -- type: entity - parent: BaseHandheldInstrument - id: SynthesizerInstrument - name: synthesizer - components: - - type: Instrument - program: 62 - - type: SwappableInstrument - instrumentList: - "Electro": {62: 0} #i needed generic sounding synth presets, sue me - "Bubbles": {63: 0} - - type: Sprite - sprite: Objects/Fun/Instruments/h_synthesizer.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/h_synthesizer.rsi - - type: Tag - tags: - - KeyedInstrument - -- type: entity - parent: BaseHandheldInstrument - id: AcousticGuitarInstrument - name: acoustic guitar - description: Anyway, here's Wonderwall. - components: - - type: Instrument - program: 24 - - type: SwappableInstrument - instrumentList: - "Nylon": {24: 0} - "Steel": {25: 0} - - type: Sprite - sprite: Objects/Fun/Instruments/guitar.rsi - state: icon - - type: Tag - tags: - - StringInstrument - - type: Item - sprite: Objects/Fun/Instruments/guitar.rsi - size: 24 - - type: Clothing - quickEquip: false - slots: - - back - sprite: Objects/Fun/Instruments/guitar.rsi - -- type: entity - parent: BaseHandheldInstrument - id: ViolinInstrument - name: violin - components: - - type: Instrument - program: 40 - - type: Sprite - sprite: Objects/Fun/Instruments/violin.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/violin.rsi - - type: Tag - tags: - - StringInstrument - -- type: entity - parent: BaseHandheldInstrument - id: TrumpetInstrument - name: trumpet - description: The favorite instrument of jazz musicians and egotistical middle schoolers. - components: - - type: Instrument - program: 56 - - type: SwappableInstrument - instrumentList: - "Standard": {56: 0} - "Muted": {59: 0} - - type: Sprite - sprite: Objects/Fun/Instruments/trumpet.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/trumpet.rsi - - type: Tag - tags: - - BrassInstrument - -- type: entity - parent: BaseHandheldInstrument - id: GunpetInstrument - name: gunpet - description: Why do you need to examine this? Is it not self-explanatory? - components: - - type: Instrument - program: 127 - - type: Sprite - sprite: Objects/Fun/Instruments/gunpet.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/gunpet.rsi - - type: Tag - tags: - - BrassInstrument - -- type: entity - parent: BaseHandheldInstrument - id: ElectricGuitarInstrument - name: electric guitar - components: - - type: Instrument - program: 27 - - type: SwappableInstrument - instrumentList: - "Clean": {27: 0} - "Jazz": {25: 0} - "Muted": {28: 0} - - type: Sprite - sprite: Objects/Fun/Instruments/eguitar.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/eguitar.rsi - - type: Tag - tags: - - StringInstrument - -- type: entity - parent: BaseHandheldInstrument - id: AccordionInstrument - name: accordion - components: - - type: Instrument - program: 21 - - type: SwappableInstrument - instrumentList: - "Standard": {21: 0} - "Tango": {23: 0} - - type: Sprite - sprite: Objects/Fun/Instruments/accordion.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/accordion.rsi - - type: Tag - tags: - - KeyedInstrument - -- type: entity - parent: BaseHandheldInstrument - id: HarmonicaInstrument - name: harmonica - components: - - type: Instrument - program: 22 - - type: Sprite - sprite: Objects/Fun/Instruments/harmonica.rsi - state: icon - - type: Item - size: 10 - sprite: Objects/Fun/Instruments/harmonica.rsi - - type: Tag - tags: - - WoodwindInstrument - -- type: entity - parent: BaseHandheldInstrument - id: RecorderInstrument - name: recorder - components: - - type: Instrument - program: 74 - - type: Sprite - sprite: Objects/Fun/Instruments/recorder.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/recorder.rsi - - type: Tag - tags: - - WoodwindInstrument - -- type: entity - parent: BaseHandheldInstrument - id: TromboneInstrument - name: trombone - description: Everyone's favorite sliding brass instrument. - components: - - type: Instrument - program: 57 - - type: Sprite - sprite: Objects/Fun/Instruments/trombone.rsi - state: icon - - type: Item - size: 48 - sprite: Objects/Fun/Instruments/trombone.rsi - - type: Tag - tags: - - BrassInstrument - -- type: entity - parent: BaseHandheldInstrument - id: EuphoniumInstrument - name: euphonium - description: A baby tuba? A Baritone? Whatever it is, it's a pretty cool mess of pipes. - components: - - type: Instrument - program: 3 - bank: 1 - - type: Sprite - sprite: Objects/Fun/Instruments/euphonium.rsi - state: icon - - type: Item - size: 48 - sprite: Objects/Fun/Instruments/euphonium.rsi - - type: Tag - tags: - - BrassInstrument - -- type: entity - parent: BaseHandheldInstrument - id: FrenchHornInstrument - name: french horn - description: The fact that holding it involves using your hand to muffle it may suggest something about its sound. - components: - - type: Instrument - program: 60 - - type: Sprite - sprite: Objects/Fun/Instruments/frenchhorn.rsi - state: icon - - type: Item - size: 48 - sprite: Objects/Fun/Instruments/frenchhorn.rsi - - type: Tag - tags: - - BrassInstrument - -- type: entity - parent: BaseHandheldInstrument - id: SaxophoneInstrument - name: saxophone - description: An instrument. You could probably grind this into raw jazz. - components: - - type: Instrument - program: 66 - - type: SwappableInstrument - instrumentList: - "Soprano": {64: 0} - "Alto": {65: 0} - "Tenor": {66: 0} - "Baritone": {67: 0} - - type: Sprite - sprite: Objects/Fun/Instruments/saxophone.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/saxophone.rsi - - type: Tag - tags: - - WoodwindInstrument - - type: Extractable - grindableSolutionName: sax - - type: SolutionContainerManager - solutions: - sax: - reagents: - - ReagentId: Saxoite - Quantity: 10 - -- type: entity - parent: BaseHandheldInstrument - id: GlockenspielInstrument - name: glockenspiel - components: - - type: Instrument - program: 9 - - type: Sprite - sprite: Objects/Fun/Instruments/glockenspiel.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/glockenspiel.rsi - - type: Tag - tags: - - PercussionInstrument - -- type: entity - parent: BaseHandheldInstrument - id: BanjoInstrument - name: banjo - components: - - type: Instrument - program: 105 - - type: Sprite - sprite: Objects/Fun/Instruments/banjo.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/banjo.rsi - - type: Tag - tags: - - StringInstrument - -- type: entity - parent: BaseHandheldInstrument - id: BikeHornInstrument - name: gilded bike horn - description: An exquisitely decorated bike horn, capable of honking in a variety of notes. - components: - - type: Instrument - program: 1 - bank: 1 - - type: Sprite - sprite: Objects/Fun/Instruments/bike_horn.rsi - state: icon - - type: Tag - tags: - - BrassInstrument #Go figure. - - type: Item - sprite: Objects/Fun/Instruments/bike_horn.rsi - size: 24 - - type: Clothing - sprite: Objects/Fun/Instruments/bike_horn.rsi - slots: [Belt] - quickEquip: false - -- type: entity - parent: BaseHandheldInstrument - id: SuperSynthesizerInstrument - name: super synthesizer - description: Blasting the ghetto with Touhou MIDIs since 2020. - components: - - type: Instrument - allowPercussion: true - allowProgramChange: true - respectMidiLimits: false - - type: Sprite - sprite: Objects/Fun/Instruments/h_synthesizer.rsi - state: icon - - type: Item - size: 24 - sprite: Objects/Fun/Instruments/h_synthesizer.rsi - -- type: entity - parent: BaseHandheldInstrument - id: XylophoneInstrument - name: xylophone - description: Rainbow colored glockenspiel. - components: - - type: Instrument - program: 13 - - type: Sprite - sprite: Structures/Furniture/instruments.rsi - state: xylophone - - type: Tag - tags: - - PercussionInstrument - -- type: entity - parent: BaseHandheldInstrument - id: PhoneInstrument - name: red phone - description: Should anything ever go wrong... - components: - - type: Sprite - sprite: Objects/Fun/Instruments/otherinstruments.rsi - state: red_phone - - type: EmitSoundOnLand - sound: - path: /Audio/Items/ring.ogg - - type: Instrument - program: 124 - diff --git a/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/icon.png new file mode 100644 index 0000000000..317bed0994 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/inhand-left.png new file mode 100644 index 0000000000..2be434bd47 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/inhand-right.png new file mode 100644 index 0000000000..856cd3a083 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/meta.json new file mode 100644 index 0000000000..926a59eb20 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/bagpipes.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/icon.png new file mode 100644 index 0000000000..602565393c Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/inhand-left.png new file mode 100644 index 0000000000..51c785959c Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/inhand-right.png new file mode 100644 index 0000000000..05288b8508 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json new file mode 100644 index 0000000000..926a59eb20 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/bassguitar.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/cello.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/cello.rsi/icon.png new file mode 100644 index 0000000000..16b4f8826e Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/cello.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/cello.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/cello.rsi/inhand-left.png new file mode 100644 index 0000000000..e6d4f8cd70 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/cello.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/cello.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/cello.rsi/inhand-right.png new file mode 100644 index 0000000000..208317248f Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/cello.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/cello.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/cello.rsi/meta.json new file mode 100644 index 0000000000..30624ccf1e --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/cello.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Hyenh and EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/icon.png new file mode 100644 index 0000000000..c06f979d58 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/inhand-left.png new file mode 100644 index 0000000000..0db396dd14 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/inhand-right.png new file mode 100644 index 0000000000..251fec9f09 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/meta.json new file mode 100644 index 0000000000..30624ccf1e --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/clarinet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Hyenh and EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/icon.png index f0046b5e2e..10b1e842fb 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/icon.png and b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/inhand-left.png index 2334d2e7ba..eb0a12a1aa 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/inhand-right.png index 4290a49517..e6af6ec8e6 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json index 96e5157f93..926a59eb20 100644 --- a/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/eguitar.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "copyright": "Created by EmoGarbage404", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Fun/Instruments/flute.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/flute.rsi/icon.png new file mode 100644 index 0000000000..cfccac96a4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/flute.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/flute.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/flute.rsi/inhand-left.png new file mode 100644 index 0000000000..9c3ade053b Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/flute.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/flute.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/flute.rsi/inhand-right.png new file mode 100644 index 0000000000..70c8b8b281 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/flute.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/flute.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/flute.rsi/meta.json new file mode 100644 index 0000000000..30624ccf1e --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/flute.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Hyenh and EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/inhand-left.png index fa1da26b14..3a9b9be48a 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/inhand-right.png index ee9726be45..8610bb8126 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/Instruments/guitar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/icon.png new file mode 100644 index 0000000000..84e517ec2f Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/inhand-left.png new file mode 100644 index 0000000000..0d21bc8901 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/inhand-right.png new file mode 100644 index 0000000000..3a9db12acb Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/meta.json new file mode 100644 index 0000000000..10e4b7be0a --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/guitarlessfrets.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Hyenh", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/icon.png new file mode 100644 index 0000000000..06b69db6c8 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/inhand-left.png new file mode 100644 index 0000000000..42ad5aac88 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/inhand-right.png new file mode 100644 index 0000000000..093a5299b5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/meta.json new file mode 100644 index 0000000000..926a59eb20 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/kalimba.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/icon.png new file mode 100644 index 0000000000..9238427df6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/inhand-left.png new file mode 100644 index 0000000000..03ee42e56a Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/inhand-right.png new file mode 100644 index 0000000000..6f0f6ff551 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/meta.json new file mode 100644 index 0000000000..3723b22992 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/microphone.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/icon.png new file mode 100644 index 0000000000..04076c8632 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/inhand-left.png new file mode 100644 index 0000000000..c198b5d327 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/inhand-right.png new file mode 100644 index 0000000000..27bdf376e1 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/meta.json new file mode 100644 index 0000000000..30624ccf1e --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/musicbox.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Hyenh and EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/icon.png new file mode 100644 index 0000000000..044f0ce397 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/inhand-left.png new file mode 100644 index 0000000000..f3fe7c115c Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/inhand-right.png new file mode 100644 index 0000000000..5fc7ef9c51 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/meta.json new file mode 100644 index 0000000000..926a59eb20 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/ocarina.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/birdtoy.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/birdtoy.png new file mode 100644 index 0000000000..d9fdd46ae0 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/birdtoy.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/cannedapplause.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/cannedapplause.png new file mode 100644 index 0000000000..43bcc9ce59 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/cannedapplause.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/helicopter.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/helicopter.png new file mode 100644 index 0000000000..c2606e26c7 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/helicopter.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json index 70b35fbffe..62b4af9495 100644 --- a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json @@ -11,7 +11,10 @@ "name": "bike_horn" }, { - "name": "red_phone" + "name": "birdtoy" + }, + { + "name": "cannedapplause" }, { "name": "drum" @@ -21,6 +24,15 @@ }, { "name": "drum_makeshift" + }, + { + "name": "helicopter" + }, + { + "name": "red_phone" + }, + { + "name": "seashell" } ] } diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/red_phone.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/red_phone.png index e2ce5bfcf7..9beb81f1cb 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/red_phone.png and b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/red_phone.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/seashell.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/seashell.png new file mode 100644 index 0000000000..017685c845 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/seashell.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/icon.png new file mode 100644 index 0000000000..9b33f48d3e Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/inhand-left.png new file mode 100644 index 0000000000..de3b048b30 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/inhand-right.png new file mode 100644 index 0000000000..f23d30cbd7 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/meta.json new file mode 100644 index 0000000000..926a59eb20 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/panflute.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/icon.png index 5c8d85dc5d..f163d7d123 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/icon.png and b/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/inhand-left.png index 0931bc795b..de9fabe938 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/inhand-right.png index d9b1a320dc..dcc74a22b1 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/meta.json index 96e5157f93..926a59eb20 100644 --- a/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/recorder.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "copyright": "Created by EmoGarbage404", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/icon.png new file mode 100644 index 0000000000..059c083782 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/inhand-left.png new file mode 100644 index 0000000000..81fcdda8ec Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/inhand-right.png new file mode 100644 index 0000000000..81fcdda8ec Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/meta.json new file mode 100644 index 0000000000..3723b22992 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/reversecymbal.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/icon.png new file mode 100644 index 0000000000..f0046b5e2e Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/inhand-left.png new file mode 100644 index 0000000000..2334d2e7ba Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/inhand-right.png new file mode 100644 index 0000000000..4290a49517 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json new file mode 100644 index 0000000000..7d3a373c1b --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "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" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..2334d2e7ba Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..4290a49517 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/rockguitar.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/church-organ.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/church-organ.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/church-organ.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/church-organ.png diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/contrabass.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/contrabass.png new file mode 100644 index 0000000000..ad5a1f57e2 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/contrabass.png differ diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/daw-base.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/daw-base.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/daw-base.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/daw-base.png diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/daw-display.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/daw-display.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/daw-display.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/daw-display.png diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/daw-panel.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/daw-panel.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/daw-panel.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/daw-panel.png diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/harp.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/harp.png new file mode 100644 index 0000000000..a306fa217c Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/harp.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/marimba.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/marimba.png new file mode 100644 index 0000000000..6b5d3863ec Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/marimba.png differ diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json similarity index 69% rename from Resources/Textures/Structures/Furniture/instruments.rsi/meta.json rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json index b1fd779ad5..03ce80b13f 100644 --- a/Resources/Textures/Structures/Furniture/instruments.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331, daw-base/display from /tg/staiton at commit https://github.com/tgstation/tgstation/commit/ebcf2ab180037d400a7e8ac7a2ba011a0f03edf3", + "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331, daw-base/display from /tg/staiton at commit https://github.com/tgstation/tgstation/commit/ebcf2ab180037d400a7e8ac7a2ba011a0f03edf3, harp.png, timpani.png and contrabass.png by Hyenh, tuba.png by EmoGarbage404", "states": [ { "name": "minimoog", @@ -40,8 +40,32 @@ "directions": 4 }, { - "name": "tuba", - "directions": 1 + "name": "harp", + }, + { + "name": "contrabass", + }, + { + "name": "taiko" + }, + { + "name": "timpani", + "directions": 4 + }, + { + "name": "toms", + "directions": 4 + }, + { + "name": "marimba", + "directions": 4 + }, + { + "name": "vibraphone", + "directions": 4 + }, + { + "name": "tuba" }, { "name": "daw-base", diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/minimoog-broken.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/minimoog-broken.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/minimoog-broken.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/minimoog-broken.png diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/minimoog.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/minimoog.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/minimoog.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/minimoog.png diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/piano-broken.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/piano-broken.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/piano-broken.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/piano-broken.png diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/piano-upright.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/piano-upright.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/piano-upright.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/piano-upright.png diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/piano.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/piano.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/piano.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/piano.png diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/pianobroken.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/pianobroken.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/pianobroken.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/pianobroken.png diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/taiko.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/taiko.png new file mode 100644 index 0000000000..a6b4b732bf Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/taiko.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/timpani.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/timpani.png new file mode 100644 index 0000000000..78d304075b Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/timpani.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/toms.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/toms.png new file mode 100644 index 0000000000..bbf9791c11 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/toms.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/tuba.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/tuba.png new file mode 100644 index 0000000000..ea36fd688e Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/tuba.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/vibraphone.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/vibraphone.png new file mode 100644 index 0000000000..00e0cb7f6e Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/vibraphone.png differ diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/xylophone-broken.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/xylophone-broken.png similarity index 100% rename from Resources/Textures/Structures/Furniture/instruments.rsi/xylophone-broken.png rename to Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/xylophone-broken.png diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/xylophone.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/xylophone.png new file mode 100644 index 0000000000..71d4eb64e3 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/xylophone.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/icon.png index 8935226b10..71c9d6f862 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/icon.png and b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-left.png index 9eae6f1392..10aaeb9089 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-right.png index 7ccd6bcc1a..a7006b5f89 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/Instruments/trombone.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png index 062fd2887a..82fb18c02f 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png and b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png index af5bc5e634..823ac11696 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png index 748dc80c97..f7750490f0 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/viola.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/viola.rsi/icon.png new file mode 100644 index 0000000000..44afb195b5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/viola.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/viola.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/viola.rsi/inhand-left.png new file mode 100644 index 0000000000..623f6b4da4 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/viola.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/viola.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/viola.rsi/inhand-right.png new file mode 100644 index 0000000000..2f779d8f94 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/viola.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/viola.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/viola.rsi/meta.json new file mode 100644 index 0000000000..1724aa226e --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/viola.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Hyenh", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Instruments/violin.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/violin.rsi/icon.png index 0dc5a6a05d..b622bf68db 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/violin.rsi/icon.png and b/Resources/Textures/Objects/Fun/Instruments/violin.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/violin.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/violin.rsi/inhand-left.png index 1edf690c49..d188afae78 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/violin.rsi/inhand-left.png and b/Resources/Textures/Objects/Fun/Instruments/violin.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/violin.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/violin.rsi/inhand-right.png index f193a5efbd..7c0b1a7c2c 100644 Binary files a/Resources/Textures/Objects/Fun/Instruments/violin.rsi/inhand-right.png and b/Resources/Textures/Objects/Fun/Instruments/violin.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/violin.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/violin.rsi/meta.json index 96e5157f93..1724aa226e 100644 --- a/Resources/Textures/Objects/Fun/Instruments/violin.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Instruments/violin.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331", + "copyright": "Sprites by Hyenh", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/icon.png b/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/icon.png new file mode 100644 index 0000000000..6f1c50e2f5 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/inhand-left.png new file mode 100644 index 0000000000..af543eb0c6 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/inhand-right.png new file mode 100644 index 0000000000..1091ab0096 Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/meta.json new file mode 100644 index 0000000000..30624ccf1e --- /dev/null +++ b/Resources/Textures/Objects/Fun/Instruments/woodblock.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Hyenh and EmoGarbage404", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/tuba.png b/Resources/Textures/Structures/Furniture/instruments.rsi/tuba.png deleted file mode 100644 index 103cc29609..0000000000 Binary files a/Resources/Textures/Structures/Furniture/instruments.rsi/tuba.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/instruments.rsi/xylophone.png b/Resources/Textures/Structures/Furniture/instruments.rsi/xylophone.png deleted file mode 100644 index 4206cfca19..0000000000 Binary files a/Resources/Textures/Structures/Furniture/instruments.rsi/xylophone.png and /dev/null differ