Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update-ntbaton #2417

Merged
merged 2 commits into from
Dec 31, 2024
+46 −1
Merged

update-ntbaton #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fd9022
update-ntbaton
EstKemran Dec 28, 2024
8126551
update&fix
EstKemran Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Resources/Audio/SS220/Weapons/Melee/homerun/attributions.yml
View file
Open in desktop
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 added Resources/Audio/SS220/Weapons/Melee/homerun/homerun.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/SS220/Weapons/Melee/homerun/homerunbaton.ogg
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions Resources/Locale/ru-RU/ss220/weapons/ntbaton.ftl.ftl
View file
Open in desktop
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 = Мощный
21 changes: 20 additions & 1 deletion Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/ntbaton.yml
View file
Open in desktop
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
View file
Open in desktop
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
Kirus59 marked this conversation as resolved.
Show resolved Hide resolved

- type: soundCollection
id: HomerunBaton
files:
- /Audio/SS220/Weapons/Melee/homerun/homerunbaton.ogg
Loading