CircuitVend, Autotune and cargo orders (the ones with machines) are now flatpacked

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

@@ -4,8 +4,8 @@ ent-CrateVendingMachineRestockAstroVend = { ent-CrateVendingMachineRestockAstroV
 ent-CrateVendingMachineRestockAmmo = { ent-CrateVendingMachineRestockAmmoFilled }
     .desc = { ent-CrateVendingMachineRestockAmmoFilled.desc }
 
-ent-CrateVendingMachineRestockCircuitVend = { ent-CrateVendingMachineRestockCircuitVendFilled }
-    .desc = { ent-CrateVendingMachineRestockCircuitVendFilled.desc }
+ent-CrateVendingMachineRestockFlatpackVend = { ent-CrateVendingMachineRestockFlatpackVendFilled }
+    .desc = { ent-CrateVendingMachineRestockFlatpackVendFilled.desc }
 
 ent-CrateVendingMachineRestockCuddlyCritterVend = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled }
     .desc = { ent-CrateVendingMachineRestockCuddlyCritterVendFilled.desc }

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

@@ -4,8 +4,8 @@ ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate
 ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate
     .desc = Contains two restock boxes for the Liberation vending machine.
 
-ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate
-    .desc = Contains two restock boxes for a CircuitVend vending machine.
+ent-CrateVendingMachineRestockFlatpackVendFilled = FlatpackVend restock crate
+    .desc = Contains two restock boxes for a FlatpackVend vending machine.
 
 ent-CrateVendingMachineRestockCuddlyCritterVendFilled = CuddlyCritterVend restock crate
     .desc = Contains two restock boxes for a CuddlyCritterVend vending machine.

Resources/Maps/_NF/Outpost/frontier.yml

@@ -36648,7 +36648,7 @@ entities:
     - type: Transform
       pos: 49.5,4.5
       parent: 2173
-- proto: VendingMachineCircuitVend
+- proto: VendingMachineFlatpackVend
   entities:
   - uid: 4469
     components:

Resources/Maps/_NF/POI/anomalouslab.yml

@@ -10471,7 +10471,7 @@ entities:
       parent: 1
     - type: Anchorable
       delay: 999999
-- proto: VendingMachineCircuitVend
+- proto: VendingMachineFlatpackVend
   entities:
   - uid: 318
     components:

Resources/Maps/_NF/POI/grifty.yml

@@ -5163,7 +5163,7 @@ entities:
     - type: Transform
       pos: 3.5447173,5.482584
       parent: 1
-- proto: VendingMachineRestockCircuitVend
+- proto: VendingMachineRestockFlatpackVend
   entities:
   - uid: 626
     components:

Resources/Maps/_NF/POI/lodge.yml

@@ -10028,7 +10028,7 @@ entities:
     - type: Transform
       pos: 9.5,10.5
       parent: 1
-- proto: VendingMachineCircuitVend
+- proto: VendingMachineFlatpackVend
   entities:
   - uid: 512
     components:

Resources/Prototypes/Catalog/Fills/Crates/engines.yml

@@ -30,7 +30,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: AmeControllerUnanchored
+      - id: AmeControllerUnanchoredFlatpack # Frontier - AmeControllerUnanchored to AmeControllerUnanchoredFlatpack
 
 # Singularity
 
@@ -52,7 +52,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: RadiationCollectorFullTank
+      - id: RadiationCollectorFullTankFlatpack # Frontier - RadiationCollectorFullTank to RadiationCollectorFullTankFlatpack
 
 - type: entity
   id: CrateEngineeringSingularityContainment

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -46,8 +46,6 @@
           Amount: 2
           DefaultPrototype: Beaker
           ExamineName: Glass Beaker
-    - type: StaticPrice
-      price: 200
 
 - type: entity
   parent: BaseMachineCircuitboard
