Контрабанда

Corvax-Frontier · Dec 1, 2024 · 575b061 · 575b061
1 parent 9858409
commit 575b061
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: Mk32 "Universal"
-  parent: BaseWeaponPistol
+  parent: [BaseWeaponPistol, BaseC1Contraband]
   id: WeaponPistolUniversal
   description: The Mark 32 Offensive Handgun, produced by NanoTrasen s Small Arms Division. Uses .45 magnum ammo.
   components:
@@ -42,10 +42,9 @@
 
 - type: entity
   name: pollock
-  parent: BaseWeaponPistol
+  parent: [BaseWeaponPistol, BaseC1Contraband]
   id: WeaponPistolPollock
   description: A compact and mass-produced combat pistol. Uses .35 auto ammo.
-  suffix: Mercenary
   components:
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: fitz special
-  parent: BaseWeaponRevolver
+  parent: [BaseWeaponRevolver, BaseC1Contraband]
   id: WeaponRevolverFitz
   description: A compact and concealable self defence snub revolver. Uses .38 special ammo.
   components:
@@ -23,7 +23,7 @@
 
 - type: entity
   name: faith
-  parent: BaseWeaponRevolver
+  parent: [BaseWeaponRevolver, BaseC1Contraband]
   id: WeaponRevolverFaith
   description: Delivers blessings in bullet form. Uses .38 special ammo.
   components:
@@ -46,7 +46,7 @@
 
 - type: entity
   name: lucky 37
-  parent: BaseWeaponRevolver
+  parent: [BaseWeaponRevolver, BaseC1Contraband]
   id: WeaponRevolverLucky
   description: Luck always beats skill, ya weasel. Uses .38 special ammo.
   components:

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -59,7 +59,7 @@
 
 - type: entity
   name: ceremonial rifle
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseC2ExpeditionContraband]
   id: WeaponSniperCeremonial
   description: A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses .30 rifle ammo.
   components:
@@ -84,7 +84,7 @@
 
 - type: entity
   name: CAWS-25 Jackdaw
-  parent: [BaseWeaponRifle, BaseGunWieldable]
+  parent: [BaseWeaponRifle, BaseGunWieldable, BaseC3Contraband]
   id: WeaponRifleJackdaw
   description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
   components:

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -327,6 +327,7 @@
     - WeaponCaseHeavyAsmgtExpeditions
     - WeaponCaseLongEnforcerExpedition
     - WeaponCaseLongLaserCannonExpedition
+    - WeaponRifleJackdaw # Corvax-Frontier
     chance: 1.0
     offset: 0.0
     rarePrototypes: