diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index fc14acb0b25..c846492eeca 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -56,6 +56,17 @@ - id: Magazine762x39mmPractice amount: 4 +- type: entity + name: box of 7.62x39mm (subsonic) magazines + parent: BoxMagazine + id: BoxMagazine762x39mmSubsonic + description: A box full of 7.62x39mm (subsonic) magazines. + components: + - type: StorageFill + contents: + - id: Magazine762x39mmSubsonic + amount: 4 + #mono edit start - type: entity name: box of DP-29 magazines diff --git a/Resources/Prototypes/_Mono/Loadouts/PDV/gun.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/gun.yml index 8d1496bf2f2..559f8403605 100644 --- a/Resources/Prototypes/_Mono/Loadouts/PDV/gun.yml +++ b/Resources/Prototypes/_Mono/Loadouts/PDV/gun.yml @@ -20,6 +20,8 @@ - FactionWt550Loadout - FactionAkmLoadout - FactionEnergyGunLoadout + - FactionM90Loadout + - FactionWSPRLoadout fallbacks: - FactionC20RLoadout @@ -31,6 +33,21 @@ - FactionPythonLoadout - FactionViperLoadout +- type: loadoutGroup + id: RogueCommandMag + name: loadout-group-magazine + minLimit: 1 + loadouts: + - Faction9x19SMGAmmoLoadout #C20r + - Faction556x45mmAmmoLoadout # Vympel + - Faction46x30mmTopAmmo #WT550 + - Faction762x39mmAmmoLoadout #AKM + - FactionRechargerLoadout #Energy + - Faction762x51mmAmmoLoadout #M90 + - Faction762x39mmSubsonicAmmoLoadout #WESPR + fallbacks: + - Faction9x19SMGAmmoLoadout #C20r + - type: loadoutGroup id: RogueMag name: loadout-group-magazine @@ -38,8 +55,6 @@ loadouts: - Faction9x19SMGAmmoLoadout #C20r - Faction556x45mmAmmoLoadout # Vympel - # - Faction46x30mmTopAmmo #WT550 - # - Faction762x39mmAmmoLoadout #AKM - FactionRechargerLoadout #Energy fallbacks: - Faction9x19SMGAmmoLoadout #C20r diff --git a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_rogue.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_rogue.yml index 15f42b5f902..ffc4040c175 100644 --- a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_rogue.yml +++ b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_rogue.yml @@ -43,9 +43,9 @@ - PirateTrinkets - PDVBelt - ContractorEncryptionKey - - RogueFirearm + - RogueFirearmCommander - RogueSidearm - - RogueMag + - RogueCommandMag - RoguePistolMag - FactionArmorPlates canCustomizeName: true @@ -69,9 +69,9 @@ - PirateCaptainTrinkets - PDVBelt - ContractorEncryptionKey - - RogueFirearm + - RogueFirearmCommander - RogueSidearm - - RogueMag + - RogueCommandMag - RoguePistolMag - FactionArmorPlates canCustomizeName: true @@ -119,9 +119,9 @@ - PirateTrinkets - PDVBelt - ContractorEncryptionKey - - RogueFirearm + - RogueFirearmCommander - RogueSidearm - - RogueMag + - RogueCommandMag - RoguePistolMag - FactionArmorPlates canCustomizeName: true diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/gun.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/gun.yml index 87f327953b4..9671176c9f8 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/gun.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/gun.yml @@ -16,9 +16,9 @@ name: loadout-group-weapon minLimit: 0 loadouts: - - FactionLecterLoadout + - FactionRiversongLoadout - FactionDrozdLoadout - - FactionVulcanLoadout + - FactionDragonfangLoadout - SecurityGuardEnforcerLoadout - type: loadoutGroup diff --git a/Resources/Prototypes/_Mono/Loadouts/gun.yml b/Resources/Prototypes/_Mono/Loadouts/gun.yml index f72a6b64f97..c0acc6dbd05 100644 --- a/Resources/Prototypes/_Mono/Loadouts/gun.yml +++ b/Resources/Prototypes/_Mono/Loadouts/gun.yml @@ -525,6 +525,13 @@ back: - WeaponRifleDragonfang +- type: loadout #M90 + id: FactionM90Loadout + price: 0 + storage: + back: + - WeaponRifleM90 + - type: loadout #Lecter id: FactionLecterLoadout price: 0 @@ -532,7 +539,14 @@ back: - WeaponRifleLecter -- type: loadout #C20r +- type: loadout #Lecter + id: FactionWSPRLoadout + price: 0 + storage: + back: + - WeaponRifleWSPR + +- type: loadout #Vympel id: FactionVympelLoadout price: 0 storage: @@ -595,6 +609,13 @@ back: - BoxMagazine762x39mmFMJ +- type: loadout #Wespr + id: Faction762x39mmSubsonicAmmoLoadout + price: 0 + storage: + back: + - BoxMagazine762x39mmSubsonic + - type: loadout #Mosin id: FactionMosinLoadout price: 0 @@ -736,7 +757,7 @@ back: - BoxMagazine45_ACPFMJ -- type: loadout #MK58 Ammo +- type: loadout id: FactionHawk4Pistol price: 0 storage: