From 047a7a488da35e5f1cc9b78ec23c99a3c605af60 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sun, 18 Aug 2024 05:55:38 -0400
Subject: [PATCH] fix some salvage spawner oversights (#31114)

* fix some salvage spawner oversights

* adjust carp rates

* more tweaks and some additions
---
 .../Spawners/Random/Salvage/spawners.yml        |  8 ++++----
 .../Spawners/Random/Salvage/tables_loot.yml     | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml
index 9979090459..81a7109575 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml
@@ -388,15 +388,15 @@
   table: !type:GroupSelector
     children:
     - id: MobCarpSalvage
-      weight: 60
+      weight: 70
     - id: MobCarpSalvage
       weight: 25
       amount: !type:RangeNumberSelector
         range: 1, 3
     - !type:AllSelector
-      weight: 15
+      weight: 5
       children:
-      - id: MobShark
+      - id: MobSharkSalvage
       - id: MobCarpSalvage
         amount: !type:ConstantNumberSelector
           value: 3
@@ -451,7 +451,7 @@
   - type: EntityTableSpawner
     table: !type:AllSelector
       children:
-      - id: MobShark
+      - id: MobSharkSalvage
       - id: MobCarpSalvage
         amount: !type:ConstantNumberSelector
           value: 3
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
index 976febbd1d..5e128e8f96 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -178,6 +178,7 @@
     - id: Shovel
     - id: FlashlightLantern
     - id: FireExtinguisher
+    - id: SurvivalKnife
 
 - type: entityTable
   id: SalvageEquipmentUncommon
@@ -188,10 +189,10 @@
     - id: PowerCellHighPrinted
     - id: RadioHandheld
     - id: ClothingBeltUtility
-    - id: SurvivalKnife
     - id: WeaponProtoKineticAccelerator
       weight: 0.5
     - id: OxygenTankFilled
+    - id: WelderIndustrial
     - !type:GroupSelector
       children:
       - id: ClothingHeadHatWelding
@@ -215,12 +216,22 @@
     - id: MiningDrill
     - id: ClothingEyesGlassesMeson
     - id: ClothingBeltSalvageWebbing
-    - id: ClothingOuterHardsuitSalvage
+    - id: SeismicCharge
+    - id: WeaponCrusher
+      weight: 0.5
+    - !type:GroupSelector
+      children:
+      - id: JetpackBlue
+      - id: JetpackBlack
 
 - type: entityTable
   id: SalvageEquipmentLegendary
   table: !type:GroupSelector
     children:
-    - id: WeaponCrusher
     - id: WeaponCrusherGlaive
+    - id: ClothingOuterHardsuitSalvage
     - id: OmnizineChemistryBottle
+    - !type:GroupSelector
+      children:
+      - id: JetpackBlueFilled
+      - id: JetpackBlackFilled
-- 
2.52.0