diff --git a/Resources/Audio/BoomBox/Beacon.ogg b/Resources/Audio/BoomBox/Beacon.ogg new file mode 100644 index 00000000000..b82ddd4df91 Binary files /dev/null and b/Resources/Audio/BoomBox/Beacon.ogg differ diff --git a/Resources/Audio/BoomBox/CrystalsHotlineMiami.ogg b/Resources/Audio/BoomBox/CrystalsHotlineMiami.ogg new file mode 100644 index 00000000000..2e1e0026c41 Binary files /dev/null and b/Resources/Audio/BoomBox/CrystalsHotlineMiami.ogg differ diff --git a/Resources/Audio/BoomBox/HydrogenHotlineMiami.ogg b/Resources/Audio/BoomBox/HydrogenHotlineMiami.ogg new file mode 100644 index 00000000000..00357b4e256 Binary files /dev/null and b/Resources/Audio/BoomBox/HydrogenHotlineMiami.ogg differ diff --git a/Resources/Audio/BoomBox/Im_Blink.ogg b/Resources/Audio/BoomBox/Im_Blink.ogg new file mode 100644 index 00000000000..f1927bcb418 Binary files /dev/null and b/Resources/Audio/BoomBox/Im_Blink.ogg differ diff --git a/Resources/Audio/BoomBox/Rekka.ogg b/Resources/Audio/BoomBox/Rekka.ogg new file mode 100644 index 00000000000..85dc1162774 Binary files /dev/null and b/Resources/Audio/BoomBox/Rekka.ogg differ diff --git a/Resources/Audio/BoomBox/To_fall.ogg b/Resources/Audio/BoomBox/To_fall.ogg new file mode 100644 index 00000000000..974863234c5 Binary files /dev/null and b/Resources/Audio/BoomBox/To_fall.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Devices/boombox.yml b/Resources/Prototypes/Entities/Objects/Devices/boombox.yml index 97a692ac20e..c16e9e3f95a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/boombox.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/boombox.yml @@ -303,6 +303,59 @@ - type: BoomBoxTape soundPath: /Audio/BoomBox/IDrive.ogg +- type: entity + parent: BaseBoomBoxTape + id: BaseBoomBoxTapeHIFIBeacon + name: Hi-Fi Rush - The Beacon + description: Музыка + components: + - type: BoomBoxTape + soundPath: /Audio/BoomBox/Beacon.ogg + +- type: entity + parent: BaseBoomBoxTape + id: BaseBoomBoxTapeHIFIBlink + name: Hi-Fi Rush - In a Blink + description: Музыка + components: + - type: BoomBoxTape + soundPath: /Audio/BoomBox/Im_Blink.ogg + +- type: entity + parent: BaseBoomBoxTape + id: BaseBoomBoxTapeHIFIFail + name: Hi-Fi Rush - Too Big to Fail + description: Музыка + components: + - type: BoomBoxTape + soundPath: /Audio/BoomBox/To_fall.ogg + +- type: entity + parent: BaseBoomBoxTape + id: BaseBoomBoxTapeHIFIRekka + name: Hi-Fi Rush - Captive Normals (A Fever Dream) + description: Музыка + components: + - type: BoomBoxTape + soundPath: /Audio/BoomBox/Rekka.ogg + +- type: entity + parent: BaseBoomBoxTape + id: BaseBoomBoxTapeHotLineCrystals + name: M.O.O.N. - Crystals + description: Музыка + components: + - type: BoomBoxTape + soundPath: /Audio/BoomBox/CrystalsHotlineMiami.ogg + +- type: entity + parent: BaseBoomBoxTape + id: BaseBoomBoxTapeHotLineHydrogen + name: M.O.O.N. - Hydrogen + description: Музыка + components: + - type: BoomBoxTape + soundPath: /Audio/BoomBox/HydrogenHotlineMiami.ogg # - type: entity # parent: BaseBoomBoxTape diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml index 9fdc4faccd5..eb45f5c0195 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml @@ -197,11 +197,122 @@ - type: entity noSpawn: true parent: BaseMail - id: MailBoomboxAsshole + id: MailBoombox suffix: Boombox components: - type: Mail isFragile: true contents: - id: BaseBoomBox + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomboxPack1 + suffix: Boombox + components: + - type: Mail + isFragile: true + contents: + - id: BaseBoomBoxTapeSpaceOddity - id: BaseBoomBoxTapeSpaceAsshole + - id: BaseBoomBoxTapeStarman + - id: BaseBoomBoxTapeTheChain + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomboxPack2 + suffix: Boombox + components: + - type: Mail + isFragile: true + contents: + - id: BaseBoomBoxTapeCantSmile + - id: BaseBoomBoxTapeUnderStars + - id: BaseBoomBoxTapeComingHome + - id: BaseBoomBoxTapeSignals + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomboxPack3 + suffix: Boombox + components: + - type: Mail + isFragile: true + contents: + - id: BaseBoomBoxTapeDemonKittyRag + - id: BaseBoomBoxTapeKissTheSky + - id: BaseBoomBoxTapeRetrograde + - id: BaseBoomBoxTapeThisAintNoPlaceForNoHero + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomboxPack4 + suffix: Boombox + components: + - type: Mail + isFragile: true + contents: + - id: BaseBoomBoxTapeMrKittyAfterDark + - id: BaseBoomBoxTapeTobyFoxHopesAndDreams + - id: BaseBoomBoxTapeTobyFoxMegalovania + - id: BaseBoomBoxTapeTobyFoxUndertale + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomboxPack5 + suffix: Boombox + components: + - type: Mail + isFragile: true + contents: + - id: BaseBoomBoxTapeImagineDragonEnemy + - id: BaseBoomBoxTapeKDAVillian + - id: BaseBoomBoxTapeRamseyGoodbye + - id: BaseBoomBoxTapeSamuelKimGunsForHire + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomboxPack6 + suffix: Boombox + components: + - type: Mail + isFragile: true + contents: + - id: BaseBoomBoxTapeSigridEverybodyKnows + - id: BaseBoomBoxTapeTitoTarantulaAfterDark + - id: BaseBoomBoxTapeTheOffspringTheKids + - id: BaseBoomBoxTapeMichaelHolborn + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomboxPack7 + suffix: Boombox + components: + - type: Mail + isFragile: true + contents: + - id: BaseBoomBoxTapeDavidRawlings + - id: BaseBoomBoxTapeKavinskynightcall + - id: BaseBoomBoxTapeHIFIBeacon + - id: BaseBoomBoxTapeHIFIBlink + +- type: entity + noSpawn: true + parent: BaseMail + id: MailBoomboxPack8 + suffix: Boombox + components: + - type: Mail + isFragile: true + contents: + - id: BaseBoomBoxTapeHIFIFail + - id: BaseBoomBoxTapeHIFIRekka + - id: BaseBoomBoxTapeHotLineCrystals + - id: BaseBoomBoxTapeHotLineHydrogen diff --git a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml b/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml index 8701ff4a42b..c98038adae0 100644 --- a/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml +++ b/Resources/Prototypes/Nyanotrasen/mailDeliveries.yml @@ -1,7 +1,7 @@ - type: mailDeliveryPool id: RandomMailDeliveryPool everyone: - MailAlcohol: 0.5 + MailAlcohol: 0.5 MailSake: 0.5 MailBible: 1 MailBikeHorn: 0.5 @@ -45,7 +45,15 @@ MailVagueThreat: 0.4 # This is mainly for Glacier. MailWinterCoat: 1.5 - MailBoomboxAsshole: 1.5 + MailBoombox: 1.5 + MailBoomboxPack1: 0.5 + MailBoomboxPack2: 0.5 + MailBoomboxPack3: 0.5 + MailBoomboxPack4: 0.5 + MailBoomboxPack5: 0.5 + MailBoomboxPack6: 0.5 + MailBoomboxPack7: 0.5 + MailBoomboxPack8: 0.5 # Department and job-specific mail can have slightly higher weights, # since they'll be merged with the everyone pool. diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml index 4b8b1d9384c..ea441ad35d7 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml @@ -50,6 +50,12 @@ BaseBoomBoxTapeTitoTarantulaAfterDark: 3 BaseBoomBoxTapeDavidRawlings: 3 BaseBoomBoxTapeKavinskynightcall: 3 + BaseBoomBoxTapeHIFIBeacon: 3 + BaseBoomBoxTapeHIFIBlink: 3 + BaseBoomBoxTapeHIFIFail: 3 + BaseBoomBoxTapeHIFIRekka: 3 + BaseBoomBoxTapeHotLineCrystals: 3 + BaseBoomBoxTapeHotLineHydrogen: 3 BaseBoomBoxTapeSpaceOddity: 3 BaseBoomBoxTapeSpaceAsshole: 3 BaseBoomBoxTapeStarman: 3