From 48af9f90c0ed721e29d3810f3a5e4d9651ed0e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?=
 <6766154+Zumorica@users.noreply.github.com>
Date: Fri, 7 Feb 2020 23:38:52 +0100
Subject: [PATCH] Disable instruments (#617)

---
 .../Entities/buildings/instruments.yml        | 140 +++++-----
 .../Prototypes/Entities/items/Instruments.yml | 264 +++++++++---------
 2 files changed, 202 insertions(+), 202 deletions(-)

diff --git a/Resources/Prototypes/Entities/buildings/instruments.yml b/Resources/Prototypes/Entities/buildings/instruments.yml
index 45b40d502e..ce8cc881b9 100644
--- a/Resources/Prototypes/Entities/buildings/instruments.yml
+++ b/Resources/Prototypes/Entities/buildings/instruments.yml
@@ -1,70 +1,70 @@
-- type: entity
-  name: BaseInstrument
-  id: BaseInstrument
-  abstract: true
-  components:
-  - type: Instrument
-    handheld: false
-
-  - type: Clickable
-  - type: InteractionOutline
-
-  - type: Collidable
-    shapes:
-    - !type:PhysShapeAabb
-      layer: 31
-
-  - type: SnapGrid
-    offset: Center
-
-  - type: Damageable
-  - type: Destructible
-    thresholdvalue: 50
-
-  - type: UserInterface
-    interfaces:
-    - key: enum.InstrumentUiKey.Key
-      type: InstrumentBoundUserInterface
-
-- type: entity
-  name: Piano
-  parent: BaseInstrument
-  id: PianoInstrument
-  description: Play Needles Piano Now.
-  components:
-  - type: Instrument
-    program: 1
-  - type: Sprite
-    sprite: Objects/Instruments/musician.rsi
-    state: piano
-  - type: Icon
-    sprite: Objects/Instruments/musician.rsi
-    state: piano
-
-- type: entity
-  name: Minimoog
-  parent: BaseInstrument
-  id: MinimoogInstrument
-  components:
-  - type: Instrument
-    program: 7
-  - type: Sprite
-    sprite: Objects/Instruments/musician.rsi
-    state: minimoog
-  - type: Icon
-    sprite: Objects/Instruments/musician.rsi
-    state: minimoog
-
-- type: entity
-  name: Xylophone
-  parent: BaseInstrument
-  id: XylophoneInstrument
-  components:
-  - type: Instrument
-    program: 13
-  - type: Sprite
-    sprite: Objects/Instruments/musician.rsi
-    state: xylophone
-  - type: Icon
-    sprite: Objects/Instruments/musician.rsi
-    state: xylophone
+# - type: entity
+#   name: BaseInstrument
+#   id: BaseInstrument
+#   abstract: true
+#   components:
+#   - type: Instrument
+#     handheld: false
+#
+#   - type: Clickable
+#   - type: InteractionOutline
+#
+#   - type: Collidable
+#     shapes:
+#     - !type:PhysShapeAabb
+#       layer: 31
+#
+#   - type: SnapGrid
+#     offset: Center
+#
+#   - type: Damageable
+#   - type: Destructible
+#     thresholdvalue: 50
+#
+#   - type: UserInterface
+#     interfaces:
+#     - key: enum.InstrumentUiKey.Key
+#       type: InstrumentBoundUserInterface
+#
+# - type: entity
+#   name: Piano
+#   parent: BaseInstrument
+#   id: PianoInstrument
+#   description: Play Needles Piano Now.
+#   components:
+#   - type: Instrument
+#     program: 1
+#   - type: Sprite
+#     sprite: Objects/Instruments/musician.rsi
+#     state: piano
+#   - type: Icon
+#     sprite: Objects/Instruments/musician.rsi
+#     state: piano
+#
+# - type: entity
+#   name: Minimoog
+#   parent: BaseInstrument
+#   id: MinimoogInstrument
+#   components:
+#   - type: Instrument
+#     program: 7
+#   - type: Sprite
+#     sprite: Objects/Instruments/musician.rsi
+#     state: minimoog
+#   - type: Icon
+#     sprite: Objects/Instruments/musician.rsi
+#     state: minimoog
+#
+# - type: entity
+#   name: Xylophone
+#   parent: BaseInstrument
+#   id: XylophoneInstrument
+#   components:
+#   - type: Instrument
+#     program: 13
+#   - type: Sprite
+#     sprite: Objects/Instruments/musician.rsi
+#     state: xylophone
+#   - type: Icon
+#     sprite: Objects/Instruments/musician.rsi
+#     state: xylophone
diff --git a/Resources/Prototypes/Entities/items/Instruments.yml b/Resources/Prototypes/Entities/items/Instruments.yml
index ccfd97dd8d..a308b6fb21 100644
--- a/Resources/Prototypes/Entities/items/Instruments.yml
+++ b/Resources/Prototypes/Entities/items/Instruments.yml
@@ -1,132 +1,132 @@
-- type: entity
-  name: BaseHandheldInstrument
-  parent: BaseItem
-  id: BaseHandheldInstrument
-  abstract: true
-  components:
-  - type: Instrument
-    handheld: true
-  - type: UserInterface
-    interfaces:
-    - key: enum.InstrumentUiKey.Key
-      type: InstrumentBoundUserInterface
-
-- type: entity
-  name: Synthesizer
-  parent: BaseHandheldInstrument
-  id: SynthesizerInstrument
-  components:
-  - type: Instrument
-    program: 2
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/h_synthesizer.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/h_synthesizer.png
-
-- type: entity
-  name: Violin
-  parent: BaseHandheldInstrument
-  id: ViolinInstrument
-  components:
-  - type: Instrument
-    program: 40
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/violin.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/violin.png
-
-- type: entity
-  name: Trumpet
-  parent: BaseHandheldInstrument
-  id: TrumpetInstrument
-  components:
-  - type: Instrument
-    program: 56
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/trumpet.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/trumpet.png
-
-- type: entity
-  name: Electric Guitar
-  parent: BaseHandheldInstrument
-  id: ElectricGuitarInstrument
-  components:
-  - type: Instrument
-    program: 27
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/eguitar.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/eguitar.png
-
-- type: entity
-  name: Accordion
-  parent: BaseHandheldInstrument
-  id: AccordionInstrument
-  components:
-  - type: Instrument
-    program: 21
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/accordion.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/accordion.png
-
-- type: entity
-  name: Harmonica
-  parent: BaseHandheldInstrument
-  id: HarmonicaInstrument
-  components:
-  - type: Instrument
-    program: 22
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/harmonica.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/harmonica.png
-
-- type: entity
-  name: Recorder
-  parent: BaseHandheldInstrument
-  id: RecorderInstrument
-  components:
-  - type: Instrument
-    program: 74
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/recorder.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/recorder.png
-
-- type: entity
-  name: Trombone
-  parent: BaseHandheldInstrument
-  id: TromboneInstrument
-  components:
-  - type: Instrument
-    program: 57
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/trombone.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/trombone.png
-
-- type: entity
-  name: Saxophone
-  parent: BaseHandheldInstrument
-  id: SaxophoneInstrument
-  components:
-  - type: Instrument
-    program: 67
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/saxophone.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/saxophone.png
-
-- type: entity
-  name: Glockenspiel
-  parent: BaseHandheldInstrument
-  id: GlockenspielInstrument
-  components:
-  - type: Instrument
-    program: 9
-  - type: Sprite
-    texture: Objects/Instruments/musician.rsi/glockenspiel.png
-  - type: Icon
-    texture: Objects/Instruments/musician.rsi/glockenspiel.png
+# - type: entity
+#   name: BaseHandheldInstrument
+#   parent: BaseItem
+#   id: BaseHandheldInstrument
+#   abstract: true
+#   components:
+#   - type: Instrument
+#     handheld: true
+#   - type: UserInterface
+#     interfaces:
+#     - key: enum.InstrumentUiKey.Key
+#       type: InstrumentBoundUserInterface
+#
+# - type: entity
+#   name: Synthesizer
+#   parent: BaseHandheldInstrument
+#   id: SynthesizerInstrument
+#   components:
+#   - type: Instrument
+#     program: 2
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/h_synthesizer.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/h_synthesizer.png
+#
+# - type: entity
+#   name: Violin
+#   parent: BaseHandheldInstrument
+#   id: ViolinInstrument
+#   components:
+#   - type: Instrument
+#     program: 40
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/violin.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/violin.png
+#
+# - type: entity
+#   name: Trumpet
+#   parent: BaseHandheldInstrument
+#   id: TrumpetInstrument
+#   components:
+#   - type: Instrument
+#     program: 56
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/trumpet.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/trumpet.png
+#
+# - type: entity
+#   name: Electric Guitar
+#   parent: BaseHandheldInstrument
+#   id: ElectricGuitarInstrument
+#   components:
+#   - type: Instrument
+#     program: 27
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/eguitar.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/eguitar.png
+#
+# - type: entity
+#   name: Accordion
+#   parent: BaseHandheldInstrument
+#   id: AccordionInstrument
+#   components:
+#   - type: Instrument
+#     program: 21
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/accordion.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/accordion.png
+#
+# - type: entity
+#   name: Harmonica
+#   parent: BaseHandheldInstrument
+#   id: HarmonicaInstrument
+#   components:
+#   - type: Instrument
+#     program: 22
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/harmonica.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/harmonica.png
+#
+# - type: entity
+#   name: Recorder
+#   parent: BaseHandheldInstrument
+#   id: RecorderInstrument
+#   components:
+#   - type: Instrument
+#     program: 74
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/recorder.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/recorder.png
+#
+# - type: entity
+#   name: Trombone
+#   parent: BaseHandheldInstrument
+#   id: TromboneInstrument
+#   components:
+#   - type: Instrument
+#     program: 57
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/trombone.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/trombone.png
+#
+# - type: entity
+#   name: Saxophone
+#   parent: BaseHandheldInstrument
+#   id: SaxophoneInstrument
+#   components:
+#   - type: Instrument
+#     program: 67
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/saxophone.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/saxophone.png
+#
+# - type: entity
+#   name: Glockenspiel
+#   parent: BaseHandheldInstrument
+#   id: GlockenspielInstrument
+#   components:
+#   - type: Instrument
+#     program: 9
+#   - type: Sprite
+#     texture: Objects/Instruments/musician.rsi/glockenspiel.png
+#   - type: Icon
+#     texture: Objects/Instruments/musician.rsi/glockenspiel.png