Merge pull request #255 from NEirotoXiN00/AddMusicBoomBox

Add music boom box
Corvax-Frontier · Jun 3, 2024 · 4dd2e2d · 4dd2e2d
2 parents a922ba2 + c15c650
commit 4dd2e2d
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 0 deletions.
diff --git a/Resources/Audio/BoomBox/DavidRawlingsCumberlandGap.ogg b/Resources/Audio/BoomBox/DavidRawlingsCumberlandGap.ogg
diff --git a/Resources/Audio/BoomBox/IDrive.ogg b/Resources/Audio/BoomBox/IDrive.ogg
diff --git a/Resources/Audio/BoomBox/MichaelHolborn.ogg b/Resources/Audio/BoomBox/MichaelHolborn.ogg
diff --git a/Resources/Audio/BoomBox/TheOffspring.ogg b/Resources/Audio/BoomBox/TheOffspring.ogg
diff --git a/Resources/Audio/BoomBox/TitoTarantula.ogg b/Resources/Audio/BoomBox/TitoTarantula.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Devices/boombox.yml b/Resources/Prototypes/Entities/Objects/Devices/boombox.yml
@@ -258,6 +258,52 @@
     - type: BoomBoxTape
       soundPath: /Audio/BoomBox/sigrideverybodyknows.ogg
 
+- type: entity
+  parent: BaseBoomBoxTape
+  id: BaseBoomBoxTapeTitoTarantulaAfterDark
+  name: Tito & Tarantula - After Dark
+  description: Музыка
+  components:
+    - type: BoomBoxTape
+      soundPath: /Audio/BoomBox/TitoTarantula.ogg
+
+- type: entity
+  parent: BaseBoomBoxTape
+  id: BaseBoomBoxTapeTheOffspringTheKids
+  name: The Offspring - The Kids Aren't Alright
+  description: Музыка
+  components:
+    - type: BoomBoxTape
+      soundPath: /Audio/BoomBox/TheOffspring.ogg
+
+- type: entity
+  parent: BaseBoomBoxTape
+  id: BaseBoomBoxTapeMichaelHolborn
+  name: Michael Holborn William Henries - Mess with My Mind
+  description: Музыка
+  components:
+    - type: BoomBoxTape
+      soundPath: /Audio/BoomBox/MichaelHolborn.ogg
+
+- type: entity
+  parent: BaseBoomBoxTape
+  id: BaseBoomBoxTapeDavidRawlings
+  name: David Rawlings - CumberlandGap
+  description: Музыка
+  components:
+    - type: BoomBoxTape
+      soundPath: /Audio/BoomBox/DavidRawlingsCumberlandGap.ogg
+
+- type: entity
+  parent: BaseBoomBoxTape
+  id: BaseBoomBoxTapeKavinskynightcall
+  name: Kavinsky - nightcall
+  description: Музыка
+  components:
+    - type: BoomBoxTape
+      soundPath: /Audio/BoomBox/IDrive.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
@@ -45,6 +45,11 @@
     UprightPianoInstrumentFlatpack: 1
     DawInstrumentFlatpack: 1
     BaseBoomBox: 5
+    BaseBoomBoxTapeTheOffspringTheKids: 3
+    BaseBoomBoxTapeMichaelHolborn: 3
+    BaseBoomBoxTapeTitoTarantulaAfterDark: 3
+    BaseBoomBoxTapeDavidRawlings: 3
+    BaseBoomBoxTapeKavinskynightcall: 3
     BaseBoomBoxTapeSpaceOddity: 3
     BaseBoomBoxTapeSpaceAsshole: 3
     BaseBoomBoxTapeStarman: 3