From: No Elka <125199100+NoElkaTheGod@users.noreply.github.com>
Date: Thu, 24 Apr 2025 01:21:35 +0000 (+0300)
Subject: Make toy sword less obvious (#34199)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a8f05f5547730dc203f3b0b7dbe447cd6ef487d1;p=space-station-14.git

Make toy sword less obvious (#34199)

* YAML fuckery

* Remove toy_sword.rsi

Not a webedit btw
---

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 13f301148f..99c41c1dde 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1537,8 +1537,6 @@
   description: New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing!
   components:
     - type: EnergySword
-      colorOptions:
-        - DodgerBlue
     - type: ItemToggle
       soundActivate:
         path: /Audio/Weapons/ebladeon.ogg
@@ -1548,7 +1546,7 @@
       activeSound:
         path: /Audio/Weapons/ebladehum.ogg
     - type: Sprite
-      sprite: Objects/Fun/toy_sword.rsi
+      sprite: Objects/Weapons/Melee/e_sword.rsi
       layers:
         - state: e_sword
         - state: e_sword_blade
@@ -1558,7 +1556,7 @@
           map: [ "blade" ]
     - type: Item
       size: Small
-      sprite: Objects/Fun/toy_sword.rsi
+      sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
     - type: UseDelay
       delay: 1.0
     - type: PointLight
diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png
deleted file mode 100644
index c231db05b3..0000000000
Binary files a/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png
deleted file mode 100644
index 28e0ec67a8..0000000000
Binary files a/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png
deleted file mode 100644
index 535d9de84e..0000000000
Binary files a/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left-blade.png
deleted file mode 100644
index 6bc304a12f..0000000000
Binary files a/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left-blade.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left.png
deleted file mode 100644
index 6e5fe94f81..0000000000
Binary files a/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right-blade.png
deleted file mode 100644
index 456e742892..0000000000
Binary files a/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right-blade.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right.png
deleted file mode 100644
index b82aed42c0..0000000000
Binary files a/Resources/Textures/Objects/Fun/toy_sword.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json b/Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json
deleted file mode 100644
index 2026e221b7..0000000000
--- a/Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "e_sword"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "e_sword_blade",
-            "delays": [
-                [
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "inhand-left-blade",
-            "directions": 4,
-            "delays": [
-                [
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "inhand-right-blade",
-            "directions": 4,
-            "delays": [
-                [
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1
-                ]
-            ]
-        }
-    ]
-}