@@ -135,8 +133,6 @@
           ExamineName: Glass Beaker
     - type: StealTarget
       stealGroup: MedicalTechFabCircuitboard
-    - type: StaticPrice
-      price: 200
 
 - type: entity
   id: CircuitImprinterMachineCircuitboard
@@ -155,8 +151,6 @@
         Amount: 2
         DefaultPrototype: Beaker
         ExamineName: Glass Beaker
-  - type: StaticPrice
-    price: 200
 
 - type: entity
   id: ExosuitFabricatorMachineCircuitboard
@@ -175,8 +169,6 @@
   - type: GuideHelp
     guides:
     - Robotics
-  - type: StaticPrice
-    price: 200
 
 # yes i know this prototype name is long i'm just following conventions
 - type: entity

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -423,8 +423,6 @@
       state: cpu_command
     - type: ComputerBoard
       prototype: ComputerIFF
-    - type: StaticPrice
-      price: 400
     - type: ComputerTabletopBoard # Frontier
       prototype: ComputerTabletopIFF # Frontier
 

Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml

@@ -16,8 +16,6 @@
           Amount: 2
           DefaultPrototype: Beaker
           ExamineName: Glass Beaker
-    - type: StaticPrice
-      price: 200
 
 - type: entity
   id: ServiceTechFabCircuitboard
@@ -37,8 +35,6 @@
           Amount: 2
           DefaultPrototype: Beaker
           ExamineName: Glass Beaker
-    - type: StaticPrice
-      price: 200
 
 - type: entity
   id: ScienceTechFabCircuitboard
@@ -58,8 +54,6 @@
           Amount: 2
           DefaultPrototype: Beaker
           ExamineName: Glass Beaker
-    - type: StaticPrice
-      price: 200
 
 - type: entity
   id: DeepFryerMachineCircuitboard

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

@@ -3,8 +3,8 @@
   icon:
     sprite: Structures/Power/Generation/portable_generator.rsi
     state: portgen3
-  product: PortableGeneratorJrPacman
-  cost: 1500
+  product: PortableGeneratorJrPacmanFlatpack
+  cost: 2000
   category: Engineering
   group: market
 
@@ -13,8 +13,8 @@
   icon:
     sprite: Structures/Power/Generation/portable_generator.rsi
     state: portgen2
-  product: PortableGeneratorPacman
-  cost: 2500
+  product: PortableGeneratorPacmanFlatpack
+  cost: 3000
   category: Engineering
   group: market
 
@@ -23,7 +23,7 @@
   icon:
     sprite: Structures/Power/Generation/portable_generator.rsi
     state: portgen1
-  product: PortableGeneratorSuperPacman
-  cost: 3500
+  product: PortableGeneratorSuperPacmanFlatpack
+  cost: 4000
   category: Engineering
   group: market

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

@@ -27,11 +27,11 @@
   group: market
 
 - type: cargoProduct
-  id: CrateVendingMachineRestockCircuitVend
+  id: CrateVendingMachineRestockFlatpackVend
   icon:
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
-  product: CrateVendingMachineRestockCircuitVendFilled
+  product: CrateVendingMachineRestockFlatpackVendFilled
   cost: 100
   category: Science
   group: market

Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml

@@ -9,19 +9,3 @@
       - id: WeaponLauncherChinaLakeEmp
       - id: GrenadeEmp
         amount: 8
-
-- type: entity
-  id: ClothingBackpackDuffelScienceBundle
-  parent: ClothingBackpackDuffelScience
-  suffix: Science Kit
-  components:
-    - type: StorageFill
-      contents:
-        - id: Beaker
-          amount: 4
-        - id: MatterBinStockPart
-          amount: 10
-        - id: CapacitorStockPart
-          amount: 8
-        - id: MicroManipulatorStockPart
-          amount: 5

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

@@ -4,28 +4,28 @@
   components:
   - type: StorageFill
     contents:
