From eede69035ab90c0220dfd440697b8ce1f1dc8eb8 Mon Sep 17 00:00:00 2001
From: Tamioki <143713810+ITamiokiI@users.noreply.github.com>
Date: Sun, 27 Oct 2024 16:12:08 +0200
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BB=D0=B0=D0=B1=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru-RU/ADT/Objects/Toys/SkidAndPump.ftl    |  3 ---
 .../prototypes/Entities/Objects/Fun/toys.ftl  |  2 ++
 .../ADT/Entities/Objects/Fun/SkidAndPump.yml  | 20 ------------------
 .../ADT/Entities/Objects/Fun/toys.yml         | 21 +++++++++++++++++++
 4 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 Resources/Locale/ru-RU/ADT/Objects/Toys/SkidAndPump.ftl
 delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/SkidAndPump.yml

diff --git a/Resources/Locale/ru-RU/ADT/Objects/Toys/SkidAndPump.ftl b/Resources/Locale/ru-RU/ADT/Objects/Toys/SkidAndPump.ftl
deleted file mode 100644
index 7ba73c0231b..00000000000
--- a/Resources/Locale/ru-RU/ADT/Objects/Toys/SkidAndPump.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-ent-SkidAndPump = Скид и Тыковка
-    .desc = Это ЖУТКИЙ МЕСЯЦ!
-    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/toys.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/toys.ftl
index d623c59f058..971bee582fe 100644
--- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/toys.ftl
+++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/toys.ftl
@@ -2,3 +2,5 @@ ent-ADTPlushieUrs = плюшевый Урс
     .desc = Милая плюшевая игрушка Урса.
 ent-ADTBlackSharkPlushie = черная плюшевая акула
     .desc = Всего лишь от одного взгляда на неё вам становится не по себе, то ли от желания пожамкать её, то ли от страха.
+ent-SkidAndPump = Скид и Тыковка
+    .desc = Это ЖУТКИЙ МЕСЯЦ!
\ No newline at end of file
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/SkidAndPump.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/SkidAndPump.yml
deleted file mode 100644
index 78fbb6e30bd..00000000000
--- a/Resources/Prototypes/ADT/Entities/Objects/Fun/SkidAndPump.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: SkidAndPump
-  name: Skid&Pump
-  description: THIS IS SPOOKY MONTH!
-  components:
-  - type: Sprite
-    sprite: ADT/Objects/Fun/skidandpump.rsi
-    state: icon
-  - type: Item
-    sprite: ADT/Objects/Fun/skidandpump.rsi
-  - type: AmbientSound
-    enabled: true
-    volume: -6
-    range: 9
-    sound:
-      path: /Audio/Items/Toys/scaryswings.ogg
-  - type: PointLight
-    radius: 1.4
-    color: "#ff7a06"
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
index a2fac947a0b..6b07fa190bf 100644
--- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
@@ -23,3 +23,24 @@
     tags:
       - PlushieSharkBlack
       - Payload
+
+- type: entity
+  parent: BaseItem
+  id: SkidAndPump
+  name: Skid&Pump
+  description: THIS IS SPOOKY MONTH!
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Fun/skidandpump.rsi
+    state: icon
+  - type: Item
+    sprite: ADT/Objects/Fun/skidandpump.rsi
+  - type: AmbientSound
+    enabled: true
+    volume: -6
+    range: 9
+    sound:
+      path: /Audio/Items/Toys/scaryswings.ogg
+  - type: PointLight
+    radius: 1.4
+    color: "#ff7a06"