diff --git a/Resources/Locale/en-US/forensics/fibers.ftl b/Resources/Locale/en-US/forensics/fibers.ftl
index 097c6c2699f..4fa5a623c1b 100644
--- a/Resources/Locale/en-US/forensics/fibers.ftl
+++ b/Resources/Locale/en-US/forensics/fibers.ftl
@@ -10,6 +10,7 @@ fibers-nitrile = nitrile
 fibers-nanomachines = insulative nanomachine
 fibers-chameleon = holographic chameleon
 fibers-rubber = rubber
+fibers-kinetic = kinetic
 
 fibers-purple = purple
 fibers-red = red
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 428be587a6b..8ce249e1aa7 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -34,7 +34,6 @@
       - id: LavalandEquipmentExplorerSuit
       - id: ShelterCapsule
       - id: ClothingMaskGasExplorer
-      - id: MineralScanner
       - id: FlashlightSeclite
       - id: ClothingEyesGlassesGarMeson
       # Lavaland Change End
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
index 76da720fa59..393dc32957c 100644
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml
@@ -29,8 +29,6 @@
     cost: 500
   - id: ClothingShoesBootsJack
     cost: 550
-  - id: MineralScanner
-    cost: 550
   - id: MedkitBruteFilled
     cost: 600
   - id: MedkitBurnFilled
@@ -49,8 +47,6 @@
     cost: 1000
   - id: PKAUpgradeFireRate
     cost: 1000
-  - id: AdvancedMineralScanner
-    cost: 1100
   - id: PKAUpgradeDamage
     cost: 1200
   - id: LavalandEquipmentExplorerSuit
@@ -82,8 +78,8 @@
     cost: 6400
   - id: WeaponRifleSVTEmpty
     cost: 6400
-  - id: WeaponPlasmaCutter
-    cost: 1700
+ # - id: WeaponPlasmaCutter -- TODO: Port from goob
+ #   cost: 1700
   - id: SpaceCash1000
     cost: 2000
   - id: ShelterCapsule
diff --git a/Resources/Prototypes/DeltaV/Catalog/mining_voucher.yml b/Resources/Prototypes/DeltaV/Catalog/mining_voucher.yml
index ac654f6cd29..ca5e64d05a7 100644
--- a/Resources/Prototypes/DeltaV/Catalog/mining_voucher.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/mining_voucher.yml
@@ -7,7 +7,7 @@
     state: icon
   content:
   - WeaponCrusher
-  - FireExtinguisherMini
+  - FireExtinguisher # should be mini but who cares we can balance this later
 
 - type: thiefBackpackSet
   id: MiningExtraction
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 91956cc77c1..0e4abb404fd 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -166,6 +166,21 @@
   - type: Sprite
     state: rocksolid03
 
+- type: entity
+  parent: BaseRock
+  id: FloraRockSolid
+  components:
+  - type: Sprite
+    layers:
+    - state: rocksolid01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        rocksolid01: ""
+        rocksolid02: ""
+        rocksolid03: ""
+
 - type: entity
   name: stalagmite
   description: Natural stone spikes.
diff --git a/Resources/Prototypes/_Lavaland/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Lavaland/Entities/Structures/Machines/vending_machines.yml
index 1acf2ee86f9..0f28b0b3b6a 100644
--- a/Resources/Prototypes/_Lavaland/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/_Lavaland/Entities/Structures/Machines/vending_machines.yml
@@ -30,11 +30,12 @@
   - type: AccessReader
     access: [["Salvage"]]
 
-- type: localizedDataset
+- type: messagePack
   id: MiningDrobeAds
-  values:
-    prefix: advertisement-miningdrobe-
-    count: 3
+  messages:
+  - advertisement-miningdrobe-1
+  - advertisement-miningdrobe-2
+  - advertisement-miningdrobe-3
 
 - type: vendingMachineInventory
   id: MiningDrobeInventory
diff --git a/Resources/Prototypes/_Lavaland/Procedural/lavaland_planets.yml b/Resources/Prototypes/_Lavaland/Procedural/lavaland_planets.yml
index 9d0aa096505..0187214d04b 100644
--- a/Resources/Prototypes/_Lavaland/Procedural/lavaland_planets.yml
+++ b/Resources/Prototypes/_Lavaland/Procedural/lavaland_planets.yml
@@ -30,4 +30,4 @@
   #- OreBananium
   - OreArtifactFragment
   - OreDiamond
-  - BSCrystal
+  - OreBluespace