diff --git a/Resources/Locale/ru-RU/ss220/weapons/telescopichka.ftl b/Resources/Locale/ru-RU/ss220/weapons/telescopichka.ftl index b4dcc6939f2c..60c551a0427e 100644 --- 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 index 01b9bfae8e19..2bfbdb729e8a 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml @@ -6,7 +6,7 @@ id: Telescopichka description: Very loud and very dangerous energy sword that can reflect shots. Can be stored in pockets when turned off. components: - - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita + - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita sound: path: /Audio/SS220/Effects/Drop/stunprod.ogg params: @@ -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 index d8536ea62a77..ad893e568ab1 100644 --- 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/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-left.png index 791e2f1c9210..b6f1b31487c8 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-left.png and b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-right.png index 7040c8fe546a..ee9b509a08ee 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-right.png and b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-left.png index 2a8c315d6886..3132132e921a 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-left.png and b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-right.png index b9b3f6911593..890927213bb1 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-right.png and b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-right.png differ 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 index ec8422006d49..372d7fcb33c3 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_off.png and b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_off.png differ 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 index ace60faaf892..532cf70b9aac 100644 Binary files a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_on.png and b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_on.png differ