Upstream part 9..

Corvax-Frontier · Oct 2, 2024 · 1bad538 · 1bad538
1 parent 94158bb
commit 1bad538
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -54,6 +54,19 @@
     - id: MagazineBoxCaselessRifle10x24
       amount: 1
 
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortDeckard
+  suffix: Dungeon, Deckard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRevolverDeckard
+      amount: 1
+    - id: CartridgeMagnum
+      amount: 2
+
 # Revolvers
 - type: entity
   parent: WeaponCaseShort

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
@@ -433,11 +433,11 @@
     - CrateSecureMercenaryPrivateSecHardsuit
     - CrateSecurityArmor
     - CrateSecurityHelmet
-    - CrateArmoryShotgunExpedition
-    - CrateArmoryPistolsExpedition
-    - CrateArmoryRifleGestioExpedition
-    - CrateArmoryRifleNovaliteC1Expedition
-    - CrateArmoryEnergyGunExpedition
+    - CrateArmoryShotgun
+    - CrateArmoryPistols
+    - CrateArmoryRifleGestio
+    - CrateArmoryRifleNovaliteC1
+    - CrateArmoryEnergyGun
     # Ammo
     - CrateAmmoBoxLethal20
     - CrateAmmoBoxLethal25
@@ -455,10 +455,10 @@
     chance: 0.85
     offset: 0.0
     rarePrototypes:
-    - CrateArmorySMGExpedition
-    - CrateArmoryLaserExpedition
-    - CrateArmorySMGExpedition
-    - CrateArmoryLaserExpedition
+    - CrateArmorySMG
+    - CrateArmoryLaser
+    - CrateArmorySMG
+    - CrateArmoryLaser
     - CrateSecurityNonlethal
     - CrateSecureMercenaryHardsuitMagBoots
     - CrateSecureMercenaryPrivateSecHardsuitMagBoots