-      - id: GyroscopeUnanchored
+      - id: GyroscopeUnanchoredFlatpack
 
 - type: entity
   id: CrateThruster
   parent: CrateEngineering
   components:
   - type: StorageFill
     contents:
-      - id: ThrusterUnanchored
+      - id: ThrusterUnanchoredFlatpack
 
 - type: entity
   id: CrateSmallGyroscope
   parent: CrateEngineering
   components:
   - type: StorageFill
     contents:
-      - id: SmallGyroscopeUnanchored
+      - id: SmallGyroscopeUnanchoredFlatpack
 
 - type: entity
   id: CrateSmallThruster
   parent: CrateEngineering
   components:
   - type: StorageFill
     contents:
-      - id: SmallThrusterUnanchored
+      - id: SmallThrusterUnanchoredFlatpack

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

@@ -4,22 +4,16 @@
   components:
   - type: StorageFill
     contents:
-      - id: ExosuitFabricatorMachineCircuitboard
-      - id: AnomalyVesselCircuitboard
-      - id: CircuitImprinterMachineCircuitboard
-      - id: ResearchAndDevelopmentServerMachineCircuitboard
-      - id: ArtifactAnalyzerMachineCircuitboard
-      - id: AutolatheMachineCircuitboard
-      - id: ProtolatheMachineCircuitboard
-      - id: AnalysisComputerCircuitboard
-      - id: ResearchComputerCircuitboard
-      - id: APECircuitboard
+      - id: ExosuitFabricatorFlatpack
+      - id: MachineAnomalyVesselFlatpack
+      - id: CircuitImprinterFlatpack
+      - id: ResearchAndDevelopmentServerFlatpack
+      - id: ComputerResearchAndDevelopmentFlatpack
+      - id: MachineArtifactAnalyzerFlatpack
+      - id: AutolatheFlatpack
+      - id: ProtolatheFlatpack
+      - id: ComputerAnalysisConsoleFlatpack
+      - id: MachineAPEFlatpack
       - id: AnomalyScanner
       - id: NodeScanner
-      - id: CableApcStack
-      - id: SheetSteel
-        amount: 2
-      - id: SheetGlass
-      - id: SheetPGlass
-      - id: SheetPlasma
-      - id: ClothingBackpackDuffelScienceBundle
+      - id: Multitool

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

@@ -17,12 +17,12 @@
         amount: 2
 
 - type: entity
-  id: CrateVendingMachineRestockCircuitVendFilled
+  id: CrateVendingMachineRestockFlatpackVendFilled
   parent: CratePlasticBiodegradable
   components:
   - type: StorageFill
     contents:
-      - id: VendingMachineRestockCircuitVend
+      - id: VendingMachineRestockFlatpackVend
         amount: 2
 
 - type: entity

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

@@ -28,29 +28,29 @@
     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
+    TubaInstrumentFlatpack: 1
+    HarpInstrumentFlatpack: 1
+    ContrabassInstrumentFlatpack: 1
+    VibraphoneInstrumentFlatpack: 1
+    MarimbaInstrumentFlatpack: 1
+    TomDrumsInstrumentFlatpack: 1
+    TimpaniInstrumentFlatpack: 1
+    TaikoInstrumentFlatpack: 1
+    MinimoogInstrumentFlatpack: 1
+    ChurchOrganInstrumentFlatpack: 1
+    PianoInstrumentFlatpack: 1
+    UprightPianoInstrumentFlatpack: 1
+    DawInstrumentFlatpack: 1
+  contrabandInventory:
+#    SeashellInstrument: 1 This is actully just static noises
 #    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
+#    HelicopterInstrument: 1 Sounds bad
+#    BirdToyInstrument: 1 Sounds bad
+#    GunpetInstrument: 1 Sounds bad
     Rickenbacker4003Instrument: 1
   emaggedInventory:
 #    SuperSynthesizerInstrument: 1 # Can crash the server with some MIDI