Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Чутка музыки #250

Merged
merged 4 commits into from
Jun 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added Resources/Audio/BoomBox/hopesanddreams.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/imaginedragonsenemy.ogg
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/BoomBox/kdavillian.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/megalovania.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/ramseygoodbye.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/samuelkimgunsforhire.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/sigrideverybodyknows.ogg
Binary file not shown.
Binary file added Resources/Audio/BoomBox/undertale.ogg
Binary file not shown.
74 changes: 73 additions & 1 deletion Resources/Prototypes/Entities/Objects/Devices/boombox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/Retrograde.ogg
soundPath: /Audio/BoomBox/jamesblackeretrograde.ogg

- type: entity
parent: BaseBoomBoxTape
Expand All @@ -186,6 +186,78 @@
- type: BoomBoxTape
soundPath: /Audio/BoomBox/MrKittyAfterDark.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeTobyFoxHopesAndDreams
name: Toby Fox - Hopes and Dreams
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/hopesanddreams.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeTobyFoxMegalovania
name: Toby Fox - Megalovania
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/megalovania.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeTobyFoxUndertale
name: Toby Fox - Undertale
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/undertale.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeImagineDragonEnemy
name: Imagine Dragons - Enemy
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/imaginedragonsenemy.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeKDAVillian
name: KDA - VILLIAN
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/kdavillian.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeRamseyGoodbye
name: Ramsey - Goodbye
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/ramseygoodbye.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeSamuelKimGunsForHire
name: Samuel Kim - Guns for Hire
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/samuelkimgunsforhire.ogg

- type: entity
parent: BaseBoomBoxTape
id: BaseBoomBoxTapeSigridEverybodyKnows
name: Sigrid - Everybody Knows
description: Музыка
components:
- type: BoomBoxTape
soundPath: /Audio/BoomBox/sigrideverybodyknows.ogg

# - type: entity
# parent: BaseBoomBoxTape
# id: BaseBoomBoxTapeSyndTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,17 @@
BaseBoomBoxTapeSignals: 3
BaseBoomBoxTapeDemonKittyRag: 3
BaseBoomBoxTapeKissTheSky: 3
# BaseBoomBoxTapeRetrograde: 3 уээ забыла аудиофайл
BaseBoomBoxTapeRetrograde: 3
BaseBoomBoxTapeThisAintNoPlaceForNoHero: 3
BaseBoomBoxTapeMrKittyAfterDark: 3
BaseBoomBoxTapeTobyFoxHopesAndDreams: 3
BaseBoomBoxTapeTobyFoxMegalovania: 3
BaseBoomBoxTapeTobyFoxUndertale: 3
BaseBoomBoxTapeImagineDragonEnemy: 3
BaseBoomBoxTapeKDAVillian: 3
BaseBoomBoxTapeRamseyGoodbye: 3
BaseBoomBoxTapeSamuelKimGunsForHire: 3
BaseBoomBoxTapeSigridEverybodyKnows: 3
contrabandInventory:
# SeashellInstrument: 1 This is actully just static noises
# ReverseCymbalsInstrument: 1 Sounds bad
Expand Down
Loading