From f85dc9f94ee13191f7207b1eac1f61736ce069aa Mon Sep 17 00:00:00 2001
From: ScumbagDog <33865465+ScumbagDog@users.noreply.github.com>
Date: Sat, 13 Jun 2020 13:23:10 +0200
Subject: [PATCH] Church organ (#1121)

* Added organ sprite

* Added church organ object

* Renamed files and references to follow guidelines
---
 .../Entities/Buildings/instruments.yml        |  15 +++++++++++++++
 .../otherinstruments.rsi/church_organ.png     | Bin 0 -> 2409 bytes
 .../otherinstruments.rsi/meta.json            |  18 ++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 Resources/Textures/Objects/Instruments/otherinstruments.rsi/church_organ.png

diff --git a/Resources/Prototypes/Entities/Buildings/instruments.yml b/Resources/Prototypes/Entities/Buildings/instruments.yml
index b5c0f615de..b020d4cfc3 100644
--- a/Resources/Prototypes/Entities/Buildings/instruments.yml
+++ b/Resources/Prototypes/Entities/Buildings/instruments.yml
@@ -56,6 +56,21 @@
      sprite: Objects/Instruments/otherinstruments.rsi
      state: minimoog
 
+ - type: entity
+   name: church organ
+   parent: BaseInstrument
+   id: ChurchOrganInstrument
+   description: This thing really blows!
+   components:
+   - type: Instrument
+     program: 20
+   - type: Sprite
+     sprite: Objects/Instruments/otherinstruments.rsi
+     state: church_organ
+   - type: Icon
+     sprite: Objects/Instruments/otherinstruments.rsi
+     state: church_organ
+
  - type: entity
    name: xylophone
    parent: BaseInstrument
diff --git a/Resources/Textures/Objects/Instruments/otherinstruments.rsi/church_organ.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/church_organ.png
new file mode 100644
index 0000000000000000000000000000000000000000..5796441307cbbe9553663d95667a9c063a98f876
GIT binary patch
literal 2409
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
bOMm_ai5?b@fy{~P00000NkvXXu0mjf!vTo9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json
index efd96412ac..f41805a8ea 100644
--- a/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json
+++ b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json
@@ -79,6 +79,24 @@
         ]
       ]
     },
+    {
+      "name": "church_organ",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
     {
       "name": "piano",
       "directions": 4,