telescopichka-resprite (#2463)

SerbiaStrong-220 · Jan 8, 2025 · dda1614 · dda1614
1 parent d8ac1ff
commit dda1614
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 70 deletions.
diff --git a/Resources/Locale/ru-RU/ss220/weapons/telescopichka.ftl b/Resources/Locale/ru-RU/ss220/weapons/telescopichka.ftl
@@ -1,2 +1,2 @@
-ent-Telescopichka = Телескопическая дубинка-шокер
+ent-Telescopichka = Телескопическая дубинка
    .desc = Компактное оружие для самозащиты. Можно сложить, чтобы уменьшить занимаемое место.
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml
@@ -34,9 +34,8 @@
   - type: MeleeWeapon
     wideAnimationRotation: -135
     angle: 60
-    animation: WeaponArcSlash
-    soundHit:
-      path: /Audio/Weapons/egloves.ogg
+    soundHit: !type:SoundCollectionSpecifier
+      collection: BatonHit
     damage:
       types:
         Blunt: 0

diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/meta.json
@@ -1,23 +1,14 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/7163/commits/5429349ac82b1cadc401f5b0f00dc868cbaed177, modified by Estkemran (Github) for SS220",
+  "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+  "copyright": "Sprited by Estkemran (Github) for SS220",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "telescope_on",
-       "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "name": "telescope_on"
     },
     {
       "name": "telescope_off"
@@ -32,63 +23,11 @@
     },
     {
       "name": "on-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "on-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+      "directions": 4
     }
   ]
 }
diff --git a/...rces/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-left.png b/...rces/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-left.png
diff --git a/...ces/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-right.png b/...ces/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-right.png
diff --git a/...urces/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-left.png b/...urces/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-left.png
diff --git a/...rces/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-right.png b/...rces/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-right.png
diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_off.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_off.png
diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_on.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_on.png