From 22e08f231fc4d8a67d7b66c6b04c28c8844ae368 Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Sat, 13 Feb 2021 16:52:19 +0000
Subject: [PATCH] Added trumpet missing inhands (#3188)

removed trumpet from other instruments.
Added new .rsi for trumpet
---
 .../Entities/Objects/Fun/instruments.yml      |   7 ++-
 .../otherinstruments.rsi/meta.json            |   8 ---
 .../trumpet.png => trumpet.rsi/icon.png}      | Bin
 .../Instruments/trumpet.rsi/inhand-left.png   | Bin 0 -> 304 bytes
 .../Instruments/trumpet.rsi/inhand-right.png  | Bin 0 -> 308 bytes
 .../Fun/Instruments/trumpet.rsi/meta.json     |  55 ++++++++++++++++++
 6 files changed, 60 insertions(+), 10 deletions(-)
 rename Resources/Textures/Objects/Fun/Instruments/{otherinstruments.rsi/trumpet.png => trumpet.rsi/icon.png} (100%)
 create mode 100644 Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
index b7a46f8b1a..11fb69bed1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
@@ -67,8 +67,11 @@
   - type: Instrument
     program: 56
   - type: Sprite
-    sprite: Objects/Fun/Instruments/otherinstruments.rsi
-    state: trumpet
+    sprite: Objects/Fun/Instruments/trumpet.rsi
+    state: icon
+  - type: Item
+    size: 24
+    sprite: Objects/Fun/Instruments/trumpet.rsi
 
 - type: entity
   name: electric guitar
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
index 7cf7f66205..2726142380 100644
--- a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
@@ -23,14 +23,6 @@
         ]
       ]
     },
-    {
-      "name": "trumpet",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
     {
       "name": "drum_bongo",
       "delays": [
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/trumpet.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/trumpet.png
rename to Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/icon.png
diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..46f1698e4d341cc119971b0d26532449a1cf6209
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0MfBFvFrnizZH-*wE0R
z@7{bAD8yJ2<QL4~@a#q!kdspt5>eukTAW;zSx}OhpU1#ZF(){zps4iwm*9erU!Q1s
z>uQ}lb3S-OsKG_!2aj~l`)HnIDC+6mVPPC(eA(DbVa}sTM<#_R1g~7O!eqO`R+r9h
zW7W+oB$o7c8?V(cG#5Q$_9Q5*;A=6XG!H|AjI?}YR!lt5-f&MB#}JRs<OB)U#SK9U
z4jzpPjFoOOZU<Z?B{$C2W(aS*%H@`-l9&@_pe0yjt+>3uDbRqcgOTqA(}|sN4T8~O
u!XgfdTnQ;*Ok5JIfolX3WX_(w!pdOX$uuXuwYw8&1%s!npUXO@geCx=1ZQdh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2f41e0170e56de5eda0d39404fdf3133065b40d
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4*Z=?jzdFn?apJ^9ixxFB
zG#GvR`2;A%SQ6wH%;50sMjDWlQxy_X;*wgNT$EW*l9`{!z)&$KIIN(k^!u0Kf{$OH
zXnE^uojY?rctfbcMdJsLbk6%|o@6NM>D^&r9Atdi*h^u~qe(|5g(w8CT(ZJsyTVqN
z&TeDX%_}69^mZGs)i5*{J!1AGD6HUXF{3mOLxYU8d}LNkJkZ`~PZ!4!kIuJKHu4^D
z;9%Z3h0({z^IN>$ecOx5JAagX+&aggx6|O6@`9Er+!{P$3roFOHXFX`wa6DN*JON^
zko@oX!j{0`b6V^69+yZelRW)=f|JU}t{3|nZ$4pM;mpLbvnk;;&>99$S3j3^P6<r_
D!nu0U

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json
new file mode 100644
index 0000000000..2374ac813f
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/Instruments/trumpet.rsi/meta.json
@@ -0,0 +1,55 @@
+{
+  "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",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}