diff --git a/Resources/Audio/SS220/Weapons/Melee/homerun/attributions.yml b/Resources/Audio/SS220/Weapons/Melee/homerun/attributions.yml new file mode 100644 index 00000000000000..a4d9a61eedb16a --- /dev/null +++ b/Resources/Audio/SS220/Weapons/Melee/homerun/attributions.yml @@ -0,0 +1,9 @@ +- files: ["homerun.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Is taken from paradise station at commit 5180002295c625876e9fb60f07d08c882c1e443e" + source: "https://github.com/ss220club/Paradise-SS220/blob/master/sound/weapons/homerun.ogg" + +- files: ["homerunbaton.ogg"] + license: "CC-BY-SA-3.0" + copyright: "https://github.com/ss220club/Paradise-SS220/blob/master/sound/weapons/homerun.ogg, https://github.com/ParadiseSS13/Paradise/blob/master/sound/weapons/batonextend.ogg, https://www.freesoundslibrary.com/bonk-sound-effect/" + source: "https://github.com/SerbiaStrong-220/space-station-14/tree/master/Resources/Audio/SS220/Weapons/Melee/homerun/homerunbaton.ogg" diff --git a/Resources/Audio/SS220/Weapons/Melee/homerun/homerun.ogg b/Resources/Audio/SS220/Weapons/Melee/homerun/homerun.ogg new file mode 100644 index 00000000000000..6319c10c955aa3 Binary files /dev/null and b/Resources/Audio/SS220/Weapons/Melee/homerun/homerun.ogg differ diff --git a/Resources/Audio/SS220/Weapons/Melee/homerun/homerunbaton.ogg b/Resources/Audio/SS220/Weapons/Melee/homerun/homerunbaton.ogg new file mode 100644 index 00000000000000..7f76d0f2e56db5 Binary files /dev/null and b/Resources/Audio/SS220/Weapons/Melee/homerun/homerunbaton.ogg differ diff --git a/Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl b/Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl index 701083b15f91f3..1983c42eba7cae 100644 --- a/Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl +++ b/Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl @@ -1,2 +1,8 @@ ent-NTbaton = телескопическая бита НТ .desc = А вы знали, что Офицеры ЦК любят играть в бейсбол головами некомпетентного руководства своих активов? +ent-NTbatonStrong = { ent-NTbaton } + .desc = { ent-NTbaton.desc } + .suffix = Сильный +ent-NTbatonPowerful = { ent-NTbaton } + .desc = { ent-NTbaton.desc } + .suffix = Мощный diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/ntbaton.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/ntbaton.yml index c6019dd7905ad1..4091a05a89b502 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/ntbaton.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/ntbaton.yml @@ -28,7 +28,7 @@ damage: 0 - type: MeleeWeapon soundHit: !type:SoundCollectionSpecifier - collection: BatonHit + collection: HomerunBaton damage: types: Blunt: 0 @@ -46,3 +46,22 @@ enum.ToggleVisuals.Layer: True: {state: telescope_on} False: {state: telescope_off} + - type: MeleeThrowOnHit + lifetime: 0.1 + +- type: entity + parent: NTbaton + id: NTbatonStrong + suffix: Strong + components: + - type: MeleeThrowOnHit + lifetime: 5 + +- type: entity + parent: NTbaton + id: NTbatonPowerful + suffix: Powerful + components: + - type: MeleeThrowOnHit + lifetime: 10 + speed: 20 diff --git a/Resources/Prototypes/SS220/SoundCollections/weapon.yml b/Resources/Prototypes/SS220/SoundCollections/weapon.yml new file mode 100644 index 00000000000000..a2af992699bdec --- /dev/null +++ b/Resources/Prototypes/SS220/SoundCollections/weapon.yml @@ -0,0 +1,11 @@ +# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt + +- type: soundCollection + id: Homerun + files: + - /Audio/SS220/Weapons/Melee/homerun/homerun.ogg + +- type: soundCollection + id: HomerunBaton + files: + - /Audio/SS220/Weapons/Melee/homerun/homerunbaton.ogg