diff --git a/Resources/Audio/BoomBox/hopesanddreams.ogg b/Resources/Audio/BoomBox/hopesanddreams.ogg new file mode 100644 index 00000000000..01ac5e0ebb9 Binary files /dev/null and b/Resources/Audio/BoomBox/hopesanddreams.ogg differ diff --git a/Resources/Audio/BoomBox/imaginedragonsenemy.ogg b/Resources/Audio/BoomBox/imaginedragonsenemy.ogg new file mode 100644 index 00000000000..18bb64d6b5f Binary files /dev/null and b/Resources/Audio/BoomBox/imaginedragonsenemy.ogg differ diff --git a/Resources/Audio/BoomBox/jamesblackeretrograde.ogg b/Resources/Audio/BoomBox/jamesblackeretrograde.ogg new file mode 100644 index 00000000000..c21f9913455 Binary files /dev/null and b/Resources/Audio/BoomBox/jamesblackeretrograde.ogg differ diff --git a/Resources/Audio/BoomBox/kdavillian.ogg b/Resources/Audio/BoomBox/kdavillian.ogg new file mode 100644 index 00000000000..787c8adac1c Binary files /dev/null and b/Resources/Audio/BoomBox/kdavillian.ogg differ diff --git a/Resources/Audio/BoomBox/megalovania.ogg b/Resources/Audio/BoomBox/megalovania.ogg new file mode 100644 index 00000000000..d928de88861 Binary files /dev/null and b/Resources/Audio/BoomBox/megalovania.ogg differ diff --git a/Resources/Audio/BoomBox/ramseygoodbye.ogg b/Resources/Audio/BoomBox/ramseygoodbye.ogg new file mode 100644 index 00000000000..fe9bbd27074 Binary files /dev/null and b/Resources/Audio/BoomBox/ramseygoodbye.ogg differ diff --git a/Resources/Audio/BoomBox/samuelkimgunsforhire.ogg b/Resources/Audio/BoomBox/samuelkimgunsforhire.ogg new file mode 100644 index 00000000000..ee3251415e1 Binary files /dev/null and b/Resources/Audio/BoomBox/samuelkimgunsforhire.ogg differ diff --git a/Resources/Audio/BoomBox/sigrideverybodyknows.ogg b/Resources/Audio/BoomBox/sigrideverybodyknows.ogg new file mode 100644 index 00000000000..6cd3a17ec89 Binary files /dev/null and b/Resources/Audio/BoomBox/sigrideverybodyknows.ogg differ diff --git a/Resources/Audio/BoomBox/undertale.ogg b/Resources/Audio/BoomBox/undertale.ogg new file mode 100644 index 00000000000..bb691e3153e Binary files /dev/null and b/Resources/Audio/BoomBox/undertale.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Devices/boombox.yml b/Resources/Prototypes/Entities/Objects/Devices/boombox.yml index 265e2aaa62e..5ef8f566edd 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/boombox.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/boombox.yml @@ -166,7 +166,7 @@ description: Музыка components: - type: BoomBoxTape - soundPath: /Audio/BoomBox/Retrograde.ogg + soundPath: /Audio/BoomBox/jamesblackeretrograde.ogg - type: entity parent: BaseBoomBoxTape @@ -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 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml index c24214522bc..7a6e9136972 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml @@ -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