Upstream september part 5

Corvax-Frontier · Oct 2, 2024 · 3d9fa63 · 3d9fa63
1 parent a546c27
commit 3d9fa63
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 68 deletions.
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml
@@ -56,7 +56,7 @@
     - id: SpaceCash500
       prob: 0.45
     # Weapons
-    - id: WeaponPistolMk58Expedition
+    - id: WeaponPistolMk58
       prob: 0.9
     # Armor
     - id: ClothingOuterVestWebMercenary
@@ -470,7 +470,7 @@
     - id: SpaceCash2500
       prob: 0.1
     # Weapons
-    - id: WeaponSniperRepeaterExpedition
+    - id: WeaponSniperRepeater
       prob: 0.9
     # Armor
     - id: ClothingOuterArmorBulletproof

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_syndicate.yml
@@ -189,7 +189,7 @@
   components:
   - type: SpawnItemsOnUse
     items:
-      - id: WeaponLaserSvalinnExpedition
+      - id: WeaponLaserSvalinn
       - id: PowerCellHyperPrinted
       - id: PowerCellHyperPrinted
       - id: SpaceCash2500
@@ -417,7 +417,7 @@
   components:
   - type: SpawnItemsOnUse
     items:
-      - id: WeaponSubMachineGunAtreidesExpedition
+      - id: WeaponSubMachineGunAtreides
       - id: MagazinePistolSubMachineGun
       - id: MagazinePistolSubMachineGun
       - id: SpaceCash1000
@@ -448,7 +448,7 @@
   components:
   - type: SpawnItemsOnUse
     items:
-      - id: WeaponSubMachineGunWt550Expedition
+      - id: WeaponSubMachineGunWt550
       - id: MagazinePistolSubMachineGunTopMounted
       - id: SpaceCash1000
       - id: SpaceCash500

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/armory.yml
@@ -24,7 +24,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponSubMachineGunWt550Expedition
+      - id: WeaponSubMachineGunWt550
         amount: 2
       - id: MagazinePistolSubMachineGunTopMounted
         amount: 4