From 9915ed3af250139cb2d02542ad1d6016de481cb3 Mon Sep 17 00:00:00 2001
From: walter-no-orochi <nikolai.skulachev@gmail.com>
Date: Fri, 12 Jan 2024 01:32:17 +0300
Subject: [PATCH 01/11] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=B3=D0=B8=D1=82=D0=B0=D1=80=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ADT/Entities/Objects/Fun/rock-guitar.yml  |  12 ++++++++++++
 .../ADT/Objects/Fun/Rock-guitar/icon.png      | Bin 0 -> 785 bytes
 .../Objects/Fun/Rock-guitar/inhand-right.png  | Bin 0 -> 1727 bytes
 .../ADT/Objects/Fun/Rock-guitar/meta.json     |  18 ++++++++++++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml
 create mode 100644 Resources/Textures/ADT/Objects/Fun/Rock-guitar/icon.png
 create mode 100644 Resources/Textures/ADT/Objects/Fun/Rock-guitar/inhand-right.png
 create mode 100644 Resources/Textures/ADT/Objects/Fun/Rock-guitar/meta.json

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml
new file mode 100644
index 00000000000..c81a7fea5d3
--- /dev/null
+++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml
@@ -0,0 +1,12 @@
+- type: entity
+  parent: SuperSynthesizerInstrument
+  id: ADTEntityRockGuitarInstrument
+  name: Chariton's multi-guitar
+  description: The guitar of strict colors of one strict person. Black keys like a synthesizer are visible on the side of the guitar.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Fun/Rock-guitar.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: ADT/Objects/Fun/Rock-guitar.rsi
diff --git a/Resources/Textures/ADT/Objects/Fun/Rock-guitar/icon.png b/Resources/Textures/ADT/Objects/Fun/Rock-guitar/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6739019a9e2793b55dc80bbcddd49326e25704d6
GIT binary patch
literal 785
zcmV+s1Md8ZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<T!%0LzR9J<@mpxDFP#DL5c#MU3201aF$tE308W)?$=I%#uH%=}t
zehvpGCSu}uaCdRSL6)YQNf{Iq=+Y)2A?FU*b49s|yxsrO(mwR}y!CkiRxHPHjN>>a
z|Gc(pxaWCzo(EulvR|}}@B8NV_SPt+jPLtnnOKPfoleIzn@#J)DjhJs?;E9*>2x|q
zDP{6&D}&$M+!&?Q7<_YcbLkEkt+mlwe}OL>jN>>q^4x(*@WQg-p68Jy2>^q^fGo@K
zJdY@fmcslfqm&wpJkQ1?<3)R8eBb{+kslo$O;z)y!9REVcWGaUgb+q+Z5+ojTI;E6
zKDQjlF+vDCNPOR)EApwfp%B6_+Fr)<Jg%>=ky28t)o8U^3<d)L`u+Z|8}27VBZOdk
zdz*5(jO)4pbh};BG(}3u`T03#XJ_<!Jt~#Tue*Js@q5G;e0h1v)zuYJN&tc&;NakZ
z<Ktt1nc)EI-+}k`_5i5Y>lP01`1okgYqc6DCnvw<T3L^U5au&D*Xijg^?IEk2*%(5
zVHnbCwaBt;ra_Z8p{Z0V6XEyw_gq|D0Her*Ah7q+G$o26c6WDYVFMt95N2m*hf=9T
zk|Zdlczb)J(P)sSDWy^g*L7($8n~{@%gc-X^2WvnaUApf{5<oREeIjZ`uaLsTU(UN
z<u3-V>msEjO;ei9CWnWIz$p4Sj^|20z}j#)EcE;RLc87O>FJ3iN$fHKh~wD8_xJbh
zbtxrL6pc0KESluG0T4n^EEa8j^Gv|s=%Xn5*E6Qpq)Au+3d7;B(ChWS!0+zvZ1h^|
zdDy_GIWS3iIb7G};o*U5wMrO<0JPifxp(}xyP#Ms+H)x-)oK+fC9kiq^Kz$iAj`5s
znx?>L;7BP6!;o&b3k&)+HO)he*4n<JdF>aG{@=)Gt<8tyYW4mPW-0JL`7L&v#riVT
P00000NkvXXu0mjf)NO)g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Objects/Fun/Rock-guitar/inhand-right.png b/Resources/Textures/ADT/Objects/Fun/Rock-guitar/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb01c938899946ac9f2ecfc02845fefea862879e
GIT binary patch
literal 1727
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
VoZZ)GKrH|O002ovPDHLkV1m;&KyLs5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Objects/Fun/Rock-guitar/meta.json b/Resources/Textures/ADT/Objects/Fun/Rock-guitar/meta.json
new file mode 100644
index 00000000000..1ac57a722a4
--- /dev/null
+++ b/Resources/Textures/ADT/Objects/Fun/Rock-guitar/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "created by nerdyyyy__,",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

From ebe274224115fbe0715ecd5e08b7a2ea282625e6 Mon Sep 17 00:00:00 2001
From: walter-no-orochi <nikolai.skulachev@gmail.com>
Date: Sat, 13 Jan 2024 00:29:33 +0300
Subject: [PATCH 02/11] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=88=D0=BB=D0=BE=D0=B9=20=D1=87=D0=B0=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D1=83=D0=BB=20=D1=80=D0=B5=D0=BA=D0=B2=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ADT/Entities/Objects/Fun/rock-guitar.yml        |   4 ++--
 .../Fun/{Rock-guitar => Rock_guitar.rsi}/icon.png   | Bin
 .../inhand-right.png                                | Bin
 .../Fun/{Rock-guitar => Rock_guitar.rsi}/meta.json  |   0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename Resources/Textures/ADT/Objects/Fun/{Rock-guitar => Rock_guitar.rsi}/icon.png (100%)
 rename Resources/Textures/ADT/Objects/Fun/{Rock-guitar => Rock_guitar.rsi}/inhand-right.png (100%)
 rename Resources/Textures/ADT/Objects/Fun/{Rock-guitar => Rock_guitar.rsi}/meta.json (100%)

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml
index c81a7fea5d3..9d7a316d121 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml
@@ -5,8 +5,8 @@
   description: The guitar of strict colors of one strict person. Black keys like a synthesizer are visible on the side of the guitar.
   components:
   - type: Sprite
-    sprite: ADT/Objects/Fun/Rock-guitar.rsi
+    sprite: ADT/Objects/Fun/Rock_guitar.rsi
     state: icon
   - type: Item
     size: Normal
-    sprite: ADT/Objects/Fun/Rock-guitar.rsi
+    sprite: ADT/Objects/Fun/Rock_guitar.rsi
diff --git a/Resources/Textures/ADT/Objects/Fun/Rock-guitar/icon.png b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/icon.png
similarity index 100%
rename from Resources/Textures/ADT/Objects/Fun/Rock-guitar/icon.png
rename to Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/icon.png
diff --git a/Resources/Textures/ADT/Objects/Fun/Rock-guitar/inhand-right.png b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/ADT/Objects/Fun/Rock-guitar/inhand-right.png
rename to Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/inhand-right.png
diff --git a/Resources/Textures/ADT/Objects/Fun/Rock-guitar/meta.json b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
similarity index 100%
rename from Resources/Textures/ADT/Objects/Fun/Rock-guitar/meta.json
rename to Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json

From c8aefa549cd47e4236d59186a6469eaba4dec23b Mon Sep 17 00:00:00 2001
From: walter-no-orochi <nikolai.skulachev@gmail.com>
Date: Mon, 15 Jan 2024 20:14:26 +0300
Subject: [PATCH 03/11] =?UTF-8?q?=D0=B4=D0=B0=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl  |   3 +++
 .../Objects/Fun/Rock_guitar.rsi/inhand-left.png   | Bin 0 -> 877 bytes
 .../ADT/Objects/Fun/Rock_guitar.rsi/meta.json     |   3 +++
 3 files changed, 6 insertions(+)
 create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl
 create mode 100644 Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/inhand-left.png

diff --git a/Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl b/Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl
new file mode 100644
index 00000000000..5d7849b1a51
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl
@@ -0,0 +1,3 @@
+ent-ADTEntityRockGuitarInstrument = мультигитара Харитона
+    .desk = Гитара строгих цветов одного строгого человека. Сбоку гитары видны чёрные клавиши как у синтезатора.
+    .suffix = { "" }
diff --git a/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..c54a1809cd252e3536bbf060aff169063760880b
GIT binary patch
literal 877
zcmV-z1CsoSP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<UA4x<(RCt{2n$2q4KoH0OZY!x_<bwrfPX?jW3LW!?eiXe*A0j#U
z9s(t9sTUIqJUzs#%CaqMl~rQs{6P4F-JRM0et7T<AP9mW2!bF8SBavCgCO9~_TwB$
zl5iZy&c1zdX-q_}<KH~J1xS*F0idd?$$0JzBS{k8?RMB~HqO3%>)X&6gZ+N*I{xSk
z+4fDGj=(_p@ObYN$1#Uth@q<wI0!&Qm`<mCnjSe$ME36JD+0IrG@lwDlLs6Gh@uDp
zaN$>=cCvj@E*6VHj?L$Dq-lyYO_AsM(FN>l@<6u$C#oA`&bA>UD5apaKAG@(y|(@O
zIyy1N;O_1Y0I=O|@$&M5`Fsw*dGZqgKe`%R5`dLbD9aK!O!DdJ39qlOsH&>|&Q5%>
zSYS4r0RSE!ACH`Retx!&xG;Hmc))hM1%O(NAPD+Q{ttk!b{=`2e~0@W1STRTA}-6a
z?yQvJvMjm%s<r0ja>>i((sz)=N-4g-zvmzbIF941!H!buCmMni(Jyoe(6ut$ZbL-e
zJO=h$#&LXc2OP#3a!$D@3IM=rwE_U__xnC^$Zr4(yzPYP;qz#*i#-ZVM68rzt#z%o
z)|!=4gMJ2!qTr$^*oNPEo{tiO`%<QMu60`j05+SA%SFgUgfvaDTCM8fD-1&zW4y2A
z7+d2c4glaRK%-BSn+wDHFj^!i2!bF8f*=TjAP9mW2>$^=5HJzl-rr?JG<x;O7?byw
z9^dVDzJ~fxJ1*(*PUXWee7`px*u3DURjBmY-iJ1${G~nC5$m-BnycU81Xooxq#&X<
zW2}Df8X=n&KjTEZa-)84j2W63J)z_5w{3W{d1NHZGMg$tda^9zEX!<Cl(p9OruMZ1
zE{%2ed(XE28Ee)Hv|qK>thMH{ESn;Ev1@A(&=OuLWi!tweLUGdJMhuqQ4}5R0Q(F~
ziJ!IE6#iUc#(NF;I4cYQS(X9#m(g`hiC-NbtwIfZ*UV<Kx+p^_#jYheqtyp^n*3Fp
zN+|$uLaf(oXW_@J5BR8ng@F$h{$`Py0znW2L2%<Q;G>^MFX9P400000NkvXXu0mjf
DMb?!{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
index 1ac57a722a4..f982744de1f 100644
--- a/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
+++ b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
@@ -14,5 +14,8 @@
             "name": "inhand-right",
             "directions": 4
         }
+        {
+
+        }
     ]
 }

From 67a7b2b535d2f54ec0c08ccc44b9ece6bcddf425 Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:24:55 +0300
Subject: [PATCH 04/11] Update meta.json

---
 Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
index f982744de1f..c63753b6d55 100644
--- a/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
+++ b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
@@ -15,7 +15,8 @@
             "directions": 4
         }
         {
-
+            "name": "inhand-left", 
+            "directions": 4
         }
     ]
 }

From a4dcc294fc0b84bac79091236ac33512c87d0b5a Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:30:49 +0300
Subject: [PATCH 05/11] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D1=8F=D1=82=D0=B0?=
 =?UTF-8?q?=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
index c63753b6d55..f13d2dff48c 100644
--- a/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
+++ b/Resources/Textures/ADT/Objects/Fun/Rock_guitar.rsi/meta.json
@@ -13,7 +13,7 @@
         {
             "name": "inhand-right",
             "directions": 4
-        }
+        }, 
         {
             "name": "inhand-left", 
             "directions": 4

From 45d06169b7d7da06d4e54cbde1e1c8a07abd1bc2 Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:44:05 +0300
Subject: [PATCH 06/11] Update Rock_guitar.ftl

---
 Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl b/Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl
index 5d7849b1a51..90b4c3dfa20 100644
--- a/Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl
+++ b/Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl
@@ -1,3 +1,3 @@
 ent-ADTEntityRockGuitarInstrument = мультигитара Харитона
     .desk = Гитара строгих цветов одного строгого человека. Сбоку гитары видны чёрные клавиши как у синтезатора.
-    .suffix = { "" }
+    

From db4b90a23b786e28fedc89c274f85523e20a3808 Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Tue, 16 Jan 2024 00:32:20 +0300
Subject: [PATCH 07/11] Rename Rock_guitar.ftl to rock-guitar.ftl

---
 .../ru-RU/ADT/Objects/Fan/{Rock_guitar.ftl => rock-guitar.ftl}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Resources/Locale/ru-RU/ADT/Objects/Fan/{Rock_guitar.ftl => rock-guitar.ftl} (100%)

diff --git a/Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl b/Resources/Locale/ru-RU/ADT/Objects/Fan/rock-guitar.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/ADT/Objects/Fan/Rock_guitar.ftl
rename to Resources/Locale/ru-RU/ADT/Objects/Fan/rock-guitar.ftl

From 0e1a2221a3033fa94817fe334c038af7c5c0a20f Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Tue, 16 Jan 2024 02:33:37 +0300
Subject: [PATCH 08/11] Update darts.ftl

---
 Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl b/Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl
index e6398b25359..3aeff4e4902 100644
--- a/Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl
+++ b/Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl
@@ -15,3 +15,6 @@ ent-TargetDarts = мишень для дартса
 
 ent-HypoDart = дротик
     .desc = Небольшой дротик для игры в дартс. Не попадите в чей-то глаз!
+
+ent-ADTEntityRockGuitarInstrument = мультигитара Харитона
+    .desk = Гитара строгих цветов одного строгого человека. Сбоку гитары видны чёрные клавиши как у синтезатора.

From 8cdc540b909abc62afb41e364b72c0f3099ace63 Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Tue, 16 Jan 2024 02:37:01 +0300
Subject: [PATCH 09/11] Delete
 Resources/Locale/ru-RU/ADT/Objects/Fan/rock-guitar.ftl

---
 Resources/Locale/ru-RU/ADT/Objects/Fan/rock-guitar.ftl | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 Resources/Locale/ru-RU/ADT/Objects/Fan/rock-guitar.ftl

diff --git a/Resources/Locale/ru-RU/ADT/Objects/Fan/rock-guitar.ftl b/Resources/Locale/ru-RU/ADT/Objects/Fan/rock-guitar.ftl
deleted file mode 100644
index 90b4c3dfa20..00000000000
--- a/Resources/Locale/ru-RU/ADT/Objects/Fan/rock-guitar.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-ADTEntityRockGuitarInstrument = мультигитара Харитона
-    .desk = Гитара строгих цветов одного строгого человека. Сбоку гитары видны чёрные клавиши как у синтезатора.
-    

From 1739ea8a022c35787ea882d132de8c255c94b3fe Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Tue, 16 Jan 2024 02:50:52 +0300
Subject: [PATCH 10/11] Update darts.ftl

---
 Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl b/Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl
index 3aeff4e4902..e6398b25359 100644
--- a/Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl
+++ b/Resources/Locale/ru-RU/ADT/Objects/Fan/darts.ftl
@@ -15,6 +15,3 @@ ent-TargetDarts = мишень для дартса
 
 ent-HypoDart = дротик
     .desc = Небольшой дротик для игры в дартс. Не попадите в чей-то глаз!
-
-ent-ADTEntityRockGuitarInstrument = мультигитара Харитона
-    .desk = Гитара строгих цветов одного строгого человека. Сбоку гитары видны чёрные клавиши как у синтезатора.

From 26c14536c4631e7228bc21cd2f50c44c669c1faa Mon Sep 17 00:00:00 2001
From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com>
Date: Tue, 16 Jan 2024 02:51:45 +0300
Subject: [PATCH 11/11] Create rock_gitar.ftl

---
 Resources/Locale/ru-RU/ADT/Objects/Fan/rock_gitar.ftl | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Fan/rock_gitar.ftl

diff --git a/Resources/Locale/ru-RU/ADT/Objects/Fan/rock_gitar.ftl b/Resources/Locale/ru-RU/ADT/Objects/Fan/rock_gitar.ftl
new file mode 100644
index 00000000000..1eaa59757b0
--- /dev/null
+++ b/Resources/Locale/ru-RU/ADT/Objects/Fan/rock_gitar.ftl
@@ -0,0 +1,2 @@
+ent-ADTEntityRockGuitarInstrument = мультигитара Харитона
+    .desc = Гитара строгих цветов одного строгого человека. Сбоку гитары видны чёрные клавиши как у синтезатора.