Music Drobe (#878)

* Vender

* Music

* Update vending_machine_restock.yml

* AutoTune

* Price

* Update base_instruments.yml

* PR #680 was a waste of time

...

* Cant add static to this

Be sci, build dew`s, sell dew`s
dew money meta.

* Update frontier.yml

* Update frontier.yml

* Update vending_machines.yml

* Added 4 tiles next to bus area

* Update autotunevend.yml

Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl

@@ -18,3 +18,6 @@ ent-CrateVendingMachineRestockCondimentStationFilled = Condiment Station restock
 
 ent-CrateVendingMachineRestockLessLethalVendFilled = LessLethalVend restock crate
     .desc = Contains two restock boxes for the LessLethalVend vending machine.
+
+ent-CrateVendingMachineRestockAutoTuneVendFilled = AutoTuneVend restock crate
+    .desc = Contains two restock boxes for the AutoTuneVend vending machine.

Resources/Maps/_NF/Outpost/frontier.yml

@@ -54,7 +54,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: cgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYAAAAAABcgAAAAAAVQAAAAADVQAAAAACVQAAAAACVQAAAAACVQAAAAABVQAAAAACVQAAAAACVQAAAAACVQAAAAACVQAAAAABVQAAAAACVQAAAAABVQAAAAADcgAAAAAAYQAAAAAAcgAAAAAAVQAAAAADVQAAAAABVQAAAAAAVQAAAAACVQAAAAAAVQAAAAABVQAAAAADVQAAAAABVQAAAAACVQAAAAACVQAAAAACVQAAAAABVQAAAAABYQAAAAAAVQAAAAADVQAAAAACVQAAAAADVQAAAAACVQAAAAABVQAAAAABVQAAAAACVQAAAAAAVQAAAAACVQAAAAAAVQAAAAABVQAAAAAAVQAAAAADVQAAAAAAVQAAAAABYQAAAAAAVQAAAAADVQAAAAACVQAAAAABVQAAAAADVQAAAAAAVQAAAAADVQAAAAAAVQAAAAACVQAAAAADVQAAAAAAVQAAAAAAVQAAAAABVQAAAAACVQAAAAABVQAAAAACYQAAAAAAVQAAAAACVQAAAAABVQAAAAADVQAAAAABVQAAAAABVQAAAAABVQAAAAACVQAAAAABVQAAAAAAVQAAAAABVQAAAAABVQAAAAACVQAAAAABVQAAAAAAVQAAAAACYQAAAAAAVQAAAAAAVQAAAAACcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAADVQAAAAADVQAAAAABVQAAAAADVQAAAAADVQAAAAACVQAAAAABVQAAAAABYQAAAAAAVQAAAAABVQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAACHAAAAAACHAAAAAADXgAAAAAAVQAAAAADXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADHAAAAAACHAAAAAACXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADLAAAAAAAHAAAAAAAHAAAAAACVQAAAAABVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADHAAAAAADHAAAAAABHAAAAAACVQAAAAACVQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAACLAAAAAABHAAAAAABXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAACHAAAAAADHAAAAAABXgAAAAAAVQAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAHAAAAAAALAAAAAADHAAAAAAAVQAAAAABcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAXwAAAAABYQAAAAAAHAAAAAAAHAAAAAADHAAAAAADYQAAAAAAVQAAAAADVQAAAAAA
+          tiles: cgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYAAAAAABcgAAAAAAVQAAAAADVQAAAAACVQAAAAACVQAAAAACVQAAAAABVQAAAAACVQAAAAACVQAAAAACVQAAAAACVQAAAAABVQAAAAACVQAAAAABVQAAAAADcgAAAAAAYQAAAAAAcgAAAAAAVQAAAAADVQAAAAABVQAAAAAAVQAAAAACVQAAAAAAVQAAAAABVQAAAAADVQAAAAABVQAAAAACVQAAAAACVQAAAAACVQAAAAABVQAAAAABYQAAAAAAVQAAAAADVQAAAAACVQAAAAADVQAAAAACVQAAAAABVQAAAAABVQAAAAACVQAAAAAAVQAAAAACVQAAAAAAVQAAAAABVQAAAAAAVQAAAAADVQAAAAAAVQAAAAABYQAAAAAAVQAAAAADVQAAAAACVQAAAAABVQAAAAADVQAAAAAAVQAAAAADVQAAAAAAVQAAAAACVQAAAAADVQAAAAAAVQAAAAAAVQAAAAABVQAAAAACVQAAAAABVQAAAAACYQAAAAAAVQAAAAACVQAAAAABVQAAAAADVQAAAAABVQAAAAABVQAAAAABVQAAAAACVQAAAAABVQAAAAAAVQAAAAABVQAAAAABVQAAAAACVQAAAAABVQAAAAAAVQAAAAACYQAAAAAAVQAAAAAAVQAAAAACcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAVQAAAAAAVQAAAAADVQAAAAADVQAAAAABVQAAAAADVQAAAAADVQAAAAACVQAAAAABVQAAAAABYQAAAAAAVQAAAAABVQAAAAABAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAACHAAAAAACHAAAAAADXgAAAAAAVQAAAAADXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADHAAAAAACHAAAAAACXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADLAAAAAAAHAAAAAAAHAAAAAACVQAAAAABVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAADHAAAAAADHAAAAAABHAAAAAACVQAAAAACVQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAACLAAAAAABHAAAAAABXgAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAACHAAAAAADHAAAAAABXgAAAAAAVQAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAHAAAAAAALAAAAAADHAAAAAAAVQAAAAABcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAXwAAAAABYQAAAAAAHAAAAAAAHAAAAAADHAAAAAADYQAAAAAAVQAAAAADVQAAAAAA
           version: 6
         1,0:
           ind: 1,0
@@ -6952,7 +6952,7 @@ entities:
       type: DeviceLinkSink
 - proto: BlockGameArcade
   entities:
-  - uid: 545
+  - uid: 2101
     components:
     - rot: -1.5707963267948966 rad
       pos: 4.5,13.5
@@ -34946,13 +34946,6 @@ entities:
     - pos: -43.34098,13.453728
       parent: 2173
       type: Transform
-- proto: ShowcaseRobot
-  entities:
-  - uid: 2569
-    components:
-    - pos: 37.5,5.5
-      parent: 2173
-      type: Transform
 - proto: SignalButton
   entities:
   - uid: 2734
@@ -36464,6 +36457,13 @@ entities:
     - pos: 4.5,51.5
       parent: 2173
       type: Transform
+- proto: VendingMachineAutoTuneVend
+  entities:
+  - uid: 545
+    components:
+    - pos: 37.5,5.5
+      parent: 2173
+      type: Transform
 - proto: VendingMachineCart
   entities:
   - uid: 657

Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

@@ -1,62 +1,62 @@
-- type: cargoProduct
-  id: FunInstrumentsVariety
-  icon:
-    sprite: Objects/Fun/Instruments/accordion.rsi
-    state: icon
-  product: CrateFunInstrumentsVariety
-  cost: 2300
-  category: Fun
-  group: market
-
-- type: cargoProduct
-  id: FunInstrumentsBrass
-  icon:
-    sprite: Objects/Fun/Instruments/structureinstruments.rsi
-    state: tuba
-  product: CrateFunInstrumentsBrass
-  cost: 3500
-  category: Fun
-  group: market
-
-- type: cargoProduct
-  id: FunInstrumentsString
-  icon:
-    sprite: Objects/Fun/Instruments/bassguitar.rsi
-    state: icon
-  product: CrateFunInstrumentsString
-  cost: 3100
-  category: Fun
-  group: market
-
-- type: cargoProduct
-  id: FunInstrumentsWoodwind
-  icon:
-    sprite: Objects/Fun/Instruments/harmonica.rsi
-    state: icon
-  product: CrateFunInstrumentsWoodwind
-  cost: 3000
-  category: Fun
-  group: market
-
-- type: cargoProduct
-  id: FunInstrumentsKeyedPercussion
-  icon:
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
-    state: icon
-  product: CrateFunInstrumentsKeyedPercussion
-  cost: 3500
-  category: Fun
-  group: market
-
-- type: cargoProduct
-  id: FunInstrumentsSpecial
-  icon:
-    sprite: Objects/Fun/Instruments/gunpet.rsi
-    state: icon
-  product: CrateFunInstrumentsSpecial
-  cost: 10000
-  category: Fun
-  group: market
+# - type: cargoProduct
+  # id: FunInstrumentsVariety # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/accordion.rsi
+    # state: icon
+  # product: CrateFunInstrumentsVariety
+  # cost: 2300
+  # category: Fun
+  # group: market
+
+# - type: cargoProduct
+  # id: FunInstrumentsBrass # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    # state: tuba
+  # product: CrateFunInstrumentsBrass
+  # cost: 3500
+  # category: Fun
+  # group: market
+
+# - type: cargoProduct
+  # id: FunInstrumentsString # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/bassguitar.rsi
+    # state: icon
+  # product: CrateFunInstrumentsString
+  # cost: 3100
+  # category: Fun
+  # group: market
+
+# - type: cargoProduct
+  # id: FunInstrumentsWoodwind # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/harmonica.rsi
+    # state: icon
+  # product: CrateFunInstrumentsWoodwind
+  # cost: 3000
+  # category: Fun
+  # group: market
+
+# - type: cargoProduct
+  # id: FunInstrumentsKeyedPercussion # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    # state: icon
+  # product: CrateFunInstrumentsKeyedPercussion
+  # cost: 3500
+  # category: Fun
+  # group: market
+
+# - type: cargoProduct
+  # id: FunInstrumentsSpecial # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/gunpet.rsi
+    # state: icon
+  # product: CrateFunInstrumentsSpecial
+  # cost: 10000
+  # category: Fun
+  # group: market
 
 - type: cargoProduct
   id: FunArtSupplies

Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml

@@ -136,4 +136,4 @@
     state: icon
   - type: Item
     size: 24
-    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi

Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml

@@ -8,42 +8,42 @@
   category: Fun
   group: market
 
-- type: cargoProduct
-  id: FunPianoInstrument
-  icon:
-    sprite: Objects/Fun/Instruments/structureinstruments.rsi
-    state: piano
-  product: PianoInstrument
-  cost: 1000
-  category: Fun
-  group: market
+# - type: cargoProduct
+  # id: FunPianoInstrument # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    # state: piano
+  # product: PianoInstrument
+  # cost: 1500
+  # category: Fun
+  # group: market
 
-- type: cargoProduct
-  id: FunUprightPianoInstrument
-  icon:
-    sprite: Objects/Fun/Instruments/structureinstruments.rsi
-    state: piano-upright
-  product: UprightPianoInstrument
-  cost: 1000
-  category: Fun
-  group: market
+# - type: cargoProduct
+  # id: FunUprightPianoInstrument # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    # state: piano-upright
+  # product: UprightPianoInstrument
+  # cost: 1500
+  # category: Fun
+  # group: market
 
-- type: cargoProduct
-  id: FunChurchOrganInstrument
-  icon:
-    sprite: Objects/Fun/Instruments/structureinstruments.rsi
-    state: church-organ
-  product: ChurchOrganInstrument
-  cost: 1000
-  category: Fun
-  group: market
+# - type: cargoProduct
+  # id: FunChurchOrganInstrument # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    # state: church-organ
+  # product: ChurchOrganInstrument
+  # cost: 1500
+  # category: Fun
+  # group: market
 
-- type: cargoProduct
-  id: FunMinimoogInstrument
-  icon:
-    sprite: Objects/Fun/Instruments/structureinstruments.rsi
-    state: minimoog
-  product: MinimoogInstrument
-  cost: 1000
-  category: Fun
-  group: market
+# - type: cargoProduct
+  # id: FunMinimoogInstrument # Moved to AutoTune
+  # icon:
+    # sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    # state: minimoog
+  # product: MinimoogInstrument
+  # cost: 1500
+  # category: Fun
+  # group: market

Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml

@@ -55,3 +55,13 @@
   cost: 100
   category: Security
   group: market
+
+- type: cargoProduct
+  id: CrateVendingMachineRestockAutoTuneVend
+  icon:
+    sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockAutoTuneVendFilled
+  cost: 100
+  category: Fun
+  group: market

Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml

@@ -42,3 +42,12 @@
     contents:
       - id: VendingMachineRestockLessLethalVend
         amount: 2
+
+- type: entity
+  id: CrateVendingMachineRestockAutoTuneVendFilled
+  parent: CratePlasticBiodegradable
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockAutoTuneVend
+        amount: 2

Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/autotunevend.yml

@@ -0,0 +1,57 @@
+- type: vendingMachineInventory
+  id: AutoTuneVendInventory
+  startingInventory:
+    TrumpetInstrument: 2
+    TromboneInstrument: 2
+    FrenchHornInstrument: 2
+    SaxophoneInstrument: 2
+    EuphoniumInstrument: 2
+    AcousticGuitarInstrument: 2
+    ElectricGuitarInstrument: 2
+    BassGuitarInstrument: 2
+    RockGuitarInstrument: 2
+    BanjoInstrument: 2
+    ViolinInstrument: 2
+    CelloInstrument: 2
+    ViolaInstrument: 2
+    RecorderInstrument: 2
+    BagpipeInstrument: 2
+    ClarinetInstrument: 2
+    FluteInstrument: 2
+    HarmonicaInstrument: 2
+    OcarinaInstrument: 2
+    PanFluteInstrument: 2
+    SynthesizerInstrument: 2
+    AccordionInstrument: 2
+    KalimbaInstrument: 2
+    WoodblockInstrument: 2
+    GlockenspielInstrument: 2
+    BikeHornInstrument: 1 # Not actully bad as you might think
+    MusicBoxInstrument: 1
+#    SeashellInstrument: 1 This is actully just static noises
+    XylophoneInstrument: 1
+#    GunpetInstrument: 1 Sounds bad
+    MicrophoneInstrument: 1
+#    HelicopterInstrument: 1 Sounds bad
+#    BirdToyInstrument: 1 Sounds bad
+    MusicalLungInstrument: 1 # This actully sound ok somehow
+#    ReverseCymbalsInstrument: 1 Sounds bad
+#    CannedApplauseInstrument: 1 Sounds bad
+  contrabandInventory:
+    TubaInstrument: 1
+    HarpInstrument: 1
+    ContrabassInstrument: 1
+    VibraphoneInstrument: 1
+    MarimbaInstrument: 1
+    TomDrumsInstrument: 1
+    TimpaniInstrument: 1
+    TaikoInstrument: 1
+    MinimoogInstrument: 1
+    ChurchOrganInstrument: 1
+    PianoInstrument: 1
+    UprightPianoInstrument: 1
+    DawInstrument: 1
+    Rickenbacker4003Instrument: 1
+  emaggedInventory:
+#    SuperSynthesizerInstrument: 1 # Can crash the server with some MIDI
+    Rickenbacker4001Instrument: 1

Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml

@@ -127,3 +127,20 @@
     - state: green_bit
       shader: unshaded
     - state: refill_lesslethal
+
+- type: entity
+  parent: SecuredVendingMachineRestock
+  id: VendingMachineRestockAutoTuneVend
+  name: AutoTuneVend restock box
+  description: A box containing music and stuff for the Auto Tune vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM.
+  components:
+  - type: VendingMachineRestock
+    canRestock:
+    - AutoTuneVendInventory
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi
+    layers:
+    - state: base
+    - state: green_bit
+      shader: unshaded
+    - state: refill_autotune