Skip to content

Commit

Permalink
update-ntbaton (#2417)
Browse files Browse the repository at this point in the history
* update-ntbaton

* update&fix
  • Loading branch information
EstKemran authored Dec 31, 2024
1 parent 59b8e4d commit 8e2d679
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 1 deletion.
9 changes: 9 additions & 0 deletions Resources/Audio/SS220/Weapons/Melee/homerun/attributions.yml
Original file line number Diff line number Diff line change
@@ -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"
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl
Original file line number Diff line number Diff line change
@@ -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 = Мощный
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
damage: 0
- type: MeleeWeapon
soundHit: !type:SoundCollectionSpecifier
collection: BatonHit
collection: HomerunBaton
damage:
types:
Blunt: 0
Expand All @@ -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
11 changes: 11 additions & 0 deletions Resources/Prototypes/SS220/SoundCollections/weapon.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 8e2d679

Please sign in to comment.