diff --git a/Resources/Audio/MidiCustom/space-station-14.sf2 b/Resources/Audio/MidiCustom/space-station-14.sf2 index 879bb082dc..1811c90f74 100644 Binary files a/Resources/Audio/MidiCustom/space-station-14.sf2 and b/Resources/Audio/MidiCustom/space-station-14.sf2 differ diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index 48248078dd..049e6b7b5f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -380,3 +380,13 @@ cost: 1000 category: cargoproduct-category-name-fun group: market + +- type: cargoProduct + id: BigDrumsInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: drum + product: BigDrumsInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml index 43fd0e265f..878925b21e 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml @@ -168,3 +168,16 @@ - type: Instrument allowPercussion: true allowProgramChange: true + +- type: entity + parent: BasePlaceableInstrumentRotatable + id: BigDrumsInstrument + name: drum kit + description: Ba dum tss! + components: + - type: Instrument + program: 7 + bank: 100 # Defined in space-station-14.sf2 + allowPercussion: true + - type: Sprite + state: drum diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/drum.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/drum.png new file mode 100644 index 0000000000..683a06450b Binary files /dev/null and b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/drum.png differ diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json index ee4215faa6..0544b0293b 100644 --- a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.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, harp.png, timpani.png and contrabass.png by Hyenh, tuba.png by EmoGarbage404", + "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, drum.png by matriotic (Discord)", "states": [ { "name": "minimoog", @@ -85,6 +85,10 @@ 0.3 ] ] + }, + { + "name": "drum", + "directions": 4 } ] }